From bd8b6abe5d4299feaf24c19c8473278fc35c20b4 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:57:40 -0800
Subject: [PATCH] Fix null taskId causing model undeploy issue (#1945) (#1947)

Signed-off-by: zane-neo <zaniu@amazon.com>
(cherry picked from commit 7d79bf69d0cddf6c835725dcbf26d686b90df88e)

Co-authored-by: zane-neo <zaniu@amazon.com>
---
 .../ml/action/syncup/TransportSyncUpOnNodeAction.java          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin/src/main/java/org/opensearch/ml/action/syncup/TransportSyncUpOnNodeAction.java b/plugin/src/main/java/org/opensearch/ml/action/syncup/TransportSyncUpOnNodeAction.java
index 3afb2cff51..94327f190e 100644
--- a/plugin/src/main/java/org/opensearch/ml/action/syncup/TransportSyncUpOnNodeAction.java
+++ b/plugin/src/main/java/org/opensearch/ml/action/syncup/TransportSyncUpOnNodeAction.java
@@ -197,6 +197,9 @@ void cleanUpLocalCache(Map<String, Set<String>> runningDeployModelTasks) {
             return;
         }
         for (String taskId : allTaskIds) {
+            if (taskId == null) {
+                continue;
+            }
             MLTaskCache mlTaskCache = mlTaskManager.getMLTaskCache(taskId);
             // Task could be a prediction task, and it could be completed and removed from cache in predict thread during the cleaning up.
             if (mlTaskCache == null) {