From 084b06a6506a72b1ebd0dfa7a782b6b1ea52b6a4 Mon Sep 17 00:00:00 2001
From: ggao <ggao@netflix.com>
Date: Mon, 3 Nov 2025 15:49:10 -0800
Subject: [PATCH] Disable loading expired disableTE request on bootstrap

---
 .../master/resourcecluster/ResourceClusterActor.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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<DisableTaskExecutorsRequest> activeRequests =
             mantisJobStore.loadAllDisableTaskExecutorsRequests(clusterID);
         for (DisableTaskExecutorsRequest request : activeRequests) {
-            onNewDisableTaskExecutorsRequest(request);
+            if (!request.isExpired(now)) {
+                onNewDisableTaskExecutorsRequest(request);
+            } else {
+                onDisableTaskExecutorsRequestExpiry(new ExpireDisableTaskExecutorsRequest(request));
+            }
         }
 
         timers().startTimerWithFixedDelay(