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 st...@apache.org on 2014/10/10 21:01:14 UTC
[35/50] [abbrv] git commit: BUG-24553 hadoop champlain build failure:
registry linking to ZK
BUG-24553 hadoop champlain build failure: registry linking to ZK
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/89019847
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/89019847
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/89019847
Branch: refs/heads/champlain
Commit: 89019847b8ac048e218c705d0f7873b2394b458e
Parents: 5e5503b
Author: Steve Loughran <st...@apache.org>
Authored: Thu Oct 9 09:46:14 2014 -0700
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Oct 9 09:46:14 2014 -0700
----------------------------------------------------------------------
.../hadoop/registry/client/impl/zk/RegistrySecurity.java | 6 +++---
.../hadoop/registry/client/impl/zk/ZookeeperConfigOptions.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/89019847/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
index 6484d28..6d5792e 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.service.ServiceStateException;
import org.apache.hadoop.util.ZKUtil;
import org.apache.zookeeper.Environment;
import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.client.ZooKeeperSaslClient;
import org.apache.zookeeper.data.ACL;
import org.apache.zookeeper.data.Id;
import org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
@@ -758,7 +757,7 @@ public class RegistrySecurity extends AbstractService {
* <b>Important:</b>This is JVM-wide
*/
public static void disableZookeeperClientSASL() {
- System.setProperty(ZooKeeperSaslClient.ENABLE_CLIENT_SASL_KEY, "false");
+ System.setProperty(ZookeeperConfigOptions.PROP_ZK_ENABLE_SASL_CLIENT, "false");
}
/**
@@ -766,7 +765,8 @@ public class RegistrySecurity extends AbstractService {
* @return true if the SASL client system property is set.
*/
public static boolean isClientSASLEnabled() {
- return ZooKeeperSaslClient.isEnabled();
+ return Boolean.valueOf(System.getProperty(
+ ZookeeperConfigOptions.PROP_ZK_ENABLE_SASL_CLIENT, "true"));
}
/**
http://git-wip-us.apache.org/repos/asf/hadoop/blob/89019847/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZookeeperConfigOptions.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZookeeperConfigOptions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZookeeperConfigOptions.java
index 711e27c..d81f24b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZookeeperConfigOptions.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZookeeperConfigOptions.java
@@ -47,7 +47,7 @@ public interface ZookeeperConfigOptions {
* but revert to classic authentication/anonymous access on failure.
*/
String PROP_ZK_ENABLE_SASL_CLIENT =
- ZooKeeperSaslClient.ENABLE_CLIENT_SASL_KEY;
+ "zookeeper.sasl.client";
/**
* Default flag for the ZK client: {@value}.