Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Properly release lock on all scale checks #7255

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Properly release lock on all scale checks #7255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/scala/mesosphere/marathon/MarathonSchedulerActor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ class SchedulerActions(

if (instancesToDecommission.nonEmpty) {
logger.info(s"Adjusting goals for instances ${instancesToDecommission.map(_.instanceId)} (${GoalChangeReason.OverCapacity})")
val instancesAreTerminal = KillStreamWatcher.watchForKilledTasks(instanceTracker.instanceUpdates, instances).runWith(Sink.ignore)
val instancesAreTerminal = KillStreamWatcher.watchForKilledTasks(instanceTracker.instanceUpdates, instancesToDecommission).runWith(Sink.ignore)

// Race condition with line 421. The instances we loaded might not exist anymore, e.g. the agent
// might have been removed and the instance expunged.
Expand Down