hadoop git commit: YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die. (Brahma Reddy Battula via wangda)

2015-09-01 Thread vinodkv 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.6.1 553efd719 -> 005d86549


YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die. 
(Brahma Reddy Battula via wangda)

(cherry picked from commit 6bc7710ec7f2592c4c87dd940fbe5827ef81fe72)
(cherry picked from commit 8e142d27cbddfa1a1c83c5f8752bd14ac0a13612)
(cherry picked from commit 4d43be3c01b1bc0deb31a9081fca5395d0eb4e0d)


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

Branch: refs/heads/branch-2.6.1
Commit: 005d865494d59fa9b15e7c76a51022d852e70f8c
Parents: 553efd7
Author: Wangda Tan 
Authored: Fri Mar 20 10:42:05 2015 -0700
Committer: Vinod Kumar Vavilapalli 
Committed: Tue Sep 1 17:10:42 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt   |  3 +++
 .../resourcemanager/scheduler/AppSchedulingInfo.java  | 10 ++
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/005d8654/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 786d919..5762671 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -114,6 +114,9 @@ Release 2.6.1 - UNRELEASED
 YARN-3267. Timelineserver applies the ACL rules after applying the limit on
 the number of records (Chang Li via jeagles)
 
+YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die.
+(Brahma Reddy Battula via wangda)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/005d8654/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
index 3ade7f7..331cee9 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
@@ -236,7 +236,7 @@ public class AppSchedulingInfo {
 
   public synchronized Resource getResource(Priority priority) {
 ResourceRequest request = getResourceRequest(priority, 
ResourceRequest.ANY);
-return request.getCapability();
+return (request == null) ? null : request.getCapability();
   }
 
   public synchronized boolean isBlacklisted(String resourceName) {
@@ -380,9 +380,11 @@ public class AppSchedulingInfo {
 boolean deactivate = true;
 for (Priority priority : getPriorities()) {
   ResourceRequest request = getResourceRequest(priority, 
ResourceRequest.ANY);
-  if (request.getNumContainers() > 0) {
-deactivate = false;
-break;
+  if (request != null) {
+if (request.getNumContainers() > 0) {
+  deactivate = false;
+  break;
+}
   }
 }
 if (deactivate) {

hadoop git commit: YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die. (Brahma Reddy Battula via wangda)

2015-03-20 Thread wangda 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 b63ff4c36 - 57a0382f4


YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die. 
(Brahma Reddy Battula via wangda)

(cherry picked from commit 6bc7710ec7f2592c4c87dd940fbe5827ef81fe72)


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

Branch: refs/heads/branch-2.7
Commit: 57a0382f4be0b4ff5c99f54aebbc8a3fae47c058
Parents: b63ff4c
Author: Wangda Tan wan...@apache.org
Authored: Fri Mar 20 10:42:05 2015 -0700
Committer: Wangda Tan wan...@apache.org
Committed: Fri Mar 20 10:44:34 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt   |  3 +++
 .../resourcemanager/scheduler/AppSchedulingInfo.java  | 10 ++
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/57a0382f/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index e4c0a6d..30a05a1 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -726,6 +726,9 @@ Release 2.7.0 - UNRELEASED
 YARN-3379. Fixed missing data in localityTable and ResourceRequests table
 in RM WebUI. (Xuan Gong via jianhe)
 
+YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die.
+(Brahma Reddy Battula via wangda)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/57a0382f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
index 97dc231..1324c7d 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
@@ -239,7 +239,7 @@ public class AppSchedulingInfo {
 
   public synchronized Resource getResource(Priority priority) {
 ResourceRequest request = getResourceRequest(priority, 
ResourceRequest.ANY);
-return request.getCapability();
+return (request == null) ? null : request.getCapability();
   }
 
   public synchronized boolean isBlacklisted(String resourceName) {
@@ -382,9 +382,11 @@ public class AppSchedulingInfo {
 boolean deactivate = true;
 for (Priority priority : getPriorities()) {
   ResourceRequest request = getResourceRequest(priority, 
ResourceRequest.ANY);
-  if (request.getNumContainers()  0) {
-deactivate = false;
-break;
+  if (request != null) {
+if (request.getNumContainers()  0) {
+  deactivate = false;
+  break;
+}
   }
 }
 if (deactivate) {

hadoop git commit: YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die. (Brahma Reddy Battula via wangda)

2015-03-20 Thread wangda 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 1a4b52869 - 6bc7710ec


YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die. 
(Brahma Reddy Battula via wangda)


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

Branch: refs/heads/trunk
Commit: 6bc7710ec7f2592c4c87dd940fbe5827ef81fe72
Parents: 1a4b528
Author: Wangda Tan wan...@apache.org
Authored: Fri Mar 20 10:42:05 2015 -0700
Committer: Wangda Tan wan...@apache.org
Committed: Fri Mar 20 10:42:05 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt   |  3 +++
 .../resourcemanager/scheduler/AppSchedulingInfo.java  | 10 ++
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/6bc7710e/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 2cfa399..00b2c19 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -802,6 +802,9 @@ Release 2.7.0 - UNRELEASED
 YARN-3379. Fixed missing data in localityTable and ResourceRequests table
 in RM WebUI. (Xuan Gong via jianhe)
 
+YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die.
+(Brahma Reddy Battula via wangda)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/6bc7710e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
index 97dc231..1324c7d 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
@@ -239,7 +239,7 @@ public class AppSchedulingInfo {
 
   public synchronized Resource getResource(Priority priority) {
 ResourceRequest request = getResourceRequest(priority, 
ResourceRequest.ANY);
-return request.getCapability();
+return (request == null) ? null : request.getCapability();
   }
 
   public synchronized boolean isBlacklisted(String resourceName) {
@@ -382,9 +382,11 @@ public class AppSchedulingInfo {
 boolean deactivate = true;
 for (Priority priority : getPriorities()) {
   ResourceRequest request = getResourceRequest(priority, 
ResourceRequest.ANY);
-  if (request.getNumContainers()  0) {
-deactivate = false;
-break;
+  if (request != null) {
+if (request.getNumContainers()  0) {
+  deactivate = false;
+  break;
+}
   }
 }
 if (deactivate) {

hadoop git commit: YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die. (Brahma Reddy Battula via wangda)

2015-03-20 Thread wangda 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 7990e1d80 - 8e142d27c


YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die. 
(Brahma Reddy Battula via wangda)

(cherry picked from commit 6bc7710ec7f2592c4c87dd940fbe5827ef81fe72)


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

Branch: refs/heads/branch-2
Commit: 8e142d27cbddfa1a1c83c5f8752bd14ac0a13612
Parents: 7990e1d
Author: Wangda Tan wan...@apache.org
Authored: Fri Mar 20 10:42:05 2015 -0700
Committer: Wangda Tan wan...@apache.org
Committed: Fri Mar 20 10:42:51 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt   |  3 +++
 .../resourcemanager/scheduler/AppSchedulingInfo.java  | 10 ++
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/8e142d27/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index ffd1fb7..1693c6c 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -757,6 +757,9 @@ Release 2.7.0 - UNRELEASED
 YARN-3379. Fixed missing data in localityTable and ResourceRequests table
 in RM WebUI. (Xuan Gong via jianhe)
 
+YARN-3369. Missing NullPointer check in AppSchedulingInfo causes RM to die.
+(Brahma Reddy Battula via wangda)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/8e142d27/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
index 97dc231..1324c7d 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/AppSchedulingInfo.java
@@ -239,7 +239,7 @@ public class AppSchedulingInfo {
 
   public synchronized Resource getResource(Priority priority) {
 ResourceRequest request = getResourceRequest(priority, 
ResourceRequest.ANY);
-return request.getCapability();
+return (request == null) ? null : request.getCapability();
   }
 
   public synchronized boolean isBlacklisted(String resourceName) {
@@ -382,9 +382,11 @@ public class AppSchedulingInfo {
 boolean deactivate = true;
 for (Priority priority : getPriorities()) {
   ResourceRequest request = getResourceRequest(priority, 
ResourceRequest.ANY);
-  if (request.getNumContainers()  0) {
-deactivate = false;
-break;
+  if (request != null) {
+if (request.getNumContainers()  0) {
+  deactivate = false;
+  break;
+}
   }
 }
 if (deactivate) {