gkleiman closed pull request #118: Make Mesos healtchecks compatible with
Marathon
URL: https://github.com/apache/mesos/pull/118
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/src/health-check/main.cpp b/src/health-check/main.cpp
index 4cc9dde892..b606ea26ce 100644
--- a/src/health-check/main.cpp
+++ b/src/health-check/main.cpp
@@ -132,16 +132,14 @@ class HealthCheckerProcess : public
ProtobufProcess<HealthCheckerProcess>
{
VLOG(1) << "Check passed";
- // Send a healthy status update on the first success,
- // and on the first success following failure(s).
- if (initializing || consecutiveFailures > 0) {
- TaskHealthStatus taskHealthStatus;
- taskHealthStatus.set_healthy(true);
- taskHealthStatus.mutable_task_id()->CopyFrom(taskID);
- send(executor, taskHealthStatus);
- initializing = false;
- }
- consecutiveFailures = 0;
+ // Send a healthy status update on every check, because
https://github.com/mesosphere/marathon/issues/916
+
+ TaskHealthStatus taskHealthStatus;
+ taskHealthStatus.set_healthy(true);
+ taskHealthStatus.mutable_task_id()->CopyFrom(taskID);
+ send(executor, taskHealthStatus);
+ initializing = false;
+
reschedule();
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
