From 9644b3caa9faf17129869c986d7c95b833b0d8f6 Mon Sep 17 00:00:00 2001 From: William Juan <66322422+wjuan-AFK@users.noreply.github.com> Date: Wed, 23 Jun 2021 05:19:56 +0000 Subject: [PATCH 1/3] Update Envoy to 0af62845667 (Jun 21th 2021) Signed-off-by: William Juan <66322422+wjuan-AFK@users.noreply.github.com> --- .bazelrc | 7 +++++++ bazel/repositories.bzl | 4 ++-- ci/run_envoy_docker.sh | 2 ++ source/client/stream_decoder.cc | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.bazelrc b/.bazelrc index 088e9fac6..a0d0a901e 100644 --- a/.bazelrc +++ b/.bazelrc @@ -19,6 +19,9 @@ build:macos --copt -UDEBUG # Startup options cannot be selected via config. startup --host_jvm_args=-Xmx2g +run --color=yes + +build --color=yes build --workspace_status_command="bash bazel/get_workspace_status" build --experimental_strict_action_env=true build --host_force_python=PY3 @@ -55,6 +58,10 @@ build:sanitizer --test_tag_filters=-no_san build:clang --action_env=BAZEL_COMPILER=clang build:clang --linkopt=-fuse-ld=lld +# Flags for Clang + PCH +build:clang-pch --spawn_strategy=local +build:clang-pch --define=ENVOY_CLANG_PCH=1 + # Basic ASAN/UBSAN that works for gcc build:asan --action_env=ENVOY_ASAN=1 build:asan --config=sanitizer diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index f99c1a65c..8053328c3 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -1,7 +1,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -ENVOY_COMMIT = "398794730b8a2651e004cfe2ca82de0eaa02ba4b" # Jun 14, 2021 -ENVOY_SHA = "43a75705147602976eb943789a2246f4da04e1bfaff927687a99b9fe116fa78a" +ENVOY_COMMIT = "0af628456676b71fb8484a0730f69b1f9808ad31" # Jun 21, 2021 +ENVOY_SHA = "79c9251159b963ae7b678f324958055ca957da5d541af1315d1116c5501c6cda" HDR_HISTOGRAM_C_VERSION = "0.11.2" # October 12th, 2020 HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad" diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh index 9a06ff233..30905c21a 100755 --- a/ci/run_envoy_docker.sh +++ b/ci/run_envoy_docker.sh @@ -61,6 +61,8 @@ mkdir -p "${ENVOY_DOCKER_BUILD_DIR}" export ENVOY_BUILD_IMAGE="${IMAGE_NAME}:${IMAGE_ID}" +time docker pull "${ENVOY_BUILD_IMAGE}" + # Since we specify an explicit hash, docker-run will pull from the remote repo if missing. docker run --rm \ "${ENVOY_DOCKER_OPTIONS[@]}" \ diff --git a/source/client/stream_decoder.cc b/source/client/stream_decoder.cc index a2e3e2dfe..9becc3c0e 100644 --- a/source/client/stream_decoder.cc +++ b/source/client/stream_decoder.cc @@ -159,6 +159,8 @@ StreamDecoder::streamResetReasonToResponseFlag(Envoy::Http::StreamResetReason re return Envoy::StreamInfo::ResponseFlag::UpstreamRemoteReset; case Envoy::Http::StreamResetReason::ProtocolError: return Envoy::StreamInfo::ResponseFlag::UpstreamProtocolError; + case Envoy::Http::StreamResetReason::OverloadManager: + return Envoy::StreamInfo::ResponseFlag::OverloadManager; } NOT_REACHED_GCOVR_EXCL_LINE; } From dfdd2c4c25a50b6b0eee719b5f3a52467339683e Mon Sep 17 00:00:00 2001 From: William Juan <66322422+wjuan-AFK@users.noreply.github.com> Date: Fri, 25 Jun 2021 13:01:49 +0000 Subject: [PATCH 2/3] Fixing build error related to grpc gtest. Signed-off-by: William Juan <66322422+wjuan-AFK@users.noreply.github.com> Signed-off-by: William Juan <66322422+wjuan-AFK@users.noreply.github.com> --- bazel/repositories.bzl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 8053328c3..220a8436c 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -56,3 +56,8 @@ cc_library( url = "https://github.com/HdrHistogram/HdrHistogram_c/archive/%s.tar.gz" % HDR_HISTOGRAM_C_VERSION, # // clang-format on ) + # // GRPC has a dependency on gtest which needs to be bound: https://github.com/grpc/grpc/commit/decc199ca8472b3e55b9779aafc0c682514b70c7 but envoy binds to googletest instead which doesn't seem to work in this case. https://github.com/envoyproxy/envoy/pull/16687/files#R507 + native.bind( + name = "gtest", + actual = "@com_google_googletest//:gtest", + ) \ No newline at end of file From 59837fea10ea7955785bd9ca0d005c3d97d69cfa Mon Sep 17 00:00:00 2001 From: William Juan <66322422+wjuan-AFK@users.noreply.github.com> Date: Fri, 25 Jun 2021 13:44:03 +0000 Subject: [PATCH 3/3] fix format. Signed-off-by: William Juan <66322422+wjuan-AFK@users.noreply.github.com> Signed-off-by: William Juan <66322422+wjuan-AFK@users.noreply.github.com> --- bazel/repositories.bzl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 220a8436c..c75c561d7 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -56,8 +56,9 @@ cc_library( url = "https://github.com/HdrHistogram/HdrHistogram_c/archive/%s.tar.gz" % HDR_HISTOGRAM_C_VERSION, # // clang-format on ) + # // GRPC has a dependency on gtest which needs to be bound: https://github.com/grpc/grpc/commit/decc199ca8472b3e55b9779aafc0c682514b70c7 but envoy binds to googletest instead which doesn't seem to work in this case. https://github.com/envoyproxy/envoy/pull/16687/files#R507 native.bind( name = "gtest", actual = "@com_google_googletest//:gtest", - ) \ No newline at end of file + )