Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherrypick callback manager improvement fix. #263

Merged
merged 3 commits into from
Sep 22, 2020
Merged

Cherrypick callback manager improvement fix. #263

merged 3 commits into from
Sep 22, 2020

Conversation

incfly
Copy link

@incfly incfly commented Sep 21, 2020

istio/istio#25909
Cherrypick of the original fix as in envoyproxy#11751.

Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
[Optional Fixes #Issue]
[Optional Deprecated:]

@incfly
Copy link
Author

incfly commented Sep 21, 2020

@lambdai PTAL, thanks.

Copy link

@lambdai lambdai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@incfly Thank you!
Since this is cherry-pick, istio/envoy actually missed a few changes which increase the memory usage. The actually usage is fewer than in the original PR. Could you update the PR?

test/integration/stats_integration_test.cc Outdated Show resolved Hide resolved
test/integration/stats_integration_test.cc Outdated Show resolved Hide resolved
Copy link

@lambdai lambdai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome!

@lambdai
Copy link

lambdai commented Sep 22, 2020

/retest

@incfly
Copy link
Author

incfly commented Sep 22, 2020

fails at hot restart at this line.

check [ "${ADMIN_HOT_RESTART_VERSION}" = "${CLI_HOT_RESTART_VERSION}" ]

  check [ "${CLI_HOT_RESTART_VERSION}" = "${EXPECTED_CLI_HOT_RESTART_VERSION}" ]

log, https://prow.istio.io/view/gs/istio-prow/pr-logs/pull/istio_envoy/263/test-tsan_envoy_release-1.6/43

TEST: Checking for match of --hot-restart-version and admin /hot_restart_version
fetching hot restart version from http://127.0.0.1:38655/hot_restart_version ...
Fetched ADMIN_HOT_RESTART_VERSION is 
     check [  = 11.104 ] ...

@incfly
Copy link
Author

incfly commented Sep 22, 2020

/retest

@istio-testing istio-testing merged commit a1ef7b2 into istio:release-1.6 Sep 22, 2020
incfly pushed a commit to incfly/proxy that referenced this pull request Sep 23, 2020
istio-testing pushed a commit to istio/proxy that referenced this pull request Oct 1, 2020
maistra-bot pushed a commit to maistra/proxy that referenced this pull request Nov 30, 2020
* [release-1.6] Fix container name as app_container in telemetry v2 (#2907)

* fix container name as app_container in telemetry v2

Signed-off-by: gargnupur <gargnupur@google.com>

* change containers to container when iterating

Signed-off-by: gargnupur <gargnupur@google.com>

* change to containers

Signed-off-by: gargnupur <gargnupur@google.com>

Co-authored-by: gargnupur <gargnupur@google.com>

* Fill in unknown for stackdriver metric empty labels (#2910) (#2920)

* fill in unknown for empty labels

* add comment

* format

* clean

* Update Bazel version (#2928)

This should be in sync with the version used by Envoy (https://github.com/istio/envoy/blob/release-1.6/.bazelversion) but was never synchronized.

* update release-1.6 envoy sha (#2943)

* use antlr 472 (#2984)

Include envoy update to use antlr472

* update sha to include istio/envoy#263 (#3023)

* Update proxy sha for CVE (#3037)

* Fix useragent in stackdriver access log (#3076) (#3083)

* Fix useragent in stackdriver access log

Signed-off-by: gargnupur <gargnupur@google.com>

* fix tests
looks like user-agent was just getting ignored in tests before :(

Signed-off-by: gargnupur <gargnupur@google.com>

* [release-1.6] Update common files (#3104)

* Update common sha

* Update image version for build container

Co-authored-by: Istio Automation <istio.testing@gmail.com>
Co-authored-by: gargnupur <gargnupur@google.com>
Co-authored-by: Pengyuan Bian <bianpengyuan@google.com>
Co-authored-by: Brian Avery <bavery@redhat.com>
Co-authored-by: mandarjog <mjog@google.com>
Co-authored-by: Jianfei Hu <jianfeih@google.com>
Co-authored-by: Nupur Garg <37600866+gargnupur@users.noreply.github.com>
Co-authored-by: jacob-delgado <jacob.delgado@volunteers.acasi.info>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants