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 su...@apache.org on 2017/02/15 00:56:39 UTC
[02/50] [abbrv] hadoop git commit: HDFS-11403. Zookeper ACLs on NN HA
enabled clusters should be handled consistently. Contributed by Hanisha
Koneru.
HDFS-11403. Zookeper ACLs on NN HA enabled clusters should be handled consistently. Contributed by Hanisha Koneru.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0aacd8fd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0aacd8fd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0aacd8fd
Branch: refs/heads/YARN-2915
Commit: 0aacd8fd2530f9f5febbe81ec05cd958cc0c3e2c
Parents: 07a5184
Author: Arpit Agarwal <ar...@apache.org>
Authored: Sat Feb 11 01:17:56 2017 -0800
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Sat Feb 11 01:17:56 2017 -0800
----------------------------------------------------------------------
.../apache/hadoop/ha/ActiveStandbyElector.java | 37 ++++++++++++++++++--
.../hadoop/ha/TestActiveStandbyElector.java | 31 ++++++++++++++++
2 files changed, 65 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0aacd8fd/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java
index 9a90ccf..db853f4 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java
@@ -346,8 +346,13 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
createWithRetries(prefixPath, new byte[]{}, zkAcl, CreateMode.PERSISTENT);
} catch (KeeperException e) {
if (isNodeExists(e.code())) {
- // This is OK - just ensuring existence.
- continue;
+ // Set ACLs for parent node, if they do not exist or are different
+ try {
+ setAclsWithRetries(prefixPath);
+ } catch (KeeperException e1) {
+ throw new IOException("Couldn't set ACLs on parent ZNode: " +
+ prefixPath, e1);
+ }
} else {
throw new IOException("Couldn't create " + prefixPath, e);
}
@@ -1066,14 +1071,36 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
});
}
+ private void setAclsWithRetries(final String path)
+ throws KeeperException, InterruptedException {
+ Stat stat = new Stat();
+ zkDoWithRetries(new ZKAction<Void>() {
+ @Override
+ public Void run() throws KeeperException, InterruptedException {
+ List<ACL> acl = zkClient.getACL(path, stat);
+ if (acl == null || !acl.containsAll(zkAcl) ||
+ !zkAcl.containsAll(acl)) {
+ zkClient.setACL(path, zkAcl, stat.getVersion());
+ }
+ return null;
+ }
+ }, Code.BADVERSION);
+ }
+
private <T> T zkDoWithRetries(ZKAction<T> action) throws KeeperException,
InterruptedException {
+ return zkDoWithRetries(action, null);
+ }
+
+ private <T> T zkDoWithRetries(ZKAction<T> action, Code retryCode)
+ throws KeeperException, InterruptedException {
int retry = 0;
while (true) {
try {
return action.run();
} catch (KeeperException ke) {
- if (shouldRetry(ke.code()) && ++retry < maxRetryNum) {
+ if ((shouldRetry(ke.code()) || shouldRetry(ke.code(), retryCode))
+ && ++retry < maxRetryNum) {
continue;
}
throw ke;
@@ -1189,6 +1216,10 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
private static boolean shouldRetry(Code code) {
return code == Code.CONNECTIONLOSS || code == Code.OPERATIONTIMEOUT;
}
+
+ private static boolean shouldRetry(Code code, Code retryIfCode) {
+ return (retryIfCode == null ? false : retryIfCode == code);
+ }
@Override
public String toString() {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0aacd8fd/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElector.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElector.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElector.java
index 8c6f7a3..ca3389f 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElector.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElector.java
@@ -715,6 +715,37 @@ public class TestActiveStandbyElector {
}
}
}
+
+ /**
+ * Test that ACLs are set on parent zNode even if the node already exists.
+ */
+ @Test
+ public void testParentZNodeACLs() throws Exception {
+ KeeperException ke = new KeeperException(Code.NODEEXISTS) {
+ @Override
+ public Code code() {
+ return super.code();
+ }
+ };
+
+ Mockito.when(mockZK.create(Mockito.anyString(), Mockito.eq(new byte[]{}),
+ Mockito.anyListOf(ACL.class),
+ Mockito.eq(CreateMode.PERSISTENT))).thenThrow(ke);
+
+ elector.ensureParentZNode();
+
+ StringBuilder prefix = new StringBuilder();
+ for (String part : ZK_PARENT_NAME.split("/")) {
+ if (part.isEmpty()) continue;
+ prefix.append("/").append(part);
+ if (!"/".equals(prefix.toString())) {
+ Mockito.verify(mockZK).getACL(Mockito.eq(prefix.toString()),
+ Mockito.eq(new Stat()));
+ Mockito.verify(mockZK).setACL(Mockito.eq(prefix.toString()),
+ Mockito.eq(Ids.OPEN_ACL_UNSAFE), Mockito.anyInt());
+ }
+ }
+ }
/**
* Test for a bug encountered during development of HADOOP-8163:
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org