You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by bi...@apache.org on 2013/07/19 21:00:12 UTC
git commit: TEZ-309. Fix Tez after YARN-918 (bikas)
Updated Branches:
refs/heads/master 45747ce40 -> 172cd87dd
TEZ-309. Fix Tez after YARN-918 (bikas)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tez/commit/172cd87d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tez/tree/172cd87d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tez/diff/172cd87d
Branch: refs/heads/master
Commit: 172cd87dd9d165c0d9486ad854b8b55ed48fba28
Parents: 45747ce
Author: Bikas Saha <bi...@apache.org>
Authored: Fri Jul 19 11:56:42 2013 -0700
Committer: Bikas Saha <bi...@apache.org>
Committed: Fri Jul 19 11:56:42 2013 -0700
----------------------------------------------------------------------
.../java/org/apache/tez/dag/app/rm/TaskScheduler.java | 9 +++------
.../tez/dag/app/rm/TaskSchedulerEventHandler.java | 3 +--
.../org/apache/tez/dag/app/rm/TestTaskScheduler.java | 12 ++----------
3 files changed, 6 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/172cd87d/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java
index 52f7d89..9469aa0 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskScheduler.java
@@ -34,7 +34,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.service.AbstractService;
import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
import org.apache.hadoop.yarn.api.records.ApplicationAccessType;
-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.Container;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.ContainerStatus;
@@ -139,14 +138,13 @@ public class TaskScheduler extends AbstractService
}
}
- public TaskScheduler(ApplicationAttemptId id,
- TaskSchedulerAppCallback appClient,
+ public TaskScheduler(TaskSchedulerAppCallback appClient,
String appHostName,
int appHostPort,
String appTrackingUrl) {
super(TaskScheduler.class.getName());
this.appClient = appClient;
- this.amRmClient = AMRMClientAsync.createAMRMClientAsync(id, 1000, this);
+ this.amRmClient = AMRMClientAsync.createAMRMClientAsync(1000, this);
this.appHostName = appHostName;
this.appHostPort = appHostPort;
this.appTrackingUrl = appTrackingUrl;
@@ -154,8 +152,7 @@ public class TaskScheduler extends AbstractService
@Private
@VisibleForTesting
- TaskScheduler(ApplicationAttemptId id,
- TaskSchedulerAppCallback appClient,
+ TaskScheduler(TaskSchedulerAppCallback appClient,
String appHostName,
int appHostPort,
String appTrackingUrl,
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/172cd87d/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
index b00b195..14baecd 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/TaskSchedulerEventHandler.java
@@ -319,8 +319,7 @@ public class TaskSchedulerEventHandler extends AbstractService
// TODO set heartbeat value from conf here
InetSocketAddress serviceAddr = clientService.getBindAddress();
taskScheduler =
- new TaskScheduler(appContext.getApplicationAttemptId(),
- this,
+ new TaskScheduler(this,
serviceAddr.getHostName(),
serviceAddr.getPort(),
"");
http://git-wip-us.apache.org/repos/asf/incubator-tez/blob/172cd87d/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
index 038fd1f..b950215 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/rm/TestTaskScheduler.java
@@ -37,8 +37,6 @@ import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
import org.apache.hadoop.yarn.api.records.ApplicationAccessType;
-import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
-import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.Container;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.ContainerStatus;
@@ -75,13 +73,10 @@ public class TestTaskScheduler {
AMRMClientAsync<CookieContainerRequest> mockRMClient =
mock(AMRMClientAsync.class);
- ApplicationAttemptId attemptId =
- ApplicationAttemptId.newInstance(
- ApplicationId.newInstance(1234, 0), 0);
String appHost = "host";
int appPort = 0;
String appUrl = "url";
- TaskScheduler scheduler = new TaskScheduler(attemptId, mockApp, appHost,
+ TaskScheduler scheduler = new TaskScheduler(mockApp, appHost,
appPort, appUrl, mockRMClient);
Configuration conf = new Configuration();
@@ -343,13 +338,10 @@ public class TestTaskScheduler {
AMRMClientAsync<CookieContainerRequest> mockRMClient =
mock(AMRMClientAsync.class);
- ApplicationAttemptId attemptId =
- ApplicationAttemptId.newInstance(
- ApplicationId.newInstance(1234, 0), 0);
String appHost = "host";
int appPort = 0;
String appUrl = "url";
- TaskScheduler scheduler = new TaskScheduler(attemptId, mockApp, appHost,
+ TaskScheduler scheduler = new TaskScheduler(mockApp, appHost,
appPort, appUrl, mockRMClient);
Configuration conf = new Configuration();