From 4560b9d8aaee34bc4da14cae8ffc4f4e35c96f81 Mon Sep 17 00:00:00 2001
From: George Shiqi Wu <george.wu@imply.io>
Date: Mon, 3 Apr 2023 17:26:09 -0400
Subject: [PATCH] New error message for task deletion (#14008)

* New error message

* Add unit test
---
 .../common/DruidKubernetesPeonClient.java     |  2 +-
 .../common/DruidKubernetesPeonClientTest.java | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidKubernetesPeonClient.java b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidKubernetesPeonClient.java
index e60b3b6f8ee..253a50ae3f7 100644
--- a/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidKubernetesPeonClient.java
+++ b/extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidKubernetesPeonClient.java
@@ -133,7 +133,7 @@ public class DruidKubernetesPeonClient implements KubernetesPeonClient
       if (result) {
         log.info("Cleaned up k8s task: %s", taskId);
       } else {
-        log.info("Failed to cleanup task: %s", taskId);
+        log.info("K8s task does not exist: %s", taskId);
       }
       return result;
     } else {
diff --git a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/DruidKubernetesPeonClientTest.java b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/DruidKubernetesPeonClientTest.java
index a10bcb526e2..b864c730dff 100644
--- a/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/DruidKubernetesPeonClientTest.java
+++ b/extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/DruidKubernetesPeonClientTest.java
@@ -140,6 +140,26 @@ public class DruidKubernetesPeonClientTest
     Assertions.assertEquals(killThisOne, Iterables.getOnlyElement(toDelete)); // should only cleanup one job
   }
 
+  @Test
+  void testCleanupReturnValue() throws KubernetesResourceNotFoundException
+  {
+    DruidKubernetesPeonClient peonClient = new DruidKubernetesPeonClient(new TestKubernetesClient(this.client), "test",
+        false
+    );
+    Assertions.assertFalse(peonClient.cleanUpJob(new K8sTaskId("sometask")));
+
+    Job job = new JobBuilder()
+        .withNewMetadata()
+        .withName("sometask")
+        .addToLabels(DruidK8sConstants.LABEL_KEY, "true")
+        .endMetadata()
+        .withNewSpec()
+        .withTemplate(new PodTemplateSpec(new ObjectMeta(), K8sTestUtils.getDummyPodSpec()))
+        .endSpec().build();
+    client.batch().v1().jobs().inNamespace("test").create(job);
+    Assertions.assertTrue(peonClient.cleanUpJob(new K8sTaskId("sometask")));
+  }
+
   @Test
   void watchingALogThatDoesntExist()
   {