Fix grace period after kill for health check failure #7221
Conversation
This file contains 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
Following the change of task id / instance id format, task health status was not properly tracked because bound to the same instance id after successive kills for health check failure. This fix propose to address the issue by tracking health status by task id to ensure it to cleaned each time a task is terminated, whatever the reason. JIRA Issues: MARATHON-8745
timcharper
suggested changes
Oct 1, 2020
| @@ -40,7 +41,7 @@ private[health] class HealthCheckActor( | |||
| implicit val mat = ActorMaterializer() | |||
| import context.dispatcher | |||
|
|
|||
| val healthByInstanceId = TrieMap.empty[Instance.Id, Health] | |||
| val healthByInstanceId = TrieMap.empty[Task.Id, Health] | |||
There was a problem hiding this comment.
seems like we oughta rename this map?
| inactiveInstanceIds.foreach { inactiveId => | ||
| healthByInstanceId.remove(inactiveId) | ||
| } | ||
| val activeTaskIds: Set[Task.Id] = instances.map(_.appTask).filter(_.isActive).map(_.taskId).to(Set) |
There was a problem hiding this comment.
Suggested change
| val activeTaskIds: Set[Task.Id] = instances.map(_.appTask).filter(_.isActive).map(_.taskId).to(Set) | |
| val activeTaskIds: Set[Task.Id] = instances.iterator.map(_.appTask).filter(_.isActive).map(_.taskId).to(Set) |
| healthByInstanceId.remove(inactiveId) | ||
| } | ||
| val activeTaskIds: Set[Task.Id] = instances.map(_.appTask).filter(_.isActive).map(_.taskId).to(Set) | ||
| healthByInstanceId.retain((taskId, health) => activeTaskIds(taskId)) |
| @@ -192,7 +191,9 @@ private[health] class HealthCheckActor( | |||
| } | |||
|
|
|||
| def receive: Receive = { | |||
| case GetInstanceHealth(instanceId) => sender() ! healthByInstanceId.getOrElse(instanceId, Health(instanceId)) | |||
| case GetInstanceHealth(instanceId) => | |||
| sender() ! healthByInstanceId.find(_._1.instanceId == instanceId) | |||
There was a problem hiding this comment.
Hmm... so we're going to scan a map? This seems like this could potentially perform poorly with lots of health checks. Maybe we should keep it indexed by instance id and evict the health status if the task id changes?
|
Thanks for the PR! I've reviewed it and left some feedback, I'm most concerned about changing the index and introducing a scan for what was previously a map lookup. Thank you! |
rohitjain25
reviewed
Jan 6, 2024
There was a problem hiding this comment.
def update(result: HealthResult): Health =
result match {
case Healthy(_, _, time, _) =>
copy(
firstSuccess = firstSuccess.orElse(Some(time)),
lastSuccess = Some(time),
consecutiveFailures = 0
)
case Unhealthy(_, _, cause, time, _) =>
copy(
lastFailure = Some(time),
lastFailureCause = Some(cause)
)
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Following the change of task id / instance id format, task health status
was not properly tracked because bound to the same instance id after
successive kills for health check failure. This fix propose to address
the issue by tracking health status by task id to ensure it to cleaned
each time a task is terminated, whatever the reason.
JIRA Issues: MARATHON-8745