PR changes

apache · Oct 16, 2023 · cf05797 · cf05797
1 parent 3ae0327
commit cf05797
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/...rlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycle.java b/...rlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesPeonLifecycle.java
@@ -203,12 +203,14 @@ protected synchronized TaskStatus join(long timeout) throws IllegalStateExceptio
     finally {
       try {
         saveLogs();
+        shutdown();
       }
       catch (Exception e) {
-        log.warn(e, "Log processing failed for task [%s]", taskId);
+        log.warn(e, "Cleanup failed for task [%s]", taskId);
+      }
+      finally {
+        stopTask();
       }
-      shutdown();
-      stopTask();
     }
   }
 

diff --git a/...s-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesWorkItem.java b/...s-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/KubernetesWorkItem.java
@@ -19,6 +19,7 @@
 
 package org.apache.druid.k8s.overlord;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.SettableFuture;
@@ -43,6 +44,7 @@ public KubernetesWorkItem(Task task)
     this(task, SettableFuture.create());
   }
 
+  @VisibleForTesting
   public KubernetesWorkItem(Task task, SettableFuture<TaskStatus> result)
   {
     super(task.getId(), result);

diff --git a/...-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateLocationAction.java b/...-service/src/main/java/org/apache/druid/indexing/common/actions/UpdateLocationAction.java
@@ -26,6 +26,11 @@
 import org.apache.druid.indexer.TaskLocation;
 import org.apache.druid.indexing.common.task.Task;
 
+/* This class was added for mm-less ingestion in order to let the peon manage its own location lifecycle by submitting
+actions to the overlord. https://github.com/apache/druid/pull/15133 moved this location logic to the overlord itself
+so this Action is no longer needed. For backwards compatibility with old peons, this class was left in but can be deprecated
+for a later druid release.
+*/
 @Deprecated
 public class UpdateLocationAction implements TaskAction<Void>
 {