You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ca...@apache.org on 2012/04/22 21:28:09 UTC
svn commit: r1328943 - in /zookeeper/branches/branch-3.3: CHANGES.txt
src/java/main/org/apache/zookeeper/server/quorum/Leader.java
src/java/test/org/apache/zookeeper/test/ClientBase.java
src/java/test/org/apache/zookeeper/test/ObserverLETest.java
Author: camille
Date: Sun Apr 22 19:28:09 2012
New Revision: 1328943
URL: http://svn.apache.org/viewvc?rev=1328943&view=rev
Log:
ZOOKEEPER-1450. Backport of ZOOKEEPER-1294 fix to 3.4 and 3.3 (Norman Bishop via camille)
Added:
zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/ObserverLETest.java (with props)
Modified:
zookeeper/branches/branch-3.3/CHANGES.txt
zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/ClientBase.java
Modified: zookeeper/branches/branch-3.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/CHANGES.txt?rev=1328943&r1=1328942&r2=1328943&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.3/CHANGES.txt Sun Apr 22 19:28:09 2012
@@ -8,6 +8,8 @@ BUGFIXES:
ZOOKEEPER-1433. improve ZxidRolloverTest (test seems flakey) (phunt via henryr)
ZOOKEEPER-1395. node-watcher double-free redux (Mike Lundy via henryr)
+
+ ZOOKEEPER-1450. Backport of ZOOKEEPER-1294 fix to 3.4 and 3.3 (Norman Bishop via camille)
Release 3.3.5 - 2012-03-18
Backward compatible changes:
Modified: zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java?rev=1328943&r1=1328942&r2=1328943&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java (original)
+++ zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/quorum/Leader.java Sun Apr 22 19:28:09 2012
@@ -367,15 +367,15 @@ public class Leader {
if (!tickSkip) {
self.tick++;
}
- int syncedCount = 0;
HashSet<Long> syncedSet = new HashSet<Long>();
-
+
// lock on the followers when we use it.
syncedSet.add(self.getId());
synchronized (learners) {
for (LearnerHandler f : learners) {
- if (f.synced()) {
- syncedCount++;
+ // Synced set is used to check we have a supporting quorum, so only
+ // PARTICIPANT, not OBSERVER, learners should be used
+ if (f.synced() && f.getLearnerType() == LearnerType.PARTICIPANT) {
syncedSet.add(f.getSid());
}
f.ping();
@@ -385,7 +385,7 @@ public class Leader {
//if (!tickSkip && syncedCount < self.quorumPeers.size() / 2) {
// Lost quorum, shutdown
// TODO: message is wrong unless majority quorums used
- shutdown("Only " + syncedCount + " followers, need "
+ shutdown("Only " + syncedSet.size() + " followers, need "
+ (self.getVotingView().size() / 2));
// make sure the order is the same!
// the leader goes to looking
Modified: zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/ClientBase.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/ClientBase.java?rev=1328943&r1=1328942&r2=1328943&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/ClientBase.java (original)
+++ zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/ClientBase.java Sun Apr 22 19:28:09 2012
@@ -53,6 +53,8 @@ import org.apache.zookeeper.server.NIOSe
import org.apache.zookeeper.server.ZKDatabase;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.server.persistence.FileTxnLog;
+import org.apache.zookeeper.server.quorum.QuorumPeer;
+
import static org.apache.zookeeper.client.FourLetterWordMain.send4LetterWord;
import com.sun.management.UnixOperatingSystemMXBean;
@@ -259,6 +261,23 @@ public abstract class ClientBase extends
return false;
}
+ public static boolean waitForServerState(QuorumPeer qp, int timeout,
+ String serverState) {
+ long start = System.currentTimeMillis();
+ while (true) {
+ try {
+ Thread.sleep(250);
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ if (qp.getServerState().equals(serverState))
+ return true;
+ if (System.currentTimeMillis() > start + timeout) {
+ return false;
+ }
+ }
+ }
+
static void verifyThreadTerminated(Thread thread, long millis)
throws InterruptedException
{
Added: zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/ObserverLETest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/ObserverLETest.java?rev=1328943&view=auto
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/ObserverLETest.java (added)
+++ zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/ObserverLETest.java Sun Apr 22 19:28:09 2012
@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.zookeeper.test;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+
+import org.apache.log4j.Logger;
+import org.apache.zookeeper.server.quorum.QuorumPeer;
+import org.apache.zookeeper.server.quorum.QuorumStats;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ObserverLETest {
+ private static final Logger LOG = Logger.getLogger(ObserverLETest.class);
+ final QuorumBase qb = new QuorumBase();
+ final ClientTest ct = new ClientTest();
+
+ @Before
+ public void establishThreeParticipantOneObserverEnsemble() throws Exception {
+ qb.setUp(true);
+ ct.hostPort = qb.hostPort;
+ ct.setUpAll();
+ qb.s5.shutdown();
+ }
+
+ @After
+ public void shutdownQuorum() throws Exception {
+ ct.tearDownAll();
+ qb.tearDown();
+ }
+
+ /**
+ * See ZOOKEEPER-1294. Confirms that an observer will not support the quorum
+ * of a leader by forming a 5-node, 2-observer ensemble (so quorum size is 2).
+ * When all but the leader and one observer are shut down, the leader should
+ * enter the 'looking' state, not stay in the 'leading' state.
+ */
+ @Test
+ public void testLEWithObserver() throws Exception {
+ QuorumPeer leader = null;
+ for (QuorumPeer server : Arrays.asList(qb.s1, qb.s2, qb.s3)) {
+ if (server.getServerState().equals(
+ QuorumStats.Provider.FOLLOWING_STATE)) {
+ server.shutdown();
+ assertTrue("Waiting for server down", ClientBase
+ .waitForServerDown("127.0.0.1:"
+ + server.getClientPort(),
+ ClientBase.CONNECTION_TIMEOUT));
+ } else {
+ assertNull("More than one leader found", leader);
+ leader = server;
+ }
+ }
+ assertTrue("Leader is not in Looking state", ClientBase
+ .waitForServerState(leader, ClientBase.CONNECTION_TIMEOUT,
+ QuorumStats.Provider.LOOKING_STATE));
+ }
+
+}
Propchange: zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/ObserverLETest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain