From 0cc35b2acef525f74c714045dc70a42cf13ee0c2 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Tue, 7 May 2019 16:54:48 -0400 Subject: [PATCH 01/19] fixing issue with bazel shutdown causing circleci hung --- Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index bf1fe3d6e36..24e6c39ad3e 100644 --- a/Makefile +++ b/Makefile @@ -33,30 +33,25 @@ CXX := clang++-7 endif PATH := /usr/lib/llvm-7/bin:$(PATH) +# Removed '@bazel shutdown' as it is causing CircleCI to hang build: PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) build $(BAZEL_BUILD_ARGS) $(BAZEL_TARGETS) - @bazel shutdown # Build only envoy - fast build_envoy: PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) build $(BAZEL_BUILD_ARGS) //src/envoy:envoy - @bazel shutdown clean: @bazel clean - @bazel shutdown test: PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) $(BAZEL_TARGETS) - @bazel shutdown test_asan: PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-asan -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS) - @bazel shutdown test_tsan: PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS) - @bazel shutdown check: @script/check-license-headers @@ -68,7 +63,6 @@ artifacts: build deb: CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) build $(BAZEL_BUILD_ARGS) //tools/deb:istio-proxy - @bazel shutdown .PHONY: build clean test check artifacts From b42e6c0f69f4b298aa36b384b21b1697ce8fc830 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Wed, 8 May 2019 19:13:01 -0400 Subject: [PATCH 02/19] use xcode 9.3.1 --- .circleci/config.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5731eb3c377..c628a9c9fad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,16 +71,18 @@ jobs: - /home/circleci/.cache/bazel macos: macos: - xcode: "9.3.0" + xcode: "9.3.1" environment: - BAZEL_STARTUP_ARGS: "--output_base /Users/distiller/.cache/bazel" - - BAZEL_BUILD_ARGS: "--local_resources=12288,5,1" - - BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all --local_resources=12288,5,1 --local_test_jobs=8" + - BAZEL_BUILD_ARGS: "--local_resources=12288,5,1 --incompatible_bzl_disallow_load_after_statement=false" + - BAZEL_TEST_ARGS: "--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=all --local_resources=12288,5,1 --local_test_jobs=8 --incompatible_bzl_disallow_load_after_statement=false" - CC: clang - CXX: clang++ steps: - run: sudo ntpdate -vu time.apple.com - - run: brew install bazel cmake coreutils go libtool ninja wget + - run: brew tap bazelbuild/tap + - run: brew tap-pin bazelbuild/tap + - run: brew install bazelbuild/tap/bazel cmake coreutils go libtool ninja wget - checkout - restore_cache: keys: From 96568a472d0dca296fb8356c8298d8b27ec76925 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Wed, 8 May 2019 19:23:10 -0400 Subject: [PATCH 03/19] use new cache --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c628a9c9fad..faece3cbe22 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -86,12 +86,12 @@ jobs: - checkout - restore_cache: keys: - - macos_fastbuild-bazel-cache-{{ checksum "WORKSPACE" }} + - macos_fastbuild-bazel-cache-v1-{{ checksum "WORKSPACE" }} - run: rm ~/.gitconfig - run: make build_envoy - run: make test - save_cache: - key: macos_fastbuild-bazel-cache-{{ checksum "WORKSPACE" }} + key: macos_fastbuild-bazel-cache-v1-{{ checksum "WORKSPACE" }} paths: - /Users/distiller/.cache/bazel From 0e53e259f2413d03197add0fb82fc80ca739db6e Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Wed, 8 May 2019 22:05:27 -0400 Subject: [PATCH 04/19] update to newer envoy to pick newer grpc to pass bazel build --- .circleci/config.yml | 4 ++-- WORKSPACE | 4 ++-- istio.deps | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index faece3cbe22..c628a9c9fad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -86,12 +86,12 @@ jobs: - checkout - restore_cache: keys: - - macos_fastbuild-bazel-cache-v1-{{ checksum "WORKSPACE" }} + - macos_fastbuild-bazel-cache-{{ checksum "WORKSPACE" }} - run: rm ~/.gitconfig - run: make build_envoy - run: make test - save_cache: - key: macos_fastbuild-bazel-cache-v1-{{ checksum "WORKSPACE" }} + key: macos_fastbuild-bazel-cache-{{ checksum "WORKSPACE" }} paths: - /Users/distiller/.cache/bazel diff --git a/WORKSPACE b/WORKSPACE index 1b230222fa7..f83eccf87e6 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -35,9 +35,9 @@ bind( # When updating envoy sha manually please update the sha in istio.deps file also # # Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/COMMIT.tar.gz && sha256sum COMMIT.tar.gz` -ENVOY_SHA = "5ea1a0c1cb506ed3e80d52b572b0f767f55f9f39" +ENVOY_SHA = "f35eea732cf64b19c7684c673580413840aad0ba" -ENVOY_SHA256 = "64beeb27f68ed644ff0bd37b193e5a85f49b883250940e292f6f150ec7173e38" +ENVOY_SHA256 = "a64ca9e3c313f879b569ecbd1eab9a845c04e600fbf05beb31621ebfcdf14d73" http_archive( name = "envoy", diff --git a/istio.deps b/istio.deps index ee025b4b7cc..5061601ad4c 100644 --- a/istio.deps +++ b/istio.deps @@ -11,6 +11,6 @@ "name": "ENVOY_SHA", "repoName": "envoyproxy/envoy", "file": "WORKSPACE", - "lastStableSHA": "5ea1a0c1cb506ed3e80d52b572b0f767f55f9f39" + "lastStableSHA": "f35eea732cf64b19c7684c673580413840aad0ba" } -] \ No newline at end of file +] From 718c85760afae98bcf5106542d705860830b8142 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 00:09:21 -0400 Subject: [PATCH 05/19] ThreadFactorySingleton removed from upstream --- test/integration/int_server.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/integration/int_server.cc b/test/integration/int_server.cc index e5a7416bec5..db715b0fa41 100644 --- a/test/integration/int_server.cc +++ b/test/integration/int_server.cc @@ -27,6 +27,7 @@ #include "common/network/raw_buffer_socket.h" #include "envoy/http/codec.h" #include "envoy/network/transport_socket.h" +#include "test/test_common/thread_factory_for_test.h" #include "fmt/printf.h" #include "server/connection_handler_impl.h" #include "test/test_common/network_utility.h" @@ -612,7 +613,7 @@ Server::Server(const std::string &name, : name_(name), stats_(), time_system_(), - api_(Envoy::Thread::ThreadFactorySingleton::get(), stats_, time_system_, + api_(Envoy::Thread::threadFactoryForTest(), stats_, time_system_, Envoy::Filesystem::fileSystemForTest()), dispatcher_(api_.allocateDispatcher()), connection_handler_(new Envoy::Server::ConnectionHandlerImpl( From 69ceed5ebaec9b02fa6fdda73e1c30e57cdf0c94 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 00:34:56 -0400 Subject: [PATCH 06/19] fix test --- test/integration/int_server.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/int_server.cc b/test/integration/int_server.cc index db715b0fa41..a1c10de7126 100644 --- a/test/integration/int_server.cc +++ b/test/integration/int_server.cc @@ -27,7 +27,7 @@ #include "common/network/raw_buffer_socket.h" #include "envoy/http/codec.h" #include "envoy/network/transport_socket.h" -#include "test/test_common/thread_factory_for_test.h" +#include "envoy/test/test_common/thread_factory_for_test.h" #include "fmt/printf.h" #include "server/connection_handler_impl.h" #include "test/test_common/network_utility.h" From 3b3a267e66f40eab295d124ae34fd6ed0759d195 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 10:10:04 -0400 Subject: [PATCH 07/19] resolving dependencies --- test/integration/BUILD | 2 +- test/integration/int_server.cc | 3 +-- test/integration/int_server.h | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/integration/BUILD b/test/integration/BUILD index af70546752d..fce35f6c041 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -36,7 +36,7 @@ envoy_cc_test_library( deps = [ "@envoy//source/server:server_lib", "@envoy//test/integration:http_protocol_integration_lib", - ], + ] + envoy_cc_platform_dep("@envoy//source/exe:platform_impl_lib"), ) envoy_cc_test( diff --git a/test/integration/int_server.cc b/test/integration/int_server.cc index a1c10de7126..0e7ad64f618 100644 --- a/test/integration/int_server.cc +++ b/test/integration/int_server.cc @@ -27,7 +27,6 @@ #include "common/network/raw_buffer_socket.h" #include "envoy/http/codec.h" #include "envoy/network/transport_socket.h" -#include "envoy/test/test_common/thread_factory_for_test.h" #include "fmt/printf.h" #include "server/connection_handler_impl.h" #include "test/test_common/network_utility.h" @@ -613,7 +612,7 @@ Server::Server(const std::string &name, : name_(name), stats_(), time_system_(), - api_(Envoy::Thread::threadFactoryForTest(), stats_, time_system_, + api_(platform_impl_.threadFactory(), stats_, time_system_, Envoy::Filesystem::fileSystemForTest()), dispatcher_(api_.allocateDispatcher()), connection_handler_(new Envoy::Server::ConnectionHandlerImpl( diff --git a/test/integration/int_server.h b/test/integration/int_server.h index 2e2789b84c2..5871b32131b 100644 --- a/test/integration/int_server.h +++ b/test/integration/int_server.h @@ -22,6 +22,7 @@ #include "common/stats/isolated_store_impl.h" #include "test/test_common/test_time.h" #include "test/test_common/utility.h" +#include "exe/platform_impl.h" namespace Mixer { namespace Integration { @@ -413,6 +414,8 @@ class Server : public Envoy::Network::FilterChainManager, Envoy::Http::CodecClient::Type http_type_; std::atomic connection_counter_{0U}; + + PlatformImpl platform_impl_; }; typedef std::unique_ptr ServerPtr; From a866f7d0001bc11809387faf2b8f5ed7919818a2 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 10:13:58 -0400 Subject: [PATCH 08/19] fix dependencies --- test/integration/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/BUILD b/test/integration/BUILD index fce35f6c041..31ff1289232 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -20,6 +20,7 @@ load( "@envoy//bazel:envoy_build_system.bzl", "envoy_cc_test", "envoy_cc_test_library", + "envoy_cc_platform_dep", ) envoy_cc_test_library( From 7c8cf42bf2deb4c47bac9b584f276015fdc6ad71 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 10:20:47 -0400 Subject: [PATCH 09/19] fixing linting issues --- test/integration/BUILD | 2 +- test/integration/int_server.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/BUILD b/test/integration/BUILD index 31ff1289232..be2666462b6 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -18,9 +18,9 @@ package(default_visibility = ["//visibility:public"]) load( "@envoy//bazel:envoy_build_system.bzl", + "envoy_cc_platform_dep", "envoy_cc_test", "envoy_cc_test_library", - "envoy_cc_platform_dep", ) envoy_cc_test_library( diff --git a/test/integration/int_server.h b/test/integration/int_server.h index 5871b32131b..7fbc5c224d8 100644 --- a/test/integration/int_server.h +++ b/test/integration/int_server.h @@ -20,9 +20,9 @@ #include "common/http/codec_client.h" #include "common/network/listen_socket_impl.h" #include "common/stats/isolated_store_impl.h" +#include "exe/platform_impl.h" #include "test/test_common/test_time.h" #include "test/test_common/utility.h" -#include "exe/platform_impl.h" namespace Mixer { namespace Integration { From 3f742e3c430bb54405b5ed59effa9f1b2ca1d13a Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 10:42:25 -0400 Subject: [PATCH 10/19] fixing more dependencies --- test/integration/int_client.cc | 2 +- test/integration/int_client.h | 5 ++++- test/integration/int_server.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/integration/int_client.cc b/test/integration/int_client.cc index 6447ec128f3..32caf9e486a 100644 --- a/test/integration/int_client.cc +++ b/test/integration/int_client.cc @@ -447,7 +447,7 @@ Client::Client(const std::string &name) stats_(), thread_(nullptr), time_system_(), - api_(Envoy::Thread::ThreadFactorySingleton::get(), stats_, time_system_, + api_(platform_impl_.threadFactory(), stats_, time_system_, Envoy::Filesystem::fileSystemForTest()), dispatcher_{api_.allocateDispatcher()} {} diff --git a/test/integration/int_client.h b/test/integration/int_client.h index 2a243c98784..0106fbca74f 100644 --- a/test/integration/int_client.h +++ b/test/integration/int_client.h @@ -25,6 +25,7 @@ #include "envoy/http/codec.h" #include "envoy/network/address.h" #include "envoy/thread/thread.h" +#include "exe/platform_impl.h" #include "fmt/printf.h" #include "test/test_common/test_time.h" #include "test/test_common/utility.h" @@ -232,6 +233,8 @@ class Client : Envoy::Logger::Loggable { std::mutex connections_lock_; std::unordered_map connections_; uint32_t connection_counter_{0U}; + + Envoy::PlatformImpl platform_impl_; }; class LoadGenerator : Envoy::Logger::Loggable { @@ -313,4 +316,4 @@ class LoadGenerator : Envoy::Logger::Loggable { typedef std::unique_ptr LoadGeneratorPtr; } // namespace Integration -} // namespace Mixer \ No newline at end of file +} // namespace Mixer diff --git a/test/integration/int_server.h b/test/integration/int_server.h index 7fbc5c224d8..b616d541a30 100644 --- a/test/integration/int_server.h +++ b/test/integration/int_server.h @@ -415,7 +415,7 @@ class Server : public Envoy::Network::FilterChainManager, Envoy::Http::CodecClient::Type http_type_; std::atomic connection_counter_{0U}; - PlatformImpl platform_impl_; + Envoy::PlatformImpl platform_impl_; }; typedef std::unique_ptr ServerPtr; From ed66f91f0b244aa96c4eefb19abcbcc9d7018ae4 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 11:24:20 -0400 Subject: [PATCH 11/19] fix constructor --- test/integration/int_client.cc | 1 + test/integration/int_server.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/test/integration/int_client.cc b/test/integration/int_client.cc index 32caf9e486a..d2c2342957e 100644 --- a/test/integration/int_client.cc +++ b/test/integration/int_client.cc @@ -447,6 +447,7 @@ Client::Client(const std::string &name) stats_(), thread_(nullptr), time_system_(), + platform_impl_(), api_(platform_impl_.threadFactory(), stats_, time_system_, Envoy::Filesystem::fileSystemForTest()), dispatcher_{api_.allocateDispatcher()} {} diff --git a/test/integration/int_server.cc b/test/integration/int_server.cc index 0e7ad64f618..1b1aec9d934 100644 --- a/test/integration/int_server.cc +++ b/test/integration/int_server.cc @@ -612,6 +612,7 @@ Server::Server(const std::string &name, : name_(name), stats_(), time_system_(), + platform_impl_(), api_(platform_impl_.threadFactory(), stats_, time_system_, Envoy::Filesystem::fileSystemForTest()), dispatcher_(api_.allocateDispatcher()), From 6f15005fb2f7a431c70699dacf8e896d88a4a326 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 11:46:32 -0400 Subject: [PATCH 12/19] changing member initializer ordering --- test/integration/int_client.h | 3 +-- test/integration/int_server.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/integration/int_client.h b/test/integration/int_client.h index 0106fbca74f..fa619b18a0a 100644 --- a/test/integration/int_client.h +++ b/test/integration/int_client.h @@ -227,14 +227,13 @@ class Client : Envoy::Logger::Loggable { Envoy::Stats::IsolatedStoreImpl stats_; Envoy::Thread::ThreadPtr thread_; Envoy::Event::TestRealTimeSystem time_system_; + Envoy::PlatformImpl platform_impl_; Envoy::Api::Impl api_; std::shared_ptr dispatcher_; std::mutex connections_lock_; std::unordered_map connections_; uint32_t connection_counter_{0U}; - - Envoy::PlatformImpl platform_impl_; }; class LoadGenerator : Envoy::Logger::Loggable { diff --git a/test/integration/int_server.h b/test/integration/int_server.h index b616d541a30..9532f0e6a7a 100644 --- a/test/integration/int_server.h +++ b/test/integration/int_server.h @@ -385,6 +385,7 @@ class Server : public Envoy::Network::FilterChainManager, std::string name_; Envoy::Stats::IsolatedStoreImpl stats_; Envoy::Event::TestRealTimeSystem time_system_; + Envoy::PlatformImpl platform_impl_; Envoy::Api::Impl api_; Envoy::Event::DispatcherPtr dispatcher_; Envoy::Network::ConnectionHandlerPtr connection_handler_; @@ -414,8 +415,6 @@ class Server : public Envoy::Network::FilterChainManager, Envoy::Http::CodecClient::Type http_type_; std::atomic connection_counter_{0U}; - - Envoy::PlatformImpl platform_impl_; }; typedef std::unique_ptr ServerPtr; From 12956f0d3a080944de9bde3dd243187854ffe61e Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 14:46:22 -0400 Subject: [PATCH 13/19] test --- .bazelrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.bazelrc b/.bazelrc index a0bfbcb421d..2e33aa138b3 100644 --- a/.bazelrc +++ b/.bazelrc @@ -43,6 +43,7 @@ build:clang-tsan --copt -fsanitize=thread build:clang-tsan --linkopt -fsanitize=thread build:clang-tsan --define tcmalloc=disabled build:clang-tsan --linkopt -fuse-ld=lld +build:clang-tsan --copt -DEVENT__DISABLE_DEBUG_MODE # Clang 5.0 MSAN - broken today since we need to rebuild lib[std]c++ and external deps with MSAN # support (see https://github.com/envoyproxy/envoy/issues/443). From f472173e039ddb8d7315d4f927d0226073e6ef00 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 15:14:33 -0400 Subject: [PATCH 14/19] test --- .bazelrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.bazelrc b/.bazelrc index 2e33aa138b3..c20e10eb0fb 100644 --- a/.bazelrc +++ b/.bazelrc @@ -19,6 +19,11 @@ build:asan --define tcmalloc=disabled build:asan --build_tag_filters=-no_asan build:asan --test_tag_filters=-no_asan build:asan --define signal_trace=disabled +build:asan --copt -DADDRESS_SANITIZER=1 +build:asan --copt -D__SANITIZE_ADDRESS__ +build:asan --test_env=ASAN_OPTIONS=handle_abort=1:allow_addr2line=true:check_initialization_order=true:strict_init_order=true:detect_odr_violation=1 +build:asan --test_env=UBSAN_OPTIONS=halt_on_error=true:print_stacktrace=1 +build:asan --test_env=ASAN_SYMBOLIZER_PATH # Clang 5.0 ASAN build:clang-asan --define ENVOY_CONFIG_ASAN=1 @@ -43,6 +48,7 @@ build:clang-tsan --copt -fsanitize=thread build:clang-tsan --linkopt -fsanitize=thread build:clang-tsan --define tcmalloc=disabled build:clang-tsan --linkopt -fuse-ld=lld +# Needed due to https://github.com/libevent/libevent/issues/777 build:clang-tsan --copt -DEVENT__DISABLE_DEBUG_MODE # Clang 5.0 MSAN - broken today since we need to rebuild lib[std]c++ and external deps with MSAN From fb6de5f9e12a4f76bbfccaf524e8b3818b29f95f Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 15:45:17 -0400 Subject: [PATCH 15/19] resoving asan conflicts --- .bazelrc | 5 ----- cc_gogo_protobuf.bzl | 6 +++--- googleapis.bzl | 6 +++--- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.bazelrc b/.bazelrc index c20e10eb0fb..3bdd440d24f 100644 --- a/.bazelrc +++ b/.bazelrc @@ -19,11 +19,6 @@ build:asan --define tcmalloc=disabled build:asan --build_tag_filters=-no_asan build:asan --test_tag_filters=-no_asan build:asan --define signal_trace=disabled -build:asan --copt -DADDRESS_SANITIZER=1 -build:asan --copt -D__SANITIZE_ADDRESS__ -build:asan --test_env=ASAN_OPTIONS=handle_abort=1:allow_addr2line=true:check_initialization_order=true:strict_init_order=true:detect_odr_violation=1 -build:asan --test_env=UBSAN_OPTIONS=halt_on_error=true:print_stacktrace=1 -build:asan --test_env=ASAN_SYMBOLIZER_PATH # Clang 5.0 ASAN build:clang-asan --define ENVOY_CONFIG_ASAN=1 diff --git a/cc_gogo_protobuf.bzl b/cc_gogo_protobuf.bzl index c0d064130a8..ccda236062e 100644 --- a/cc_gogo_protobuf.bzl +++ b/cc_gogo_protobuf.bzl @@ -59,7 +59,7 @@ cc_proto_library( ) """ http_archive( - name = "gogoproto_git", + name = "com_github_gogo_protobuf", strip_prefix = "protobuf-" + GOGO_PROTO_SHA, url = "https://github.com/gogo/protobuf/archive/" + GOGO_PROTO_SHA + ".tar.gz", sha256 = GOGO_PROTO_SHA256, @@ -69,10 +69,10 @@ cc_proto_library( if bind: native.bind( name = "cc_gogoproto", - actual = "@gogoproto_git//:cc_gogoproto", + actual = "@com_github_gogo_protobuf//:cc_gogoproto", ) native.bind( name = "cc_gogoproto_genproto", - actual = "@gogoproto_git//:cc_gogoproto_genproto", + actual = "@com_github_gogo_protobuf//:cc_gogoproto_genproto", ) diff --git a/googleapis.bzl b/googleapis.bzl index 0ab001e3109..d8077d70995 100644 --- a/googleapis.bzl +++ b/googleapis.bzl @@ -41,7 +41,7 @@ cc_proto_library( """ http_archive( - name = "com_github_googleapis_googleapis", + name = "googleapis", build_file_content = GOOGLEAPIS_BUILD_FILE, strip_prefix = "googleapis-" + GOOGLEAPIS_SHA, url = "https://github.com/googleapis/googleapis/archive/" + GOOGLEAPIS_SHA + ".tar.gz", @@ -51,9 +51,9 @@ cc_proto_library( if bind: native.bind( name = "rpc_status_proto", - actual = "@com_github_googleapis_googleapis//:rpc_status_proto", + actual = "@googleapis//:rpc_status_proto", ) native.bind( name = "rpc_status_proto_genproto", - actual = "@com_github_googleapis_googleapis//:rpc_status_proto_genproto", + actual = "@googleapis//:rpc_status_proto_genproto", ) From f1ebde63fb9ce69c900caa8a1f94785ccd7521f3 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 16:26:06 -0400 Subject: [PATCH 16/19] test asan flag --- .bazelrc | 1 + cc_gogo_protobuf.bzl | 6 +++--- googleapis.bzl | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.bazelrc b/.bazelrc index 3bdd440d24f..ef26c895d2d 100644 --- a/.bazelrc +++ b/.bazelrc @@ -19,6 +19,7 @@ build:asan --define tcmalloc=disabled build:asan --build_tag_filters=-no_asan build:asan --test_tag_filters=-no_asan build:asan --define signal_trace=disabled +build:asan --test_env=ASAN_OPTIONS=detect_odr_violation=0 # Clang 5.0 ASAN build:clang-asan --define ENVOY_CONFIG_ASAN=1 diff --git a/cc_gogo_protobuf.bzl b/cc_gogo_protobuf.bzl index ccda236062e..c0d064130a8 100644 --- a/cc_gogo_protobuf.bzl +++ b/cc_gogo_protobuf.bzl @@ -59,7 +59,7 @@ cc_proto_library( ) """ http_archive( - name = "com_github_gogo_protobuf", + name = "gogoproto_git", strip_prefix = "protobuf-" + GOGO_PROTO_SHA, url = "https://github.com/gogo/protobuf/archive/" + GOGO_PROTO_SHA + ".tar.gz", sha256 = GOGO_PROTO_SHA256, @@ -69,10 +69,10 @@ cc_proto_library( if bind: native.bind( name = "cc_gogoproto", - actual = "@com_github_gogo_protobuf//:cc_gogoproto", + actual = "@gogoproto_git//:cc_gogoproto", ) native.bind( name = "cc_gogoproto_genproto", - actual = "@com_github_gogo_protobuf//:cc_gogoproto_genproto", + actual = "@gogoproto_git//:cc_gogoproto_genproto", ) diff --git a/googleapis.bzl b/googleapis.bzl index d8077d70995..0ab001e3109 100644 --- a/googleapis.bzl +++ b/googleapis.bzl @@ -41,7 +41,7 @@ cc_proto_library( """ http_archive( - name = "googleapis", + name = "com_github_googleapis_googleapis", build_file_content = GOOGLEAPIS_BUILD_FILE, strip_prefix = "googleapis-" + GOOGLEAPIS_SHA, url = "https://github.com/googleapis/googleapis/archive/" + GOOGLEAPIS_SHA + ".tar.gz", @@ -51,9 +51,9 @@ cc_proto_library( if bind: native.bind( name = "rpc_status_proto", - actual = "@googleapis//:rpc_status_proto", + actual = "@com_github_googleapis_googleapis//:rpc_status_proto", ) native.bind( name = "rpc_status_proto_genproto", - actual = "@googleapis//:rpc_status_proto_genproto", + actual = "@com_github_googleapis_googleapis//:rpc_status_proto_genproto", ) From c8c1f351fe5ce56a4c05e54cb7b816018bfd7b60 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 16:31:07 -0400 Subject: [PATCH 17/19] use detect_odr_violation=1 --- .bazelrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelrc b/.bazelrc index ef26c895d2d..41071f8edad 100644 --- a/.bazelrc +++ b/.bazelrc @@ -19,7 +19,7 @@ build:asan --define tcmalloc=disabled build:asan --build_tag_filters=-no_asan build:asan --test_tag_filters=-no_asan build:asan --define signal_trace=disabled -build:asan --test_env=ASAN_OPTIONS=detect_odr_violation=0 +build:asan --test_env=ASAN_OPTIONS=detect_odr_violation=1 # Clang 5.0 ASAN build:clang-asan --define ENVOY_CONFIG_ASAN=1 From 8ac3334264afa309daa62c66a4c38f097b377a08 Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Thu, 9 May 2019 19:24:44 -0400 Subject: [PATCH 18/19] fix detect_odr_violation=1 --- .bazelrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.bazelrc b/.bazelrc index 41071f8edad..ffdf878d706 100644 --- a/.bazelrc +++ b/.bazelrc @@ -37,6 +37,7 @@ build:clang-asan --test_tag_filters=-no_asan build:clang-asan --define signal_trace=disabled build:clang-asan --test_env=ASAN_SYMBOLIZER_PATH build:clang-asan --linkopt -fuse-ld=lld +build:clang-asan --test_env=ASAN_OPTIONS=detect_odr_violation=1 # Clang 5.0 TSAN build:clang-tsan --define ENVOY_CONFIG_TSAN=1 From 9f2ec210cd4a625ccdfe7fa9aeae87f3ce5057bf Mon Sep 17 00:00:00 2001 From: Hai Huang Date: Fri, 10 May 2019 11:18:49 -0400 Subject: [PATCH 19/19] use master branch of envoyproxy/envoy --- WORKSPACE | 4 ++-- istio.deps | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index f83eccf87e6..e7e17129c71 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -35,9 +35,9 @@ bind( # When updating envoy sha manually please update the sha in istio.deps file also # # Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/COMMIT.tar.gz && sha256sum COMMIT.tar.gz` -ENVOY_SHA = "f35eea732cf64b19c7684c673580413840aad0ba" +ENVOY_SHA = "a79164f50f55cfd02f0516eeb693c8fee18e0f90" -ENVOY_SHA256 = "a64ca9e3c313f879b569ecbd1eab9a845c04e600fbf05beb31621ebfcdf14d73" +ENVOY_SHA256 = "f8a36c0f84ccf1f651ed7a8c3941a9b821bc035be4ceecefda3f50853064800e" http_archive( name = "envoy", diff --git a/istio.deps b/istio.deps index 5061601ad4c..793ad967786 100644 --- a/istio.deps +++ b/istio.deps @@ -11,6 +11,6 @@ "name": "ENVOY_SHA", "repoName": "envoyproxy/envoy", "file": "WORKSPACE", - "lastStableSHA": "f35eea732cf64b19c7684c673580413840aad0ba" + "lastStableSHA": "a79164f50f55cfd02f0516eeb693c8fee18e0f90" } ]