big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-18427. Improve ZKDelegationTokenSecretManager#startThead With recommended methods. (#4812)

Browse Source
This commit is contained in:
slfan1989 2022-09-09 02:41:21 +08:00 committed by GitHub
parent 03961b10c2
commit 0db3ee5b4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java
View File

@ -42,7 +42,6 @@
import org.apache.curator.framework.recipes.shared.SharedCount; import org.apache.curator.framework.recipes.shared.SharedCount;
import org.apache.curator.framework.recipes.shared.VersionedValue; import org.apache.curator.framework.recipes.shared.VersionedValue;
import org.apache.curator.retry.RetryNTimes; import org.apache.curator.retry.RetryNTimes;
import org.apache.curator.utils.EnsurePath;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.classification.InterfaceStability.Unstable;
@ -134,6 +133,11 @@ public static void setCurator(CuratorFramework curator) {
CURATOR_TL.set(curator); CURATOR_TL.set(curator);
} }
@VisibleForTesting
protected static CuratorFramework getCurator() {
return CURATOR_TL.get();
}
private final boolean isExternalClient; private final boolean isExternalClient;
protected final CuratorFramework zkClient; protected final CuratorFramework zkClient;
private SharedCount delTokSeqCounter; private SharedCount delTokSeqCounter;
@ -260,10 +264,8 @@ public void startThreads() throws IOException {
// If namespace parents are implicitly created, they won't have ACLs. // If namespace parents are implicitly created, they won't have ACLs.
// So, let's explicitly create them. // So, let's explicitly create them.
CuratorFramework nullNsFw = zkClient.usingNamespace(null); CuratorFramework nullNsFw = zkClient.usingNamespace(null);
EnsurePath ensureNs =
nullNsFw.newNamespaceAwareEnsurePath("/" + zkClient.getNamespace());
try { try {
ensureNs.ensure(nullNsFw.getZookeeperClient()); nullNsFw.create().creatingParentContainersIfNeeded().forPath("/" + zkClient.getNamespace());
} catch (Exception e) { } catch (Exception e) {
throw new IOException("Could not create namespace", e); throw new IOException("Could not create namespace", e);
} }

29
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestZKDelegationTokenSecretManager.java
View File

@ -41,6 +41,7 @@
import org.apache.zookeeper.ZooDefs; import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.data.ACL; import org.apache.zookeeper.data.ACL;
import org.apache.zookeeper.data.Id; import org.apache.zookeeper.data.Id;
import org.apache.zookeeper.data.Stat;
import org.apache.zookeeper.server.auth.DigestAuthenticationProvider; import org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
import org.junit.After; import org.junit.After;
import org.junit.Assert; import org.junit.Assert;
@ -507,4 +508,32 @@ public Boolean get() {
} }
}, 1000, 5000); }, 1000, 5000);
} }
@Test
public void testCreatingParentContainersIfNeeded() throws Exception {
String connectString = zkServer.getConnectString();
RetryPolicy retryPolicy = new ExponentialBackoffRetry(1000, 3);
Configuration conf = getSecretConf(connectString);
CuratorFramework curatorFramework =
CuratorFrameworkFactory.builder()
.connectString(connectString)
.retryPolicy(retryPolicy)
.build();
curatorFramework.start();
ZKDelegationTokenSecretManager.setCurator(curatorFramework);
DelegationTokenManager tm1 = new DelegationTokenManager(conf, new Text("foo"));
// When the init method is called,
// the ZKDelegationTokenSecretManager#startThread method will be called,
// and the creatingParentContainersIfNeeded will be called to create the nameSpace.
tm1.init();
String workingPath = "/" + conf.get(ZKDelegationTokenSecretManager.ZK_DTSM_ZNODE_WORKING_PATH,
ZKDelegationTokenSecretManager.ZK_DTSM_ZNODE_WORKING_PATH_DEAFULT) + "/ZKDTSMRoot";
// Check if the created NameSpace exists.
Stat stat = curatorFramework.checkExists().forPath(workingPath);
Assert.assertNotNull(stat);
}
} }