This is an automated email from the ASF dual-hosted git repository.
cwylie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 4560b9d8aa New error message for task deletion (#14008)
4560b9d8aa is described below
commit 4560b9d8aaee34bc4da14cae8ffc4f4e35c96f81
Author: George Shiqi Wu <[email protected]>
AuthorDate: Mon Apr 3 17:26:09 2023 -0400
New error message for task deletion (#14008)
* New error message
* Add unit test
---
.../overlord/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 e60b3b6f8e..253a50ae3f 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 a10bcb526e..b864c730df 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()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
