* cancelJob function add result return

* update computer-k8s & computer-driver version to 0.1.1
apache · Nov 22, 2021 · 5578d88 · 5578d88
1 parent e6177e6
commit 5578d88
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/computer-driver/pom.xml b/computer-driver/pom.xml
@@ -8,6 +8,7 @@
         <version>0.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <version>0.1.1</version>
 
     <artifactId>computer-driver</artifactId>
 

diff --git a/computer-driver/src/main/java/com/baidu/hugegraph/computer/driver/ComputerDriver.java b/computer-driver/src/main/java/com/baidu/hugegraph/computer/driver/ComputerDriver.java
@@ -48,8 +48,9 @@ public interface ComputerDriver extends Closeable {
      * the job.
      * @param params reserved for other parameters in addition to jobId used
      *               to cancel job.
+     * @return Whether the job was successfully cancelled
      */
-    void cancelJob(String jobId, Map<String, String> params);
+    boolean cancelJob(String jobId, Map<String, String> params);
 
     /**
      * Wait the job to finish, it will trace the execution of job and notify

diff --git a/computer-k8s-operator/pom.xml b/computer-k8s-operator/pom.xml
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.baidu.hugegraph</groupId>
             <artifactId>computer-k8s</artifactId>
-            <version>${project.version}</version>
+            <version>0.1.1</version>
         </dependency>
     </dependencies>
 

diff --git a/computer-k8s/pom.xml b/computer-k8s/pom.xml
@@ -8,6 +8,7 @@
         <version>0.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <version>0.1.1</version>
 
     <artifactId>computer-k8s</artifactId>
 
@@ -26,7 +27,7 @@
         <dependency>
             <groupId>com.baidu.hugegraph</groupId>
             <artifactId>computer-driver</artifactId>
-            <version>${project.version}</version>
+            <version>0.1.1</version>
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>

diff --git a/computer-k8s/src/main/java/com/baidu/hugegraph/computer/k8s/driver/KubernetesDriver.java b/computer-k8s/src/main/java/com/baidu/hugegraph/computer/k8s/driver/KubernetesDriver.java
@@ -280,10 +280,8 @@ private void checkComputerConf(Map<String, String> computerConf,
     }
 
     @Override
-    public void cancelJob(String jobId, Map<String, String> params) {
-        Boolean delete = this.operation.withName(KubeUtil.crName(jobId))
-                                       .delete();
-        E.checkState(delete, "Failed to cancel Job, jobId: ", jobId);
+    public boolean cancelJob(String jobId, Map<String, String> params) {
+        return this.operation.withName(KubeUtil.crName(jobId)).delete();
     }
 
     @Override

diff --git a/computer-test/pom.xml b/computer-test/pom.xml
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>com.baidu.hugegraph</groupId>
             <artifactId>computer-k8s</artifactId>
-            <version>${project.version}</version>
+            <version>0.1.1</version>
         </dependency>
         <dependency>
             <groupId>com.baidu.hugegraph</groupId>