[gobblin] branch master updated: [GOBBLIN-1460] Fix NPE in DagManager cleanup

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

suvasude pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new dd4c08d  [GOBBLIN-1460] Fix NPE in DagManager cleanup
dd4c08d is described below

commit dd4c08d180b965960441c120ba649fb18ef21eef
Author: aprokofiev <ap...@linkedin.com>
AuthorDate: Sun Jun 6 14:22:06 2021 -0700

    [GOBBLIN-1460] Fix NPE in DagManager cleanup
    
    Under certain conditions, we can get a null list
    when checking if
    dag has a running job. This is a quickfix to
    address that.
    
    Closes #3300 from aplex/dag-manager-npe
---
 .../org/apache/gobblin/service/modules/orchestration/DagManager.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/DagManager.java b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/DagManager.java
index 37632d7..31a7361 100644
--- a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/DagManager.java
+++ b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/orchestration/DagManager.java
@@ -1102,7 +1102,8 @@ public class DagManager extends AbstractIdleService {
     }
 
     private boolean hasRunningJobs(String dagId) {
-      return !this.dagToJobs.get(dagId).isEmpty();
+      List<DagNode<JobExecutionPlan>> dagNodes = this.dagToJobs.get(dagId);
+      return dagNodes != null && !dagNodes.isEmpty();
     }
 
     private ContextAwareCounter getRunningJobsCounter(DagNode<JobExecutionPlan> dagNode) {