You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gobblin.apache.org by ab...@apache.org on 2017/12/13 08:14:39 UTC
incubator-gobblin git commit: Remove the unused helixManager
parameter from GobblinHelixTaskStateTracker
Repository: incubator-gobblin
Updated Branches:
refs/heads/master a35a10f7e -> 6eb253e7e
Remove the unused helixManager parameter from GobblinHelixTaskStateTracker
Closes #2202 from HappyRay/remove-unused-helix-
manager-parameter
Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/6eb253e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/6eb253e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/6eb253e7
Branch: refs/heads/master
Commit: 6eb253e7e11fb46121fab3cc90c07c4a0488c2b8
Parents: a35a10f
Author: Ray Yang <ru...@gmail.com>
Authored: Wed Dec 13 00:14:34 2017 -0800
Committer: Abhishek Tiwari <ab...@gmail.com>
Committed: Wed Dec 13 00:14:34 2017 -0800
----------------------------------------------------------------------
.../apache/gobblin/cluster/GobblinHelixTaskStateTracker.java | 5 +----
.../main/java/org/apache/gobblin/cluster/GobblinTaskRunner.java | 3 +--
.../java/org/apache/gobblin/cluster/GobblinHelixTaskTest.java | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/6eb253e7/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixTaskStateTracker.java
----------------------------------------------------------------------
diff --git a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixTaskStateTracker.java b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixTaskStateTracker.java
index 2abc70f..79df1fa 100644
--- a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixTaskStateTracker.java
+++ b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixTaskStateTracker.java
@@ -49,14 +49,11 @@ public class GobblinHelixTaskStateTracker extends AbstractTaskStateTracker {
private static final Logger LOGGER = LoggerFactory.getLogger(GobblinHelixTaskStateTracker.class);
- private final HelixManager helixManager;
-
// Mapping between tasks and the task state reporters associated with them
private final Map<String, ScheduledFuture<?>> scheduledReporters = Maps.newHashMap();
- public GobblinHelixTaskStateTracker(Properties properties, HelixManager helixManager) {
+ public GobblinHelixTaskStateTracker(Properties properties) {
super(properties, LOGGER);
- this.helixManager = helixManager;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/6eb253e7/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinTaskRunner.java
----------------------------------------------------------------------
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 76d9098..3274bd7 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
@@ -82,7 +82,6 @@ import org.apache.gobblin.util.ConfigUtils;
import org.apache.gobblin.util.HadoopUtils;
import org.apache.gobblin.util.JvmUtils;
import org.apache.gobblin.util.PathUtils;
-import org.apache.gobblin.util.logs.Log4jConfigurationHelper;
/**
@@ -157,7 +156,7 @@ public class GobblinTaskRunner {
Properties properties = ConfigUtils.configToProperties(config);
TaskExecutor taskExecutor = new TaskExecutor(properties);
- TaskStateTracker taskStateTracker = new GobblinHelixTaskStateTracker(properties, this.helixManager);
+ TaskStateTracker taskStateTracker = new GobblinHelixTaskStateTracker(properties);
Path appWorkDir = appWorkDirOptional.isPresent() ? appWorkDirOptional.get() :
GobblinClusterUtils.getAppWorkDirPathFromConfig(config, this.fs, applicationName, applicationId);
http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/6eb253e7/gobblin-cluster/src/test/java/org/apache/gobblin/cluster/GobblinHelixTaskTest.java
----------------------------------------------------------------------
diff --git a/gobblin-cluster/src/test/java/org/apache/gobblin/cluster/GobblinHelixTaskTest.java b/gobblin-cluster/src/test/java/org/apache/gobblin/cluster/GobblinHelixTaskTest.java
index 171115a..1cbd72e 100644
--- a/gobblin-cluster/src/test/java/org/apache/gobblin/cluster/GobblinHelixTaskTest.java
+++ b/gobblin-cluster/src/test/java/org/apache/gobblin/cluster/GobblinHelixTaskTest.java
@@ -96,7 +96,7 @@ public class GobblinHelixTaskTest {
this.helixManager = Mockito.mock(HelixManager.class);
Mockito.when(this.helixManager.getInstanceName()).thenReturn(GobblinHelixTaskTest.class.getSimpleName());
- this.taskStateTracker = new GobblinHelixTaskStateTracker(new Properties(), this.helixManager);
+ this.taskStateTracker = new GobblinHelixTaskStateTracker(new Properties());
this.localFs = FileSystem.getLocal(configuration);
this.appWorkDir = new Path(GobblinHelixTaskTest.class.getSimpleName());