You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ka...@apache.org on 2015/02/04 23:00:22 UTC
hadoop git commit: HADOOP-11492. Bump up curator version to 2.7.1.
(Arun Suresh and Karthik Kambatla via kasha)
Repository: hadoop
Updated Branches:
refs/heads/trunk e04e8fa81 -> 55235d28c
HADOOP-11492. Bump up curator version to 2.7.1. (Arun Suresh and Karthik Kambatla via kasha)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/55235d28
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/55235d28
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/55235d28
Branch: refs/heads/trunk
Commit: 55235d28c3641ff5f1c05c53dd7271cafc131926
Parents: e04e8fa
Author: Karthik Kambatla <ka...@apache.org>
Authored: Wed Feb 4 13:05:11 2015 -0800
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Wed Feb 4 13:05:11 2015 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../ZKDelegationTokenSecretManager.java | 26 +++++++++++++-------
hadoop-project/pom.xml | 9 ++++---
3 files changed, 25 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/55235d28/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 3d11b71..eeca119 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -533,6 +533,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11544. Remove unused configuration keys for tracing. (Masatake
Iwasaki via aajisaka)
+ HADOOP-11492. Bump up curator version to 2.7.1. (Arun Suresh and
+ Karthik Kambatla via kasha)
+
OPTIMIZATIONS
HADOOP-11323. WritableComparator#compare keeps reference to byte array.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/55235d28/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
index d6bc995..ec522dcf 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
@@ -45,6 +45,7 @@ import org.apache.curator.framework.recipes.cache.PathChildrenCache.StartMode;
import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
import org.apache.curator.framework.recipes.shared.SharedCount;
+import org.apache.curator.framework.recipes.shared.VersionedValue;
import org.apache.curator.retry.RetryNTimes;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceAudience.Private;
@@ -58,7 +59,6 @@ import org.apache.zookeeper.ZooDefs.Perms;
import org.apache.zookeeper.client.ZooKeeperSaslClient;
import org.apache.zookeeper.data.ACL;
import org.apache.zookeeper.data.Id;
-import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -109,10 +109,10 @@ public abstract class ZKDelegationTokenSecretManager<TokenIdent extends Abstract
"ZKDelegationTokenSecretManagerClient";
private static final String ZK_DTSM_NAMESPACE = "ZKDTSMRoot";
- private static final String ZK_DTSM_SEQNUM_ROOT = "ZKDTSMSeqNumRoot";
- private static final String ZK_DTSM_KEYID_ROOT = "ZKDTSMKeyIdRoot";
- private static final String ZK_DTSM_TOKENS_ROOT = "ZKDTSMTokensRoot";
- private static final String ZK_DTSM_MASTER_KEY_ROOT = "ZKDTSMMasterKeyRoot";
+ private static final String ZK_DTSM_SEQNUM_ROOT = "/ZKDTSMSeqNumRoot";
+ private static final String ZK_DTSM_KEYID_ROOT = "/ZKDTSMKeyIdRoot";
+ private static final String ZK_DTSM_TOKENS_ROOT = "/ZKDTSMTokensRoot";
+ private static final String ZK_DTSM_MASTER_KEY_ROOT = "/ZKDTSMMasterKeyRoot";
private static final String DELEGATION_KEY_PREFIX = "DK_";
private static final String DELEGATION_TOKEN_PREFIX = "DT_";
@@ -505,11 +505,20 @@ public abstract class ZKDelegationTokenSecretManager<TokenIdent extends Abstract
return delTokSeqCounter.getCount();
}
+ private void incrSharedCount(SharedCount sharedCount) throws Exception {
+ while (true) {
+ // Loop until we successfully increment the counter
+ VersionedValue<Integer> versionedValue = sharedCount.getVersionedValue();
+ if (sharedCount.trySetCount(versionedValue, versionedValue.getValue() + 1)) {
+ break;
+ }
+ }
+ }
+
@Override
protected int incrementDelegationTokenSeqNum() {
try {
- while (!delTokSeqCounter.trySetCount(delTokSeqCounter.getCount() + 1)) {
- }
+ incrSharedCount(delTokSeqCounter);
} catch (InterruptedException e) {
// The ExpirationThread is just finishing.. so dont do anything..
LOG.debug("Thread interrupted while performing token counter increment", e);
@@ -537,8 +546,7 @@ public abstract class ZKDelegationTokenSecretManager<TokenIdent extends Abstract
@Override
protected int incrementCurrentKeyId() {
try {
- while (!keyIdSeqCounter.trySetCount(keyIdSeqCounter.getCount() + 1)) {
- }
+ incrSharedCount(keyIdSeqCounter);
} catch (InterruptedException e) {
// The ExpirationThread is just finishing.. so dont do anything..
LOG.debug("Thread interrupted while performing keyId increment", e);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/55235d28/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 5a16423..0c7cfc8 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -71,6 +71,7 @@
<protoc.path>${env.HADOOP_PROTOC_PATH}</protoc.path>
<zookeeper.version>3.4.6</zookeeper.version>
+ <curator.version>2.7.1</curator.version>
<findbugs.version>3.0.0</findbugs.version>
<tomcat.version>6.0.41</tomcat.version>
@@ -916,22 +917,22 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
- <version>2.6.0</version>
+ <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
- <version>2.6.0</version>
+ <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>2.6.0</version>
+ <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
- <version>2.6.0</version>
+ <version>${curator.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>