hadoop git commit: YARN-2958. Made RMStateStore not update the last sequence number when updating the delegation token. Contributed by Varun Saxena.

2015-01-05 Thread zjshen
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 60418c9b2 - c6cf74898


YARN-2958. Made RMStateStore not update the last sequence number when updating 
the delegation token. Contributed by Varun Saxena.

(cherry picked from commit 562a701945be3a672f9cb5a52cc6db2c1589ba2b)


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

Branch: refs/heads/branch-2
Commit: c6cf7489853d603bb1a77ad699b3068cb4779bbf
Parents: 60418c9
Author: Zhijie Shen zjs...@apache.org
Authored: Mon Jan 5 13:33:07 2015 -0800
Committer: Zhijie Shen zjs...@apache.org
Committed: Mon Jan 5 13:35:09 2015 -0800

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../recovery/FileSystemRMStateStore.java| 53 +---
 .../recovery/LeveldbRMStateStore.java   | 45 +
 .../recovery/MemoryRMStateStore.java| 32 +++-
 .../recovery/NullRMStateStore.java  | 12 ++---
 .../resourcemanager/recovery/RMStateStore.java  | 40 +++
 .../recovery/RMStateStoreRMDTEvent.java | 10 +---
 .../recovery/ZKRMStateStore.java| 40 +++
 .../RMDelegationTokenSecretManager.java | 15 ++
 .../recovery/RMStateStoreTestBase.java  | 13 ++---
 .../recovery/TestZKRMStateStore.java| 12 ++---
 11 files changed, 131 insertions(+), 144 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6cf7489/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 06fcedc..83acc08 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -279,6 +279,9 @@ Release 2.7.0 - UNRELEASED
 YARN-2922. ConcurrentModificationException in CapacityScheduler's 
LeafQueue.
 (Rohith Sharmaks via ozawa)
 
+YARN-2958. Made RMStateStore not update the last sequence number when 
updating the
+delegation token. (Varun Saxena via zjshen)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c6cf7489/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.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/recovery/FileSystemRMStateStore.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
index 51e3916..7783662 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
@@ -60,8 +60,6 @@ import 
org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.AM
 import 
org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationAttemptStateDataPBImpl;
 import 
org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationStateDataPBImpl;
 import 
org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.EpochPBImpl;
-import org.apache.hadoop.yarn.util.ConverterUtils;
-
 import com.google.common.annotations.VisibleForTesting;
 
 @Private
@@ -452,11 +450,10 @@ public class FileSystemRMStateStore extends RMStateStore {
   }
 
   @Override
