Force updating the job status to KILLED when killing a job that has a…

… connected agent but no response observer
Netflix · Oct 24, 2023 · 9c012bb · 9c012bb
1 parent 082212c
commit 9c012bb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/...c/main/java/com/netflix/genie/web/agent/apis/rpc/v4/endpoints/GRpcJobKillServiceImpl.java b/...c/main/java/com/netflix/genie/web/agent/apis/rpc/v4/endpoints/GRpcJobKillServiceImpl.java
@@ -183,13 +183,6 @@ public void killJob(
                             JobStatus.KILLED
                         );
                         throw new GenieJobNotFoundException(e);
-                    } catch (final Exception e) {
-                        log.error(
-                            "Failed to force updating the status of Job {} to {} due to unexpected exceptions",
-                            jobId,
-                            JobStatus.KILLED
-                        );
-                        throw e;
                     }
                 } else {
                     responseObserver.onNext(JobKillRegistrationResponse.newBuilder().build());

diff --git a/...roovy/com/netflix/genie/web/agent/apis/rpc/v4/endpoints/GRpcJobKillServiceImplSpec.groovy b/...roovy/com/netflix/genie/web/agent/apis/rpc/v4/endpoints/GRpcJobKillServiceImplSpec.groovy
@@ -182,19 +182,6 @@ class GRpcJobKillServiceImplSpec extends Specification {
         0 * this.responseObserver.onCompleted()
         thrown(GenieJobNotFoundException)
 
-        when: "The job is active, the agent is connected, the job is local but no observer, and updating job status fails"
-        this.serviceSpy.killJob(this.jobId, this.reason, this.servletRequest)
-
-        then: "The database is not updated and exception is thrown"
-        1 * this.persistenceService.getJobStatus(this.jobId) >> JobStatus.CLAIMED
-        1 * this.persistenceService.updateJobStatus(this.jobId, JobStatus.CLAIMED, JobStatus.KILLED, this.reason) >> {
-            throw new Exception()
-        }
-        1 * this.agentRoutingService.isAgentConnectionLocal(this.jobId) >> true
-        0 * this.responseObserver.onNext(_ as JobKillRegistrationResponse)
-        0 * this.responseObserver.onCompleted()
-        thrown(Exception)
-
         when: "The job is active, the agent is connected, and there is an observer"
         this.serviceSpy.registerForKillNotification(this.request, this.responseObserver)
         this.serviceSpy.killJob(this.jobId, this.reason, null)