[06/50] [abbrv] hadoop git commit: YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed by Eric Badger.

2016-05-19 Thread arp 
YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed 
by Eric Badger.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1217c8f6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1217c8f6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1217c8f6

Branch: refs/heads/HDFS-7240
Commit: 1217c8f6b49e3afd8ca008ffddcf6615f0accfc5
Parents: 576e2d1
Author: Eric Payne 
Authored: Mon May 16 20:27:07 2016 +
Committer: Eric Payne 
Committed: Mon May 16 20:28:04 2016 +

--
 .../server/resourcemanager/scheduler/fifo/TestFifoScheduler.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1217c8f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
index 90b9969..02c60cf 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
@@ -1140,7 +1140,8 @@ public class TestFifoScheduler {
 waitCount = 0;
 while (waitCount++ != 20) {
   report_nm1 = rm.getResourceScheduler().getNodeReport(nm1.getNodeId());
-  if (report_nm1.getAvailableResource().getMemory() != 0) {
+  if (null != report_nm1 &&
+  report_nm1.getAvailableResource().getMemory() != 0) {
 break;
   }
   LOG.info("Waiting for RMNodeResourceUpdateEvent to be handled... Tried "


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[16/50] [abbrv] hadoop git commit: YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed by Eric Badger.

2016-05-17 Thread wangda 
YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed 
by Eric Badger.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1217c8f6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1217c8f6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1217c8f6

Branch: refs/heads/YARN-3368
Commit: 1217c8f6b49e3afd8ca008ffddcf6615f0accfc5
Parents: 576e2d1
Author: Eric Payne 
Authored: Mon May 16 20:27:07 2016 +
Committer: Eric Payne 
Committed: Mon May 16 20:28:04 2016 +

--
 .../server/resourcemanager/scheduler/fifo/TestFifoScheduler.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1217c8f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
index 90b9969..02c60cf 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
@@ -1140,7 +1140,8 @@ public class TestFifoScheduler {
 waitCount = 0;
 while (waitCount++ != 20) {
   report_nm1 = rm.getResourceScheduler().getNodeReport(nm1.getNodeId());
-  if (report_nm1.getAvailableResource().getMemory() != 0) {
+  if (null != report_nm1 &&
+  report_nm1.getAvailableResource().getMemory() != 0) {
 break;
   }
   LOG.info("Waiting for RMNodeResourceUpdateEvent to be handled... Tried "


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed by Eric Badger.

2016-05-16 Thread epayne 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 8f1739502 -> 0ee36fd51


YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed 
by Eric Badger.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0ee36fd5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0ee36fd5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0ee36fd5

Branch: refs/heads/branch-2.7
Commit: 0ee36fd51190ed10022b8d4c9098f6fecc0679af
Parents: 8f17395
Author: Eric Payne 
Authored: Mon May 16 21:12:26 2016 +
Committer: Eric Payne 
Committed: Mon May 16 21:12:26 2016 +

--
 .../hadoop/yarn/server/resourcemanager/TestFifoScheduler.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ee36fd5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java
index 2327af4..a128d5f 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestFifoScheduler.java
@@ -584,7 +584,8 @@ public class TestFifoScheduler {
 waitCount = 0;
 while (waitCount++ != 20) {
   report_nm1 = rm.getResourceScheduler().getNodeReport(nm1.getNodeId());
-  if (report_nm1.getAvailableResource().getMemory() != 0) {
+  if (null != report_nm1 &&
+  report_nm1.getAvailableResource().getMemory() != 0) {
 break;
   }
   LOG.info("Waiting for RMNodeResourceUpdateEvent to be handled... Tried "


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed by Eric Badger. (cherry picked from commit 1217c8f6b49e3afd8ca008ffddcf6615f0accfc5)

2016-05-16 Thread epayne 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 28a2f28e4 -> a552932b3


YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed 
by Eric Badger.
(cherry picked from commit 1217c8f6b49e3afd8ca008ffddcf6615f0accfc5)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a552932b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a552932b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a552932b

Branch: refs/heads/branch-2.8
Commit: a552932b3881f3ba1244d92dae917e36bb515fd5
Parents: 28a2f28
Author: Eric Payne 
Authored: Mon May 16 20:27:07 2016 +
Committer: Eric Payne 
Committed: Mon May 16 20:44:41 2016 +

--
 .../server/resourcemanager/scheduler/fifo/TestFifoScheduler.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a552932b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
index bbcc800..7b06319 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
@@ -1151,7 +1151,8 @@ public class TestFifoScheduler {
 waitCount = 0;
 while (waitCount++ != 20) {
   report_nm1 = rm.getResourceScheduler().getNodeReport(nm1.getNodeId());
-  if (report_nm1.getAvailableResource().getMemory() != 0) {
+  if (null != report_nm1 &&
+  report_nm1.getAvailableResource().getMemory() != 0) {
 break;
   }
   LOG.info("Waiting for RMNodeResourceUpdateEvent to be handled... Tried "


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed by Eric Badger. (cherry picked from commit 1217c8f6b49e3afd8ca008ffddcf6615f0accfc5)

2016-05-16 Thread epayne 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 bb41547fb -> 42b2a34ed


YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed 
by Eric Badger.
(cherry picked from commit 1217c8f6b49e3afd8ca008ffddcf6615f0accfc5)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/42b2a34e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/42b2a34e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/42b2a34e

Branch: refs/heads/branch-2
Commit: 42b2a34ed8979ad8712d2be4be2f5103c32d4ae2
Parents: bb41547
Author: Eric Payne 
Authored: Mon May 16 20:27:07 2016 +
Committer: Eric Payne 
Committed: Mon May 16 20:38:10 2016 +

--
 .../server/resourcemanager/scheduler/fifo/TestFifoScheduler.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/42b2a34e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
index 90b9969..02c60cf 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
@@ -1140,7 +1140,8 @@ public class TestFifoScheduler {
 waitCount = 0;
 while (waitCount++ != 20) {
   report_nm1 = rm.getResourceScheduler().getNodeReport(nm1.getNodeId());
-  if (report_nm1.getAvailableResource().getMemory() != 0) {
+  if (null != report_nm1 &&
+  report_nm1.getAvailableResource().getMemory() != 0) {
 break;
   }
   LOG.info("Waiting for RMNodeResourceUpdateEvent to be handled... Tried "


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed by Eric Badger.

2016-05-16 Thread epayne 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 576e2d127 -> 1217c8f6b


YARN-5069. TestFifoScheduler.testResourceOverCommit race condition. Contributed 
by Eric Badger.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1217c8f6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1217c8f6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1217c8f6

Branch: refs/heads/trunk
Commit: 1217c8f6b49e3afd8ca008ffddcf6615f0accfc5
Parents: 576e2d1
Author: Eric Payne 
Authored: Mon May 16 20:27:07 2016 +
Committer: Eric Payne 
Committed: Mon May 16 20:28:04 2016 +

--
 .../server/resourcemanager/scheduler/fifo/TestFifoScheduler.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1217c8f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
index 90b9969..02c60cf 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
@@ -1140,7 +1140,8 @@ public class TestFifoScheduler {
 waitCount = 0;
 while (waitCount++ != 20) {
   report_nm1 = rm.getResourceScheduler().getNodeReport(nm1.getNodeId());
-  if (report_nm1.getAvailableResource().getMemory() != 0) {
+  if (null != report_nm1 &&
+  report_nm1.getAvailableResource().getMemory() != 0) {
 break;
   }
   LOG.info("Waiting for RMNodeResourceUpdateEvent to be handled... Tried "


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org