You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ka...@apache.org on 2016/06/12 21:30:58 UTC
[1/2] hadoop git commit: YARN-5124. Modify AMRMClient to set the
ExecutionType in the ResourceRequest. Addendum to fix compilation. (Arun
Suresh via kasha)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 f3c7a99e3 -> 63da64191
YARN-5124. Modify AMRMClient to set the ExecutionType in the ResourceRequest. Addendum to fix compilation. (Arun Suresh via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a92be02c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a92be02c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a92be02c
Branch: refs/heads/branch-2
Commit: a92be02c2ef394d93b6bcd73604cbab46cc4576f
Parents: f3c7a99
Author: Karthik Kambatla <ka...@cloudera.com>
Authored: Sun Jun 12 14:28:14 2016 -0700
Committer: Karthik Kambatla <ka...@cloudera.com>
Committed: Sun Jun 12 14:28:14 2016 -0700
----------------------------------------------------------------------
.../client/api/impl/BaseAMRMProxyE2ETest.java | 5 +++--
.../api/impl/TestDistributedScheduling.java | 18 ++++++++++++------
2 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a92be02c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/BaseAMRMProxyE2ETest.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/BaseAMRMProxyE2ETest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/BaseAMRMProxyE2ETest.java
index 0b62054..4adf3f4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/BaseAMRMProxyE2ETest.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/BaseAMRMProxyE2ETest.java
@@ -29,6 +29,7 @@ import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.ApplicationReport;
import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
+import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
import org.apache.hadoop.yarn.api.records.LocalResource;
import org.apache.hadoop.yarn.api.records.NodeReport;
@@ -126,12 +127,12 @@ public abstract class BaseAMRMProxyE2ETest {
}
ResourceBlacklistRequest resourceBlacklistRequest = ResourceBlacklistRequest
- .newInstance(new ArrayList<>(), new ArrayList<>());
+ .newInstance(new ArrayList<String>(), new ArrayList<String>());
int responseId = 1;
return AllocateRequest.newInstance(responseId, 0, resourceAsk,
- new ArrayList<>(), resourceBlacklistRequest);
+ new ArrayList<ContainerId>(), resourceBlacklistRequest);
}
protected ApplicationAttemptId createApp(YarnClient yarnClient,
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a92be02c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestDistributedScheduling.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestDistributedScheduling.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestDistributedScheduling.java
index a556aa2..132a89f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestDistributedScheduling.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestDistributedScheduling.java
@@ -448,19 +448,25 @@ public class TestDistributedScheduling extends BaseAMRMProxyE2ETest {
try {
ApplicationMasterProtocol mockRM = mock(ApplicationMasterProtocol
.class);
+ final Resource _capability = capability;
+ final String[] _nodes = nodes;
+ final String[] _racks = racks;
+ final Priority _priority = priority;
+ final Priority _priority2 = priority2;
+
when(mockRM.allocate(any(AllocateRequest.class))).thenAnswer(
new Answer<AllocateResponse>() {
public AllocateResponse answer(InvocationOnMock invocation)
throws Exception {
amc.removeContainerRequest(
- new AMRMClient.ContainerRequest(capability, nodes,
- racks, priority));
+ new AMRMClient.ContainerRequest(_capability, _nodes,
+ _racks, _priority));
amc.removeContainerRequest(
- new AMRMClient.ContainerRequest(capability, nodes, racks,
- priority));
+ new AMRMClient.ContainerRequest(_capability, _nodes, _racks,
+ _priority));
amc.removeContainerRequest(
- new AMRMClient.ContainerRequest(capability, null, null,
- priority2, true, null,
+ new AMRMClient.ContainerRequest(_capability, null, null,
+ _priority2, true, null,
ExecutionTypeRequest.newInstance(
ExecutionType.OPPORTUNISTIC, true)));
throw new Exception();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/2] hadoop git commit: HADOOP-13243.
TestRollingFileSystemSink.testSetInitialFlushTime() fails intermittently.
(Daniel Templeton via kasha)
Posted by ka...@apache.org.
HADOOP-13243. TestRollingFileSystemSink.testSetInitialFlushTime() fails intermittently. (Daniel Templeton via kasha)
(cherry picked from commit 49b4064644b242921af4ddf1de9932bc7bcf5f0e)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/63da6419
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/63da6419
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/63da6419
Branch: refs/heads/branch-2
Commit: 63da64191020797f17f1308627f34002f311c0d2
Parents: a92be02
Author: Karthik Kambatla <ka...@cloudera.com>
Authored: Sun Jun 12 14:12:31 2016 -0700
Committer: Karthik Kambatla <ka...@cloudera.com>
Committed: Sun Jun 12 14:28:19 2016 -0700
----------------------------------------------------------------------
.../hadoop/metrics2/sink/TestRollingFileSystemSink.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/63da6419/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSink.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSink.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSink.java
index 9c34dba..1273052 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSink.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSink.java
@@ -118,15 +118,14 @@ public class TestRollingFileSystemSink {
diff = rfsSink.nextFlush.getTimeInMillis() - calendar.getTimeInMillis();
assertTrue("The initial flush time was calculated incorrectly: " + diff,
- (diff >= -1000L) && (diff < -900L));
+ (diff == 0L) || ((diff > -1000L) && (diff < -900L)));
calendar.set(Calendar.MILLISECOND, 10);
rfsSink.setInitialFlushTime(calendar.getTime());
diff = rfsSink.nextFlush.getTimeInMillis() - calendar.getTimeInMillis();
assertTrue("The initial flush time was calculated incorrectly: " + diff,
- ((diff >= -10L) && (diff <= 0L) ||
- ((diff > -1000L) && (diff < -910L))));
+ (diff >= -10L) && (diff <= 0L) || ((diff > -1000L) && (diff < -910L)));
calendar.set(Calendar.SECOND, 1);
calendar.set(Calendar.MILLISECOND, 10);
@@ -134,8 +133,7 @@ public class TestRollingFileSystemSink {
diff = rfsSink.nextFlush.getTimeInMillis() - calendar.getTimeInMillis();
assertTrue("The initial flush time was calculated incorrectly: " + diff,
- ((diff >= -10L) && (diff <= 0L) ||
- ((diff > -1000L) && (diff < -910L))));
+ (diff >= -10L) && (diff <= 0L) || ((diff > -1000L) && (diff < -910L)));
// Now try pathological settings
rfsSink = new RollingFileSystemSink(1000, 1000000);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org