[20/50] [abbrv] hadoop git commit: YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. Contributed by Vrushali C and Sangjin Lee.

2015-11-09 Thread sjlee 
YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. Contributed by Vrushali C and 
Sangjin Lee.

(cherry picked from commit df0ec473a84871b0effd7ca6faac776210d7df09)


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

Branch: refs/heads/YARN-2928-rebase
Commit: a6cc6ccb18dc76d0651138308b18f0f18b59d871
Parents: 54eded5
Author: Zhijie Shen 
Authored: Mon Jul 27 15:50:28 2015 -0700
Committer: Sangjin Lee 
Committed: Mon Nov 9 16:13:10 2015 -0800

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../records/timelineservice/TimelineEvent.java  |  4 +-
 .../storage/HBaseTimelineWriterImpl.java| 18 ++-
 .../storage/common/ColumnHelper.java| 21 
 .../storage/common/ColumnPrefix.java|  7 +--
 .../storage/common/Separator.java   |  7 +++
 .../storage/entity/EntityColumnPrefix.java  | 15 --
 .../storage/entity/EntityTable.java |  6 ++-
 .../storage/TestHBaseTimelineWriterImpl.java| 56 ++--
 9 files changed, 111 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a6cc6ccb/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index beba00e..b00ff62 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -115,6 +115,9 @@ Branch YARN-2928: Timeline Server Next Generation: Phase 1
 YARN-3792. Test case failures in TestDistributedShell and some issue fixes
 related to ATSV2 (Naganarasimha G R via sjlee)
 
+YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. (Vrushali C and Sangjin
+Lee via zjshen)
+
 Trunk - Unreleased
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a6cc6ccb/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
index 1dbf7e5..a563658 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
@@ -33,6 +33,8 @@ import java.util.Map;
 @InterfaceAudience.Public
 @InterfaceStability.Unstable
 public class TimelineEvent implements Comparable {
+  public static final long INVALID_TIMESTAMP = 0L;
+
   private String id;
   private HashMap info = new HashMap<>();
   private long timestamp;
@@ -83,7 +85,7 @@ public class TimelineEvent implements 
Comparable {
   }
 
   public boolean isValid() {
-return (id != null && timestamp != 0L);
+return (id != null && timestamp != INVALID_TIMESTAMP);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a6cc6ccb/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
index 876ad6a..cd2e76e 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
@@ -141,6 +141,13 @@ public class HBaseTimelineWriterImpl extends 
AbstractService implements
 EntityColumn.MODIFIED_TIME.store(rowKey, entityTable, null,
 te.getModifiedTime());
 EntityColumn.FLOW_VERSION.store(rowKey, entityTable, null, flowVersion);
+Map info = te.getInfo();
+if (info != null) {
+

[36/50] [abbrv] hadoop git commit: YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. Contributed by Vrushali C and Sangjin Lee.

2015-08-25 Thread sjlee 
YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. Contributed by Vrushali C and 
Sangjin Lee.

(cherry picked from commit df0ec473a84871b0effd7ca6faac776210d7df09)


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

Branch: refs/heads/YARN-2928
Commit: 5b3b86a2571c26cdfb23720508ba604e46acfba6
Parents: 57f6d06
Author: Zhijie Shen zjs...@apache.org
Authored: Mon Jul 27 15:50:28 2015 -0700
Committer: Sangjin Lee sj...@apache.org
Committed: Tue Aug 25 10:47:14 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../records/timelineservice/TimelineEvent.java  |  4 +-
 .../storage/HBaseTimelineWriterImpl.java| 18 ++-
 .../storage/common/ColumnHelper.java| 21 
 .../storage/common/ColumnPrefix.java|  7 +--
 .../storage/common/Separator.java   |  7 +++
 .../storage/entity/EntityColumnPrefix.java  | 15 --
 .../storage/entity/EntityTable.java |  6 ++-
 .../storage/TestHBaseTimelineWriterImpl.java| 56 ++--
 9 files changed, 111 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b3b86a2/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index fd19320..69112b5 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -115,6 +115,9 @@ Branch YARN-2928: Timeline Server Next Generation: Phase 1
 YARN-3792. Test case failures in TestDistributedShell and some issue fixes
 related to ATSV2 (Naganarasimha G R via sjlee)
 
+YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. (Vrushali C and Sangjin
+Lee via zjshen)
+
 Trunk - Unreleased
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b3b86a2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
index 1dbf7e5..a563658 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
@@ -33,6 +33,8 @@ import java.util.Map;
 @InterfaceAudience.Public
 @InterfaceStability.Unstable
 public class TimelineEvent implements ComparableTimelineEvent {
+  public static final long INVALID_TIMESTAMP = 0L;
+
   private String id;
   private HashMapString, Object info = new HashMap();
   private long timestamp;
@@ -83,7 +85,7 @@ public class TimelineEvent implements 
ComparableTimelineEvent {
   }
 
   public boolean isValid() {
-return (id != null  timestamp != 0L);
+return (id != null  timestamp != INVALID_TIMESTAMP);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/5b3b86a2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
index 876ad6a..cd2e76e 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
@@ -141,6 +141,13 @@ public class HBaseTimelineWriterImpl extends 
AbstractService implements
 EntityColumn.MODIFIED_TIME.store(rowKey, entityTable, null,
 te.getModifiedTime());
 EntityColumn.FLOW_VERSION.store(rowKey, entityTable, null, flowVersion);
+MapString, Object info = te.getInfo();
+if (info !=

[37/50] [abbrv] hadoop git commit: YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. Contributed by Vrushali C and Sangjin Lee.

2015-08-14 Thread vinodkv 
YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. Contributed by Vrushali C and 
Sangjin Lee.

(cherry picked from commit df0ec473a84871b0effd7ca6faac776210d7df09)


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

Branch: refs/heads/YARN-2928
Commit: f488b6136cd61b5dacb4ef31ccaf902cc8736be6
Parents: a0c1e50
Author: Zhijie Shen zjs...@apache.org
Authored: Mon Jul 27 15:50:28 2015 -0700
Committer: Vinod Kumar Vavilapalli vino...@apache.org
Committed: Fri Aug 14 11:23:26 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../records/timelineservice/TimelineEvent.java  |  4 +-
 .../storage/HBaseTimelineWriterImpl.java| 18 ++-
 .../storage/common/ColumnHelper.java| 21 
 .../storage/common/ColumnPrefix.java|  7 +--
 .../storage/common/Separator.java   |  7 +++
 .../storage/entity/EntityColumnPrefix.java  | 15 --
 .../storage/entity/EntityTable.java |  6 ++-
 .../storage/TestHBaseTimelineWriterImpl.java| 56 ++--
 9 files changed, 111 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/f488b613/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index cd05140..60bd2fd 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -115,6 +115,9 @@ Branch YARN-2928: Timeline Server Next Generation: Phase 1
 YARN-3792. Test case failures in TestDistributedShell and some issue fixes
 related to ATSV2 (Naganarasimha G R via sjlee)
 
+YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. (Vrushali C and Sangjin
+Lee via zjshen)
+
 Trunk - Unreleased
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/f488b613/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
index 1dbf7e5..a563658 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
@@ -33,6 +33,8 @@ import java.util.Map;
 @InterfaceAudience.Public
 @InterfaceStability.Unstable
 public class TimelineEvent implements ComparableTimelineEvent {
+  public static final long INVALID_TIMESTAMP = 0L;
+
   private String id;
   private HashMapString, Object info = new HashMap();
   private long timestamp;
@@ -83,7 +85,7 @@ public class TimelineEvent implements 
ComparableTimelineEvent {
   }
 
   public boolean isValid() {
-return (id != null  timestamp != 0L);
+return (id != null  timestamp != INVALID_TIMESTAMP);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/f488b613/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
index 876ad6a..cd2e76e 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
@@ -141,6 +141,13 @@ public class HBaseTimelineWriterImpl extends 
AbstractService implements
 EntityColumn.MODIFIED_TIME.store(rowKey, entityTable, null,
 te.getModifiedTime());
 EntityColumn.FLOW_VERSION.store(rowKey, entityTable, null, flowVersion);
+MapString, Object info = te.getInfo();
+

[43/50] [abbrv] hadoop git commit: YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. Contributed by Vrushali C and Sangjin Lee.

2015-08-13 Thread vinodkv 
YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. Contributed by Vrushali C and 
Sangjin Lee.

(cherry picked from commit df0ec473a84871b0effd7ca6faac776210d7df09)


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

Branch: refs/heads/YARN-2928-new
Commit: 0d38d41c7417a5f3fe030f36786ce5a8cd7d986b
Parents: 10afeb8
Author: Zhijie Shen zjs...@apache.org
Authored: Mon Jul 27 15:50:28 2015 -0700
Committer: Vinod Kumar Vavilapalli vino...@apache.org
Committed: Thu Aug 13 13:53:36 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../records/timelineservice/TimelineEvent.java  |  4 +-
 .../storage/HBaseTimelineWriterImpl.java| 18 ++-
 .../storage/common/ColumnHelper.java| 21 
 .../storage/common/ColumnPrefix.java|  7 +--
 .../storage/common/Separator.java   |  7 +++
 .../storage/entity/EntityColumnPrefix.java  | 15 --
 .../storage/entity/EntityTable.java |  6 ++-
 .../storage/TestHBaseTimelineWriterImpl.java| 56 ++--
 9 files changed, 111 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d38d41c/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index c828794..3722e40 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -115,6 +115,9 @@ Branch YARN-2928: Timeline Server Next Generation: Phase 1
 YARN-3792. Test case failures in TestDistributedShell and some issue fixes
 related to ATSV2 (Naganarasimha G R via sjlee)
 
+YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. (Vrushali C and Sangjin
+Lee via zjshen)
+
 Trunk - Unreleased
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d38d41c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
index 1dbf7e5..a563658 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
@@ -33,6 +33,8 @@ import java.util.Map;
 @InterfaceAudience.Public
 @InterfaceStability.Unstable
 public class TimelineEvent implements ComparableTimelineEvent {
+  public static final long INVALID_TIMESTAMP = 0L;
+
   private String id;
   private HashMapString, Object info = new HashMap();
   private long timestamp;
@@ -83,7 +85,7 @@ public class TimelineEvent implements 
ComparableTimelineEvent {
   }
 
   public boolean isValid() {
-return (id != null  timestamp != 0L);
+return (id != null  timestamp != INVALID_TIMESTAMP);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d38d41c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
index 876ad6a..cd2e76e 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
@@ -141,6 +141,13 @@ public class HBaseTimelineWriterImpl extends 
AbstractService implements
 EntityColumn.MODIFIED_TIME.store(rowKey, entityTable, null,
 te.getModifiedTime());
 EntityColumn.FLOW_VERSION.store(rowKey, entityTable, null, flowVersion);
+MapString, Object info = te.getInfo();
+

hadoop git commit: YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. Contributed by Vrushali C and Sangjin Lee.

2015-07-27 Thread zjshen 
Repository: hadoop
Updated Branches:
  refs/heads/YARN-2928 a7153ade7 - df0ec473a


YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. Contributed by Vrushali C and 
Sangjin Lee.


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

Branch: refs/heads/YARN-2928
Commit: df0ec473a84871b0effd7ca6faac776210d7df09
Parents: a7153ad
Author: Zhijie Shen zjs...@apache.org
Authored: Mon Jul 27 15:50:28 2015 -0700
Committer: Zhijie Shen zjs...@apache.org
Committed: Mon Jul 27 15:50:28 2015 -0700

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../records/timelineservice/TimelineEvent.java  |  4 +-
 .../storage/HBaseTimelineWriterImpl.java| 18 ++-
 .../storage/common/ColumnHelper.java| 21 
 .../storage/common/ColumnPrefix.java|  7 +--
 .../storage/common/Separator.java   |  7 +++
 .../storage/entity/EntityColumnPrefix.java  | 15 --
 .../storage/entity/EntityTable.java |  6 ++-
 .../storage/TestHBaseTimelineWriterImpl.java| 56 ++--
 9 files changed, 111 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/df0ec473/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index f2df960..0653c50 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -115,6 +115,9 @@ Branch YARN-2928: Timeline Server Next Generation: Phase 1
 YARN-3792. Test case failures in TestDistributedShell and some issue fixes
 related to ATSV2 (Naganarasimha G R via sjlee)
 
+YARN-3908. Fixed bugs in HBaseTimelineWriterImpl. (Vrushali C and Sangjin
+Lee via zjshen)
+
 Trunk - Unreleased
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/df0ec473/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
index 1dbf7e5..a563658 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/TimelineEvent.java
@@ -33,6 +33,8 @@ import java.util.Map;
 @InterfaceAudience.Public
 @InterfaceStability.Unstable
 public class TimelineEvent implements ComparableTimelineEvent {
+  public static final long INVALID_TIMESTAMP = 0L;
+
   private String id;
   private HashMapString, Object info = new HashMap();
   private long timestamp;
@@ -83,7 +85,7 @@ public class TimelineEvent implements 
ComparableTimelineEvent {
   }
 
   public boolean isValid() {
-return (id != null  timestamp != 0L);
+return (id != null  timestamp != INVALID_TIMESTAMP);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hadoop/blob/df0ec473/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
index 876ad6a..cd2e76e 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/HBaseTimelineWriterImpl.java
@@ -141,6 +141,13 @@ public class HBaseTimelineWriterImpl extends 
AbstractService implements
 EntityColumn.MODIFIED_TIME.store(rowKey, entityTable, null,
 te.getModifiedTime());
 EntityColumn.FLOW_VERSION.store(rowKey, entityTable, null, flowVersion);
+MapString, Object info = te.getInfo();
+