-  public synchronized void storeRMDelegationTokenAndSequenceNumberState(
-  RMDelegationTokenIdentifier identifier, Long renewDate,
-  int latestSequenceNumber) throws Exception {
-storeOrUpdateRMDelegationTokenAndSequenceNumberState(
-identifier, renewDate,latestSequenceNumber, false);
+  public synchronized void storeRMDelegationTokenState(
+  RMDelegationTokenIdentifier identifier, Long renewDate)
+  throws Exception {
+storeOrUpdateRMDelegationTokenState(identifier, renewDate, false);
   }
 
   @Override
@@ -469,16 +466,15 @@ public class FileSystemRMStateStore extends RMStateStore {
   }
 
   @Override
-  protected void updateRMDelegationTokenAndSequenceNumberInternal(
-  RMDelegationTokenIdentifier rmDTIdentifier, Long renewDate,
-  int latestSequenceNumber) throws 

hadoop git commit: YARN-2958. Made RMStateStore not update the last sequence number when updating the delegation token. Contributed by Varun Saxena.

2015-01-05 Thread zjshen
Repository: hadoop
Updated Branches:
  refs/heads/trunk dfd2589bc - 562a70194


YARN-2958. Made RMStateStore not update the last sequence number when updating 
the delegation token. Contributed by Varun Saxena.


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

Branch: refs/heads/trunk
Commit: 562a701945be3a672f9cb5a52cc6db2c1589ba2b
Parents: dfd2589
Author: Zhijie Shen zjs...@apache.org
Authored: Mon Jan 5 13:33:07 2015 -0800
Committer: Zhijie Shen zjs...@apache.org
Committed: Mon Jan 5 13:33:07 2015 -0800

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../recovery/FileSystemRMStateStore.java| 53 +---
 .../recovery/LeveldbRMStateStore.java   | 45 +
 .../recovery/MemoryRMStateStore.java| 32 +++-
 .../recovery/NullRMStateStore.java  | 12 ++---
 .../resourcemanager/recovery/RMStateStore.java  | 40 +++
 .../recovery/RMStateStoreRMDTEvent.java | 10 +---
 .../recovery/ZKRMStateStore.java| 40 +++
 .../RMDelegationTokenSecretManager.java | 15 ++
 .../recovery/RMStateStoreTestBase.java  | 13 ++---
 .../recovery/TestZKRMStateStore.java| 12 ++---
 11 files changed, 131 insertions(+), 144 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/562a7019/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 0d33b4a..c464275 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -311,6 +311,9 @@ Release 2.7.0 - UNRELEASED
 YARN-2922. ConcurrentModificationException in CapacityScheduler's 
LeafQueue.
 (Rohith Sharmaks via ozawa)
 
+YARN-2958. Made RMStateStore not update the last sequence number when 
updating the
+delegation token. (Varun Saxena via zjshen)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/562a7019/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.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/recovery/FileSystemRMStateStore.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
index 51e3916..7783662 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
@@ -60,8 +60,6 @@ import 
org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.AM
 import 
org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationAttemptStateDataPBImpl;
 import 
org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationStateDataPBImpl;
 import 
org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.EpochPBImpl;
-import org.apache.hadoop.yarn.util.ConverterUtils;
-
 import com.google.common.annotations.VisibleForTesting;
 
 @Private
@@ -452,11 +450,10 @@ public class FileSystemRMStateStore extends RMStateStore {
   }
 
   @Override
-  public synchronized void storeRMDelegationTokenAndSequenceNumberState(
-  RMDelegationTokenIdentifier identifier, Long renewDate,
-  int latestSequenceNumber) throws Exception {
-storeOrUpdateRMDelegationTokenAndSequenceNumberState(
-identifier, renewDate,latestSequenceNumber, false);
+  public synchronized void storeRMDelegationTokenState(
+  RMDelegationTokenIdentifier identifier, Long renewDate)
+  throws Exception {
+storeOrUpdateRMDelegationTokenState(identifier, renewDate, false);
   }
 
   @Override
@@ -469,16 +466,15 @@ public class FileSystemRMStateStore extends RMStateStore {
   }
 
   @Override
-  protected void updateRMDelegationTokenAndSequenceNumberInternal(
-  RMDelegationTokenIdentifier rmDTIdentifier, Long renewDate,
-  int latestSequenceNumber) throws Exception {
-storeOrUpdateRMDelegationTokenAndSequenceNumberState(
-

[13/18] hadoop git commit: YARN-2958. Made RMStateStore not update the last sequence number when updating the delegation token. Contributed by Varun Saxena.

2015-01-05 Thread zhz
YARN-2958. Made RMStateStore not update the last sequence number when updating 
the delegation token. Contributed by Varun Saxena.


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

Branch: refs/heads/HDFS-EC
Commit: 35805a695d81ec01880d18ed4ddf24f219c99c34
Parents: 9a3a069
Author: Zhijie Shen zjs...@apache.org
Authored: Mon Jan 5 13:33:07 2015 -0800
Committer: Zhe Zhang z...@apache.org
Committed: Mon Jan 5 14:48:38 2015 -0800

--
 hadoop-yarn-project/CHANGES.txt |  3 ++
 .../recovery/FileSystemRMStateStore.java| 53 +---
 .../recovery/LeveldbRMStateStore.java   | 45 +
 .../recovery/MemoryRMStateStore.java| 32 +++-
 .../recovery/NullRMStateStore.java  | 12 ++---
 .../resourcemanager/recovery/RMStateStore.java  | 40 +++
 .../recovery/RMStateStoreRMDTEvent.java | 10 +---
 .../recovery/ZKRMStateStore.java| 40 +++
 .../RMDelegationTokenSecretManager.java | 15 ++
 .../recovery/RMStateStoreTestBase.java  | 13 ++---
 .../recovery/TestZKRMStateStore.java| 12 ++---
 11 files changed, 131 insertions(+), 144 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/35805a69/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 0d33b4a..c464275 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -311,6 +311,9 @@ Release 2.7.0 - UNRELEASED
 YARN-2922. ConcurrentModificationException in CapacityScheduler's 
LeafQueue.
 (Rohith Sharmaks via ozawa)
 
+YARN-2958. Made RMStateStore not update the last sequence number when 
updating the
+delegation token. (Varun Saxena via zjshen)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/35805a69/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.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/recovery/FileSystemRMStateStore.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
index 51e3916..7783662 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/FileSystemRMStateStore.java
@@ -60,8 +60,6 @@ import 
org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.AM
 import 
org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationAttemptStateDataPBImpl;
 import 
org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.ApplicationStateDataPBImpl;
 import 
org.apache.hadoop.yarn.server.resourcemanager.recovery.records.impl.pb.EpochPBImpl;
-import org.apache.hadoop.yarn.util.ConverterUtils;
-
 import com.google.common.annotations.VisibleForTesting;
 
 @Private
@@ -452,11 +450,10 @@ public class FileSystemRMStateStore extends RMStateStore {
   }
 
   @Override
-  public synchronized void storeRMDelegationTokenAndSequenceNumberState(
-  RMDelegationTokenIdentifier identifier, Long renewDate,
-  int latestSequenceNumber) throws Exception {
-storeOrUpdateRMDelegationTokenAndSequenceNumberState(
-identifier, renewDate,latestSequenceNumber, false);
+  public synchronized void storeRMDelegationTokenState(
+  RMDelegationTokenIdentifier identifier, Long renewDate)
+  throws Exception {
+storeOrUpdateRMDelegationTokenState(identifier, renewDate, false);
   }
 
   @Override
@@ -469,16 +466,15 @@ public class FileSystemRMStateStore extends RMStateStore {
   }
 
   @Override
-  protected void updateRMDelegationTokenAndSequenceNumberInternal(
-  RMDelegationTokenIdentifier rmDTIdentifier, Long renewDate,
-  int latestSequenceNumber) throws Exception {
-storeOrUpdateRMDelegationTokenAndSequenceNumberState(
-rmDTIdentifier, renewDate,latestSequenceNumber, true);
+  protected void