Added TCP healthcheck capabilities to the HdsDelegate#4079
Merged
htuch merged 6 commits intoenvoyproxy:masterfrom Aug 12, 2018
Merged
Added TCP healthcheck capabilities to the HdsDelegate#4079htuch merged 6 commits intoenvoyproxy:masterfrom
htuch merged 6 commits intoenvoyproxy:masterfrom
Conversation
Signed-off-by: Lilika Markatou <lilika@google.com>
Member
|
@hennna can you take a pass on this? Thanks. |
Contributor
Author
|
@hennna friendly ping |
htuch
suggested changes
Aug 10, 2018
Member
htuch
left a comment
There was a problem hiding this comment.
Yeah, looks great, just a few cleanups.
|
|
||
| // Creates a basic HealthCheckSpecifier message containing one endpoint and | ||
| // one TCP health_check | ||
| envoy::service::discovery::v2::HealthCheckSpecifier makeTCPHealthCheckSpecifier() { |
| health_check->mutable_health_checks(0)->mutable_interval()->set_seconds(1); | ||
| health_check->mutable_health_checks(0)->mutable_unhealthy_threshold()->set_value(2); | ||
| health_check->mutable_health_checks(0)->mutable_healthy_threshold()->set_value(2); | ||
| auto tcp_hc = health_check->mutable_health_checks(0)->mutable_tcp_health_check(); |
| ->mutable_endpoints(0) | ||
| ->mutable_address() | ||
| ->mutable_socket_address() | ||
| ->set_port_value(host_upstream_->localAddress()->ip()->port()); |
Member
There was a problem hiding this comment.
Nit: consider using addressToProtobufAddress() in source/common/network/utility.h for this (and elsewhere in the HDS tests).
| } | ||
|
|
||
| // Tests that Envoy can healthcheck two hosts that are in the same cluster, and | ||
| // Tests Envoy TCP healthchecking an endpoint that doesn't respond and reporting that it is |
| ASSERT_TRUE(host_upstream_->waitForRawConnection(host_fake_raw_connection_)); | ||
| ASSERT_TRUE( | ||
| host_fake_raw_connection_->waitForData(FakeRawConnection::waitForInexactMatch("Ping"))); | ||
| auto ret = host_fake_raw_connection_->write("Voronoi"); |
| ASSERT_TRUE(host_upstream_->waitForRawConnection(host_fake_raw_connection_)); | ||
| ASSERT_TRUE( | ||
| host_fake_raw_connection_->waitForData(FakeRawConnection::waitForInexactMatch("Ping"))); | ||
| auto ret = host_fake_raw_connection_->write("Pong"); |
Signed-off-by: Lilika Markatou <lilika@google.com>
Signed-off-by: Lilika Markatou <lilika@google.com>
hennna
previously approved these changes
Aug 10, 2018
Contributor
hennna
left a comment
There was a problem hiding this comment.
Looks good! Sorry for the delay! I need to update my notifications from GitHub
| hds_stream_->sendGrpcMessage(server_health_check_specifier_); | ||
| test_server_->waitForCounterGe("hds_delegate.requests", ++hds_requests_); | ||
|
|
||
| // Envoys asks the endpoint |
Contributor
There was a problem hiding this comment.
comment nit: what is Envoy asking for?
Signed-off-by: Lilika Markatou <lilika@google.com>
Member
|
@markatou also need to resolve merge conflict :) |
Signed-off-by: Lilika Markatou <lilika@google.com>
snowp
pushed a commit
to snowp/envoy
that referenced
this pull request
Aug 14, 2018
* origin/master: (38 commits) test: add tests for corner-cases around sending requests before run() starts or after run() ends. (envoyproxy#4114) perf: reduce the memory usage of LC Trie construction (envoyproxy#4117) test: moving redundant code in websocket_integration_test to utilities (envoyproxy#4127) test: make YamlLoadFromStringFail less picky about error msg. (envoyproxy#4141) rbac: add rbac network filter. (envoyproxy#4083) fuzz: route lookup and header finalization fuzzer. (envoyproxy#4116) Set content-type and content-length (envoyproxy#4113) fault: use FractionalPercent for percent (envoyproxy#3978) test: Fix inverted exact match logic in IntegrationTcpClient::waitForData() (envoyproxy#4134) Added cluster_name to load assignment config for static cluster (envoyproxy#4123) ssl: refactor ContextConfig to use TlsCertificateConfig (envoyproxy#4115) syscall: refactor OsSysCalls for deeper errno latching (envoyproxy#4111) thrift_proxy: fix oneway bugs (envoyproxy#4025) Do not crash when converting YAML to JSON fails (envoyproxy#4110) config: allow unknown fields flag (take 2) (envoyproxy#4096) Use a jittered backoff strategy for handling HdsDelegate stream/connection failures (envoyproxy#4108) bazel: use GCS remote cache (envoyproxy#4050) Add thread local cache of overload action states (envoyproxy#4090) Added TCP healthcheck capabilities to the HdsDelegate (envoyproxy#4079) secret: add secret provider interface and use it for TlsCertificates (envoyproxy#4086) ... Signed-off-by: Snow Pettersen <snowp@squareup.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The HdsDelegate now informs the management server that it can perform TCP healthchecks.
This change also comes with three tests showing that indeed the HdsDelegate can perform TCP healthchecks.
Risk Level: Low
This is for #1310.