Skip to content

Update Envoy SHA to latest. #2214

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.

Sign up for GitHub

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

Merged
istio-testing merged 15 commits into from
May 15, 2019
Merged

Update Envoy SHA to latest. #2214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4685fa7
Update Envoy SHA to latest.
jplevyak May 14, 2019
fb94613
Fix formatting.
jplevyak May 14, 2019
4808ca9
Downgrade bazel version for macos.
jplevyak May 14, 2019
367455d
Fix build with bazel 0.25.
jplevyak May 14, 2019
1108a56
Remove duplicate dependency.
jplevyak May 15, 2019
104ae09
Address comments.
jplevyak May 15, 2019
dedc44b
Address comments.
jplevyak May 15, 2019
2e111f4
Supress tsan issue in libevent.
jplevyak May 15, 2019
dafc46c
Update supression file.
jplevyak May 15, 2019
513ba50
typo
jplevyak May 15, 2019
1e9b644
Remove duplicate protobuf library. Add quotes on supressions argument.
jplevyak May 15, 2019
368c242
Add -DEVENT__DISABLE_DEBUG_MODE for tsan targets to work around race
jplevyak May 15, 2019
9582136
Fix typo, remove disabling of debug mode.
jplevyak May 15, 2019
5db29ee
Remove quotes.
jplevyak May 15, 2019
1c8506d
Remove protobuf.bzl.
jplevyak May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ test_asan:
PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-asan -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)

test_tsan:
PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)
PATH=$(PATH) CC=$(CC) CXX=$(CXX) bazel $(BAZEL_STARTUP_ARGS) test $(BAZEL_TEST_ARGS) --config=clang-tsan --test_env=TSAN_OPTIONS=suppressions=$(TOP)/tsan.suppressions -- $(BAZEL_TARGETS) $(SANITIZER_EXCLUSIONS)

check:
@script/check-license-headers
Expand Down
6 changes: 4 additions & 2 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ bind(
# When updating envoy sha manually please update the sha in istio.deps file also
Comment thread
jplevyak marked this conversation as resolved.
#
# Determine SHA256 `wget https://github.com/envoyproxy/envoy/archive/COMMIT.tar.gz && sha256sum COMMIT.tar.gz`
ENVOY_SHA = "5ea1a0c1cb506ed3e80d52b572b0f767f55f9f39"
# envoy commit date 05/15/2019
# bazel version: 0.25.0
Copy link
Copy Markdown
Contributor

@PiotrSikora PiotrSikora May 15, 2019

Choose a reason for hiding this comment

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

Nit: this isn't really true, since Bazel version depends on the build image / CI environment, and 0.25.x is only used on macOS right now, since it's pulled at build time.

Copy link
Copy Markdown
Contributor Author

@jplevyak jplevyak May 15, 2019

Choose a reason for hiding this comment

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

but it does work for 0.25... I think Yuchen wanted this so he could find a version that would work.

Copy link
Copy Markdown
Contributor

@PiotrSikora PiotrSikora May 15, 2019

Choose a reason for hiding this comment

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

Fair enough, but it uses 0.22 for Linux builds (CircleCI & Prow), 0.25 is only used for macOS.

Copy link
Copy Markdown
Contributor

@lambdai lambdai May 15, 2019

Choose a reason for hiding this comment

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

Let's merge this and I will create the correct a circleci image in which has bazel 0.25

ENVOY_SHA = "228a963d1308eb1b06e2e8b7387e0bfa72fe77ea"

ENVOY_SHA256 = "64beeb27f68ed644ff0bd37b193e5a85f49b883250940e292f6f150ec7173e38"
ENVOY_SHA256 = "6480ed4a526c504dc7c7c6784c7f143183a5481d944b999a45b7a7fb925d8e09"

http_archive(
name = "envoy",
Expand Down
78 changes: 0 additions & 78 deletions cc_gogo_protobuf.bzl
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions googleapis.bzl
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions istio.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"name": "ENVOY_SHA",
"repoName": "envoyproxy/envoy",
"file": "WORKSPACE",
"lastStableSHA": "5ea1a0c1cb506ed3e80d52b572b0f767f55f9f39"
"lastStableSHA": "228a963d1308eb1b06e2e8b7387e0bfa72fe77ea"
}
]
]
66 changes: 0 additions & 66 deletions protobuf.bzl
View file
Open in desktop

This file was deleted.

21 changes: 7 additions & 14 deletions repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
################################################################################
#
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load(":x_tools_imports.bzl", "go_x_tools_imports_repositories")

GOOGLETEST = "d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0"
GOOGLETEST_SHA256 = "01508c8f47c99509130f128924f07f3a60be05d039cff571bb11d60bb11a3581"
Expand Down Expand Up @@ -137,9 +138,9 @@ cc_proto_library(
protoc = "//external:protoc",
visibility = ["//visibility:public"],
deps = [
"//external:cc_gogoproto",
"//external:cc_wkt_protos",
"//external:rpc_status_proto",
"@com_github_gogo_protobuf//:gogo_proto_cc",
"@com_google_protobuf//:cc_wkt_protos",
"@googleapis//:rpc_status_protos",
],
)

Expand Down Expand Up @@ -168,7 +169,7 @@ cc_proto_library(
protoc = "//external:protoc",
visibility = ["//visibility:public"],
deps = [
"//external:cc_gogoproto",
"@com_github_gogo_protobuf//:gogo_proto_cc",
],
)

Expand All @@ -181,7 +182,7 @@ cc_proto_library(
protoc = "//external:protoc",
visibility = ["//visibility:public"],
deps = [
"//external:cc_gogoproto",
"@com_github_gogo_protobuf//:gogo_proto_cc",
],
)

Expand All @@ -194,7 +195,7 @@ cc_proto_library(
protoc = "//external:protoc",
visibility = ["//visibility:public"],
deps = [
"//external:cc_gogoproto",
"@com_github_gogo_protobuf//:gogo_proto_cc",
],
)

Expand Down Expand Up @@ -234,14 +235,6 @@ filegroup(
actual = "@mixerapi_git//:tcp_cluster_rewrite_config_cc_proto",
)

load(":protobuf.bzl", "protobuf_repositories")
Comment thread
jplevyak marked this conversation as resolved.
load(":cc_gogo_protobuf.bzl", "cc_gogoproto_repositories")
load(":x_tools_imports.bzl", "go_x_tools_imports_repositories")
load(":googleapis.bzl", "googleapis_repositories")

def mixerapi_dependencies():
protobuf_repositories(load_repo = True, bind = True)
cc_gogoproto_repositories()
go_x_tools_imports_repositories()
googleapis_repositories()
mixerapi_repositories()
2 changes: 1 addition & 1 deletion test/integration/int_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ Client::Client(const std::string &name)
stats_(),
thread_(nullptr),
time_system_(),
api_(Envoy::Thread::ThreadFactorySingleton::get(), stats_, time_system_,
api_(Envoy::Thread::threadFactoryForTest(), stats_, time_system_,
Envoy::Filesystem::fileSystemForTest()),
dispatcher_{api_.allocateDispatcher()} {}

Expand Down
4 changes: 2 additions & 2 deletions test/integration/int_server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class ServerStreamImpl : public ServerStream,
}

response_status_ = status;
response_body_ = Envoy::Grpc::Common::serializeBody(message);
response_body_ = Envoy::Grpc::Common::serializeToGrpcFrame(message);
Envoy::Event::TimerCb send_grpc_response = [this, delay]() {
ENVOY_LOG(
debug,
Expand Down Expand Up @@ -612,7 +612,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(
Expand Down
1 change: 1 addition & 0 deletions tsan.suppressions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
race:event_debug_mode_too_late
Comment thread
jplevyak marked this conversation as resolved.