Skip to content

build/alts: fixes needed for .bzl and to bump gRPC to 1.20.#6773

Merged
htuch merged 7 commits intoenvoyproxy:masterfrom
htuch:fix-bazel-0.25
May 2, 2019
Merged

build/alts: fixes needed for .bzl and to bump gRPC to 1.20.#6773
htuch merged 7 commits intoenvoyproxy:masterfrom
htuch:fix-bazel-0.25

Conversation

@htuch
Copy link
Copy Markdown
Member

@htuch htuch commented May 1, 2019

This continues #6620.

See also #6308 and
#5461.

Risk level: Low
Testing: Existing tests

Signed-off-by: Harvey Tuch htuch@google.com

This continues envoyproxy#6620.

See also envoyproxy#6308 and
envoyproxy#5461.

Risk level: Low
Testing: Existing tests

Signed-off-by: Harvey Tuch <htuch@google.com>
@htuch htuch requested review from JimmyCYJ, cmluciano and lizan May 1, 2019 23:56
@htuch
Copy link
Copy Markdown
Member Author

htuch commented May 1, 2019

@JimmyCYJ I think this is the solution, but I'm having issues getting the integration test to pass. I suspect the gRPC handshake fake that we spin up there might also be interacting? Almost all the tests pass except the last one.

I'll look into this more later, but wanted to get the ball rolling on this as it's blocking a significant number of devs.

Copy link
Copy Markdown
Member

@lizan lizan left a comment

Choose a reason for hiding this comment

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

LGTM, fix format?
/wait

@JimmyCYJ
Copy link
Copy Markdown
Member

JimmyCYJ commented May 2, 2019

/lgtm

Thanks for the fix!

JimmyCYJ
JimmyCYJ previously approved these changes May 2, 2019
htuch added 2 commits May 1, 2019 22:41
Signed-off-by: Harvey Tuch <htuch@google.com>
Signed-off-by: Harvey Tuch <htuch@google.com>
@htuch
Copy link
Copy Markdown
Member Author

htuch commented May 2, 2019

I had to add explicit grpc_init/grpc_shutdown as well. Turns out we were missing this before, and gRPC client library does weird things, like auto-shutdown in completion queue destruction, if you don't have a global grpc_init.

":terminate_handler_lib",
],
}) + envoy_cc_platform_dep("platform_impl_lib"),
}) + envoy_cc_platform_dep("platform_impl_lib") + envoy_google_grpc_external_deps(),
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@jplevyak FYI, I'm adding this macro in this PR that you might also find useful.

lizan
lizan previously approved these changes May 2, 2019
Signed-off-by: Harvey Tuch <htuch@google.com>
htuch added 2 commits May 2, 2019 00:39
Signed-off-by: Harvey Tuch <htuch@google.com>
Signed-off-by: Harvey Tuch <htuch@google.com>
lizan
lizan previously approved these changes May 2, 2019
JimmyCYJ
JimmyCYJ previously approved these changes May 2, 2019
Signed-off-by: Harvey Tuch <htuch@google.com>
@htuch htuch dismissed stale reviews from JimmyCYJ and lizan via 910d85f May 2, 2019 10:13
Copy link
Copy Markdown
Member

@cmluciano cmluciano left a comment

Choose a reason for hiding this comment

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

One potential follow-up comment but lgtm, thanks!

: options_(options), component_factory_(component_factory), thread_factory_(thread_factory),
file_system_(file_system), stats_allocator_(symbol_table_) {
#ifdef ENVOY_GOOGLE_GRPC
grpc_init();
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ahhh this is where I got stuck. For some reason I though one of the c_smt_ptrs was handling this.

options.get(), target_name, handshaker_service.c_str(), is_upstream, &handshaker);
tsi_result status =
alts_tsi_handshaker_create(options.get(), target_name, handshaker_service.c_str(),
is_upstream, nullptr /* interested_parties */, &handshaker);
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I had a TODO here to follow up on if Envoy would benefit from allowing this pollset to be configurable. Do you think this would be useful?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I'll defer to @JimmyCYJ on this one.

@htuch htuch merged commit f35eea7 into envoyproxy:master May 2, 2019
@htuch htuch deleted the fix-bazel-0.25 branch May 2, 2019 12:48
jeffpiazza-google pushed a commit to jeffpiazza-google/envoy that referenced this pull request May 3, 2019
…xy#6773)

This continues envoyproxy#6620.

See also envoyproxy#6308 and
envoyproxy#5461.

Risk level: Low
Testing: Existing tests

Signed-off-by: Harvey Tuch <htuch@google.com>

Signed-off-by: Jeff Piazza <jeffpiazza@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants