[incubator-gobblin] branch master updated: [GOBBLIN-1152] enable helix instance only if it is a participant

[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/incubator-gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new 18a6145  [GOBBLIN-1152] enable helix instance only if it is a participant
18a6145 is described below

commit 18a6145924b4097ff70a28557543d4ea3e86e58a
Author: Arjun <ab...@linkedin.com>
AuthorDate: Mon May 18 12:26:05 2020 -0700

    [GOBBLIN-1152] enable helix instance only if it is a participant
    
    Closes #2985 from arjun4084346/fixTaskRunner
---
 .../src/main/java/org/apache/gobblin/cluster/GobblinTaskRunner.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinTaskRunner.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinTaskRunner.java
index 6a8fed4..27f3da8 100644
--- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinTaskRunner.java
+++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinTaskRunner.java
@@ -418,8 +418,10 @@ public class GobblinTaskRunner implements StandardMetricsBridge {
   @VisibleForTesting
   void connectHelixManager() throws Exception {
     this.jobHelixManager.connect();
-    //Ensure the instance is enabled.
-    this.jobHelixManager.getClusterManagmentTool().enableInstance(clusterName, helixInstanceName, true);
+    if (!(this.isTaskDriver && this.dedicatedTaskDriverCluster)) {
+      // Ensure the instance is enabled when jobHelixManager is a PARTICIPANT
+      this.jobHelixManager.getClusterManagmentTool().enableInstance(clusterName, helixInstanceName, true);
+    }
     this.jobHelixManager.getMessagingService()
         .registerMessageHandlerFactory(GobblinHelixConstants.SHUTDOWN_MESSAGE_TYPE,
             new ParticipantShutdownMessageHandlerFactory());