Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-8315. Support SASL-authenticated ZooKeeper in ActiveStandbyElector. Contributed by Todd Lipcon 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1528293 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2013-10-02 00:49:00 +00:00
parent dd0fb6d75c
commit c7cd620fa4
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -393,6 +393,9 @@ Release 2.2.0 - UNRELEASED
BUG FIXES BUG FIXES
HADOOP-8315. Support SASL-authenticated ZooKeeper in ActiveStandbyElector
(todd)
Release 2.1.2 - UNRELEASED Release 2.1.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java
View File

@ -568,6 +568,9 @@ public class ActiveStandbyElector implements StatCallback, StringCallback {
enterNeutralMode(); enterNeutralMode();
reJoinElection(0); reJoinElection(0);
break; break;
case SaslAuthenticated:
LOG.info("Successfully authenticated to ZooKeeper using SASL.");
break;
default: default:
fatalError("Unexpected Zookeeper watch event state: " fatalError("Unexpected Zookeeper watch event state: "
+ event.getState()); + event.getState());

4
hadoop-project/pom.xml
View File

@ -685,7 +685,7 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.4.2</version> <version>3.4.5</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<!-- otherwise seems to drag in junit 3.8.1 via jline --> <!-- otherwise seems to drag in junit 3.8.1 via jline -->
@ -709,7 +709,7 @@
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.4.2</version> <version>3.4.5</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>