envoyproxy
diff --git a/‎source/common/upstream/health_checker_impl.cc‎
Lines changed: 8 additions & 4 deletions b/‎source/common/upstream/health_checker_impl.cc‎
Lines changed: 8 additions & 4 deletions
diff --git a/‎source/common/upstream/health_checker_impl.h‎
Lines changed: 3 additions & 0 deletions b/‎source/common/upstream/health_checker_impl.h‎
Lines changed: 3 additions & 0 deletions
@@ -360,6 +360,7 @@ TcpHealthCheckerImpl::TcpActiveHealthCheckSession::~TcpActiveHealthCheckSession(
 
 void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onDeferredDelete() {
   if (client_) {
+    expect_close_ = true;
     client_->close(Network::ConnectionCloseType::NoFlush);
   }
 }
@@ -371,6 +372,7 @@ void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onData(Buffer::Instance&
     data.drain(data.length());
     handleSuccess(false);
     if (!parent_.reuse_connection_) {
+      expect_close_ = true;
       client_->close(Network::ConnectionCloseType::NoFlush);
     }
   } else {
@@ -379,12 +381,11 @@ void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onData(Buffer::Instance&
 }
 
 void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onEvent(Network::ConnectionEvent event) {
-  if (event == Network::ConnectionEvent::RemoteClose) {
-    handleFailure(envoy::data::core::v2alpha::HealthCheckFailureType::NETWORK);
-  }
-
   if (event == Network::ConnectionEvent::RemoteClose ||
       event == Network::ConnectionEvent::LocalClose) {
+    if (!expect_close_) {
+      handleFailure(envoy::data::core::v2alpha::HealthCheckFailureType::NETWORK);
+    }
     parent_.dispatcher_.deferredDelete(std::move(client_));
   }
 
@@ -403,6 +404,7 @@ void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onEvent(Network::Connect
     // TODO(mattklein123): In the case that a user configured bytes to write, they will not be
     // be written, since we currently have no way to know if the bytes actually get written via
     // the connection interface. We might want to figure out how to handle this better later.
+    expect_close_ = true;
     client_->close(Network::ConnectionCloseType::NoFlush);
     handleSuccess(false);
   }
@@ -416,6 +418,7 @@ void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onInterval() {
     client_->addConnectionCallbacks(*session_callbacks_);
     client_->addReadFilter(session_callbacks_);
 
+    expect_close_ = false;
     client_->connect();
     client_->noDelay(true);
   }
@@ -431,6 +434,7 @@ void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onInterval() {
 }
 
 void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onTimeout() {
+  expect_close_ = true;
   host_->setActiveHealthFailureType(Host::ActiveHealthFailureType::TIMEOUT);
   client_->close(Network::ConnectionCloseType::NoFlush);
 }
 
@@ -252,6 +252,9 @@ class TcpHealthCheckerImpl : public HealthCheckerImplBase {
     TcpHealthCheckerImpl& parent_;
     Network::ClientConnectionPtr client_;
     std::shared_ptr<TcpSessionCallbacks> session_callbacks_;
+    // If true, stream close was initiated by us, not e.g. remote close or TCP reset.
+    // In this case healthcheck status already reported, only state cleanup required.
+    bool expect_close_{};
   };
 
   typedef std::unique_ptr<TcpActiveHealthCheckSession> TcpActiveHealthCheckSessionPtr;
Original file line number	Diff line number	Diff line change
`@@ -360,6 +360,7 @@ TcpHealthCheckerImpl::TcpActiveHealthCheckSession::~TcpActiveHealthCheckSession(`
`360`	`360`
`361`	`361`	`void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onDeferredDelete() {`
`362`	`362`	`if (client_) {`
	`363`	`+ expect_close_ = true;`
`363`	`364`	`client_->close(Network::ConnectionCloseType::NoFlush);`
`364`	`365`	`}`
`365`	`366`	`}`
`@@ -371,6 +372,7 @@ void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onData(Buffer::Instance&`
`371`	`372`	`data.drain(data.length());`
`372`	`373`	`handleSuccess(false);`
`373`	`374`	`if (!parent_.reuse_connection_) {`
	`375`	`+ expect_close_ = true;`
`374`	`376`	`client_->close(Network::ConnectionCloseType::NoFlush);`
`375`	`377`	`}`
`376`	`378`	`} else {`
`@@ -379,12 +381,11 @@ void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onData(Buffer::Instance&`
`379`	`381`	`}`
`380`	`382`
`381`	`383`	`void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onEvent(Network::ConnectionEvent event) {`
`382`		`- if (event == Network::ConnectionEvent::RemoteClose) {`
`383`		`- handleFailure(envoy::data::core::v2alpha::HealthCheckFailureType::NETWORK);`
`384`		`- }`
`385`		`-`
`386`	`384`	`if (event == Network::ConnectionEvent::RemoteClose \|\|`
`387`	`385`	`event == Network::ConnectionEvent::LocalClose) {`
	`386`	`+ if (!expect_close_) {`
	`387`	`+ handleFailure(envoy::data::core::v2alpha::HealthCheckFailureType::NETWORK);`
	`388`	`+ }`
`388`	`389`	`parent_.dispatcher_.deferredDelete(std::move(client_));`
`389`	`390`	`}`
`390`	`391`
`@@ -403,6 +404,7 @@ void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onEvent(Network::Connect`
`403`	`404`	`// TODO(mattklein123): In the case that a user configured bytes to write, they will not be`
`404`	`405`	`// be written, since we currently have no way to know if the bytes actually get written via`
`405`	`406`	`// the connection interface. We might want to figure out how to handle this better later.`
	`407`	`+ expect_close_ = true;`
`406`	`408`	`client_->close(Network::ConnectionCloseType::NoFlush);`
`407`	`409`	`handleSuccess(false);`
`408`	`410`	`}`
`@@ -416,6 +418,7 @@ void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onInterval() {`
`416`	`418`	`client_->addConnectionCallbacks(*session_callbacks_);`
`417`	`419`	`client_->addReadFilter(session_callbacks_);`
`418`	`420`
	`421`	`+ expect_close_ = false;`
`419`	`422`	`client_->connect();`
`420`	`423`	`client_->noDelay(true);`
`421`	`424`	`}`
`@@ -431,6 +434,7 @@ void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onInterval() {`
`431`	`434`	`}`
`432`	`435`
`433`	`436`	`void TcpHealthCheckerImpl::TcpActiveHealthCheckSession::onTimeout() {`
	`437`	`+ expect_close_ = true;`
`434`	`438`	`host_->setActiveHealthFailureType(Host::ActiveHealthFailureType::TIMEOUT);`
`435`	`439`	`client_->close(Network::ConnectionCloseType::NoFlush);`
`436`	`440`	`}`