Skip to content

Update Envoy to 8188e232a9e0b15111d30f4724cbc7bf77d3964a#587

Merged
mum4k merged 20 commits intoenvoyproxy:masterfrom
oschaaf:envoy-dep-update-49
Dec 11, 2020
Merged

Update Envoy to 8188e232a9e0b15111d30f4724cbc7bf77d3964a#587
mum4k merged 20 commits intoenvoyproxy:masterfrom
oschaaf:envoy-dep-update-49

Conversation

@oschaaf
Copy link
Copy Markdown
Member

@oschaaf oschaaf commented Dec 3, 2020 •
edited
Loading

List of changes:

  • Update Envoy to 8188e232a9e0b15111d30f4724cbc7bf77d3964a (Dec 8th)
  • Sync .bazelrc
  • Modify extensions_build_config.bzl, add required DISABLED_BY_DEFAULT_EXTENSIONS
  • Rework our h1 connection pool derivation to keep our own prefetching feature working.
    Note: We enable the allow_prefetch runtime feature for this.
  • Changes to reflect changed Envoy constructors and method signatures:
    OnPoolReady(), ProdClusterManagerFactory(), allocateConnPool()
  • Modified log filtering in the integration test: SIGTERM -> ENVOY_SIGTERM.
  • Dropped include of ares.h as small cleanup, we no longer need that.
  • In options_impl.cc there's a small change to how we define elapsed_since_epoch to unbreak
    building with libc++: a regression of Building with clang's libc++ fails #569.
    Filed CI: test building with clang's libc++  #594 to avoid regression.

Signed-off-by: Otto van der Schaaf oschaaf@we-amp.com

Depends on:

@oschaaf
Update Envoy to 588d9344b31e6544869547c4bcd359b3b0f1d4cf
e227746 
- Fixes to accommodate upstream connection pool changes.
- Fixes to accommodate upstream cluster related changes.

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Regenerate README.md for the test server
cb2a3e2 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Merge remote-tracking branch 'upstream/master' into envoy-dep-update-48
3c98ef3 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Merge remote-tracking branch 'upstream/master' into envoy-dep-update-48
cc199ae 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Update Envoy to 73c2d57aa1dfd4dc91b76aec20723b114a1d17ee
69d2759 
WIP. Connection prefetching needs amendment / Envoy seems to support
overlapping functionality now. Our version broke, but perhaps we can
piggy back and make it non-experimental.

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf oschaaf marked this pull request as draft December 3, 2020 23:05
@oschaaf
Merge remote-tracking branch 'upstream/master' into envoy-dep-update-48
898771b 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Merge remote-tracking branch 'upstream/master' into envoy-dep-update-48
7b492c8 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Back out change to source/server/README.md
de03d42 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Merge branch 'envoy-dep-update-48' into envoy-dep-update-49
8d49c09 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Merge remote-tracking branch 'upstream/master' into envoy-dep-update-49
b9d5e0a 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Bump Envoy to 8188e232a9e0b15111d30f4724cbc7bf77d3964a
22fb2c6 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Fix prefetch/connection re-use
ec71f33 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf oschaaf changed the title Update Envoy to 73c2d57aa1dfd4dc91b76aec20723b114a1d17ee Update Envoy to 8188e232a9e0b15111d30f4724cbc7bf77d3964a Dec 8, 2020
@oschaaf oschaaf marked this pull request as ready for review December 8, 2020 10:29
@oschaaf oschaaf added the waiting-for-review A PR waiting for a review. label Dec 8, 2020
@oschaaf
Regen README.md
937d26a 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Copy link
Copy Markdown
Member Author

oschaaf commented Dec 8, 2020

So this now passes all tests, but asan has a structural build problem (it's not a flake):

ld.lld: error: undefined symbol: __muloti4
>>> referenced by int128_have_intrinsic.inc:251 (external/com_google_absl/absl/numeric/int128_have_intrinsic.inc:251)
>>>               bazel-out/k8-dbg/bin/external/com_google_absl/absl/strings/_objs/strings/numbers.pic.o:(absl::operator*(absl::int128, absl::int128))

Looking into that.

@oschaaf
Try sanitizer runs with the rbe toolchains
c7ba6a7 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Tweak do_ci.sh
11290cf 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Fix build error
f199ab5 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@mum4k mum4k requested a review from qqustc December 8, 2020 19:43
@mum4k
Copy link
Copy Markdown
Collaborator

mum4k commented Dec 8, 2020

@qqustc please review and assign back to me once done.

qqustc
qqustc previously approved these changes Dec 9, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@qqustc qqustc left a comment

Choose a reason for hiding this comment

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

Thanks Otto

@qqustc
Copy link
Copy Markdown
Contributor

qqustc commented Dec 9, 2020

@qqustc please review and assign back to me once done.

LGTM. Assign back to @mum4k

@oschaaf
Merge remote-tracking branch 'upstream/master' into envoy-dep-update-49
6bf623c 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf oschaaf force-pushed the envoy-dep-update-49 branch from 3351d48 to 6bf623c Compare December 9, 2020 15:30
@mum4k
Copy link
Copy Markdown
Collaborator

mum4k commented Dec 10, 2020

@oschaaf I am assuming this still needs some work due to the failing CI. Please reapply the waiting-for-review label once this is ready.

@mum4k mum4k added waiting-for-changes A PR waiting for comments to be resolved and changes to be applied. and removed waiting-for-review A PR waiting for a review. labels Dec 10, 2020
@oschaaf
Tweak do_ci.sh, fix for changed log message ENVOY_SIGTERM
667da56 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Try asan with libc++
4b8c525 
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@stevenzzzz
Copy link
Copy Markdown

stevenzzzz commented Dec 11, 2020

/cc stevenzzzz

@oschaaf oschaaf mentioned this pull request Dec 11, 2020
Open
@oschaaf
Disable asan's -fundefined flag as a workaround to get CI to pass.
9e8655a 
Deferred to envoyproxy#593

Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
@oschaaf
Copy link
Copy Markdown
Member Author

oschaaf commented Dec 11, 2020

To unblock this, I deferred the issue with CI/asan to #593. Marking this is ready for review again.

@oschaaf oschaaf added waiting-for-review A PR waiting for a review. and removed waiting-for-changes A PR waiting for comments to be resolved and changes to be applied. labels Dec 11, 2020
@oschaaf oschaaf mentioned this pull request Dec 11, 2020
Open
mum4k
mum4k approved these changes Dec 11, 2020
View reviewed changes
Copy link
Copy Markdown
Collaborator

@mum4k mum4k left a comment

Choose a reason for hiding this comment

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

Thank you @oschaaf.

@mum4k mum4k merged commit 172760a into envoyproxy:master Dec 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mum4k mum4k mum4k approved these changes

+1 more reviewer

@qqustc qqustc qqustc left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@mum4k mum4k

Labels

waiting-for-review A PR waiting for a review.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@oschaaf @mum4k @qqustc @stevenzzzz