[37/43] git commit: YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. Contributed by Zhijie Shen

2014-11-06 Thread vinayakumarb 
YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. Contributed by Zhijie 
Shen


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

Branch: refs/heads/HDFS-EC
Commit: e4b4901d36875faa98ec8628e22e75499e0741ab
Parents: ef5af4f
Author: Xuan 
Authored: Wed Nov 5 18:24:41 2014 -0800
Committer: Xuan 
Committed: Wed Nov 5 18:24:41 2014 -0800

--
 hadoop-yarn-project/CHANGES.txt  | 2 ++
 .../apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java  | 4 
 .../hadoop/yarn/server/timeline/TimelineStoreTestUtils.java  | 4 
 3 files changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4b4901d/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 887d1d4..d65860c 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -872,6 +872,8 @@ Release 2.6.0 - UNRELEASED
 FatalEventDispatcher try to transition RM to StandBy at the same time.
 (Rohith Sharmaks via jianhe)
 
+YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. (Zhijie Shen via 
xgong)
+
 Release 2.5.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4b4901d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
index 2d126b4..af714b1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
@@ -241,6 +241,10 @@ public class MemoryTimelineStore
   public TimelineDomains getDomains(String owner)
   throws IOException {
 List domains = new ArrayList();
+Set domainsOfOneOwner = domainsByOwner.get(owner);
+if (domainsOfOneOwner == null) {
+  return new TimelineDomains();
+}
 for (TimelineDomain domain : domainsByOwner.get(owner)) {
   TimelineDomain domainToReturn = createTimelineDomain(
   domain.getId(),

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4b4901d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
index 868838e..242478c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
@@ -946,6 +946,10 @@ public class TimelineStoreTestUtils {
 assertEquals(2, actualDomains.getDomains().size());
 verifyDomainInfo(domain3, actualDomains.getDomains().get(0));
 verifyDomainInfo(domain1, actualDomains.getDomains().get(1));
+
+// owner without any domain
+actualDomains = store.getDomains("owner_4");
+assertEquals(0, actualDomains.getDomains().size());
   }
 
   private static void verifyDomainInfo(

git commit: YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. Contributed by Zhijie Shen

2014-11-05 Thread xgong 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.6 e29e864c5 -> 888fc4af4


YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. Contributed by Zhijie 
Shen


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

Branch: refs/heads/branch-2.6
Commit: 888fc4af4e25f6005ae30070a79690a3ab50dbcc
Parents: e29e864
Author: Xuan 
Authored: Wed Nov 5 18:27:41 2014 -0800
Committer: Xuan 
Committed: Wed Nov 5 18:27:41 2014 -0800

--
 hadoop-yarn-project/CHANGES.txt  | 2 ++
 .../apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java  | 4 
 .../hadoop/yarn/server/timeline/TimelineStoreTestUtils.java  | 4 
 3 files changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/888fc4af/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index cc9578c..99e3d9d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -800,6 +800,8 @@ Release 2.6.0 - UNRELEASED
 FatalEventDispatcher try to transition RM to StandBy at the same time.
 (Rohith Sharmaks via jianhe)
 
+YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. (Zhijie Shen via 
xgong)
+
 Release 2.5.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/888fc4af/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
index 2d126b4..af714b1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
@@ -241,6 +241,10 @@ public class MemoryTimelineStore
   public TimelineDomains getDomains(String owner)
   throws IOException {
 List domains = new ArrayList();
+Set domainsOfOneOwner = domainsByOwner.get(owner);
+if (domainsOfOneOwner == null) {
+  return new TimelineDomains();
+}
 for (TimelineDomain domain : domainsByOwner.get(owner)) {
   TimelineDomain domainToReturn = createTimelineDomain(
   domain.getId(),

http://git-wip-us.apache.org/repos/asf/hadoop/blob/888fc4af/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
index 868838e..242478c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
@@ -946,6 +946,10 @@ public class TimelineStoreTestUtils {
 assertEquals(2, actualDomains.getDomains().size());
 verifyDomainInfo(domain3, actualDomains.getDomains().get(0));
 verifyDomainInfo(domain1, actualDomains.getDomains().get(1));
+
+// owner without any domain
+actualDomains = store.getDomains("owner_4");
+assertEquals(0, actualDomains.getDomains().size());
   }
 
   private static void verifyDomainInfo(

git commit: YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. Contributed by Zhijie Shen

2014-11-05 Thread xgong 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d698ed1d6 -> e26be1d85


YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. Contributed by Zhijie 
Shen


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

Branch: refs/heads/branch-2
Commit: e26be1d85c1f01b764f13a3c912446c935e620a5
Parents: d698ed1
Author: Xuan 
Authored: Wed Nov 5 18:26:07 2014 -0800
Committer: Xuan 
Committed: Wed Nov 5 18:26:07 2014 -0800

--
 hadoop-yarn-project/CHANGES.txt  | 2 ++
 .../apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java  | 4 
 .../hadoop/yarn/server/timeline/TimelineStoreTestUtils.java  | 4 
 3 files changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e26be1d8/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 63eb6f2..8c7882f 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -845,6 +845,8 @@ Release 2.6.0 - UNRELEASED
 FatalEventDispatcher try to transition RM to StandBy at the same time.
 (Rohith Sharmaks via jianhe)
 
+YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. (Zhijie Shen via 
xgong)
+
 Release 2.5.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e26be1d8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
index 2d126b4..af714b1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
@@ -241,6 +241,10 @@ public class MemoryTimelineStore
   public TimelineDomains getDomains(String owner)
   throws IOException {
 List domains = new ArrayList();
+Set domainsOfOneOwner = domainsByOwner.get(owner);
+if (domainsOfOneOwner == null) {
+  return new TimelineDomains();
+}
 for (TimelineDomain domain : domainsByOwner.get(owner)) {
   TimelineDomain domainToReturn = createTimelineDomain(
   domain.getId(),

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e26be1d8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
index 868838e..242478c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
@@ -946,6 +946,10 @@ public class TimelineStoreTestUtils {
 assertEquals(2, actualDomains.getDomains().size());
 verifyDomainInfo(domain3, actualDomains.getDomains().get(0));
 verifyDomainInfo(domain1, actualDomains.getDomains().get(1));
+
+// owner without any domain
+actualDomains = store.getDomains("owner_4");
+assertEquals(0, actualDomains.getDomains().size());
   }
 
   private static void verifyDomainInfo(

git commit: YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. Contributed by Zhijie Shen

2014-11-05 Thread xgong 
Repository: hadoop
Updated Branches:
  refs/heads/trunk ef5af4f8d -> e4b4901d3


YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. Contributed by Zhijie 
Shen


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

Branch: refs/heads/trunk
Commit: e4b4901d36875faa98ec8628e22e75499e0741ab
Parents: ef5af4f
Author: Xuan 
Authored: Wed Nov 5 18:24:41 2014 -0800
Committer: Xuan 
Committed: Wed Nov 5 18:24:41 2014 -0800

--
 hadoop-yarn-project/CHANGES.txt  | 2 ++
 .../apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java  | 4 
 .../hadoop/yarn/server/timeline/TimelineStoreTestUtils.java  | 4 
 3 files changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4b4901d/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 887d1d4..d65860c 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -872,6 +872,8 @@ Release 2.6.0 - UNRELEASED
 FatalEventDispatcher try to transition RM to StandBy at the same time.
 (Rohith Sharmaks via jianhe)
 
+YARN-2813. Fixed NPE from MemoryTimelineStore.getDomains. (Zhijie Shen via 
xgong)
+
 Release 2.5.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4b4901d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
index 2d126b4..af714b1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/MemoryTimelineStore.java
@@ -241,6 +241,10 @@ public class MemoryTimelineStore
   public TimelineDomains getDomains(String owner)
   throws IOException {
 List domains = new ArrayList();
+Set domainsOfOneOwner = domainsByOwner.get(owner);
+if (domainsOfOneOwner == null) {
+  return new TimelineDomains();
+}
 for (TimelineDomain domain : domainsByOwner.get(owner)) {
   TimelineDomain domainToReturn = createTimelineDomain(
   domain.getId(),

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e4b4901d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
index 868838e..242478c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TimelineStoreTestUtils.java
@@ -946,6 +946,10 @@ public class TimelineStoreTestUtils {
 assertEquals(2, actualDomains.getDomains().size());
 verifyDomainInfo(domain3, actualDomains.getDomains().get(0));
 verifyDomainInfo(domain1, actualDomains.getDomains().get(1));
+
+// owner without any domain
+actualDomains = store.getDomains("owner_4");
+assertEquals(0, actualDomains.getDomains().size());
   }
 
   private static void verifyDomainInfo(