diff --git a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/resourcecluster/ResourceClusterActor.java b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/resourcecluster/ResourceClusterActor.java index f40de6d97..a2d16f16e 100644 --- a/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/resourcecluster/ResourceClusterActor.java +++ b/mantis-control-plane/mantis-control-plane-server/src/main/java/io/mantisrx/master/resourcecluster/ResourceClusterActor.java @@ -229,10 +229,15 @@ public void preStart() throws Exception { fetchJobArtifactsToCache(); + final Instant now = clock.instant(); List activeRequests = mantisJobStore.loadAllDisableTaskExecutorsRequests(clusterID); for (DisableTaskExecutorsRequest request : activeRequests) { - onNewDisableTaskExecutorsRequest(request); + if (!request.isExpired(now)) { + onNewDisableTaskExecutorsRequest(request); + } else { + onDisableTaskExecutorsRequestExpiry(new ExpireDisableTaskExecutorsRequest(request)); + } } timers().startTimerWithFixedDelay(