You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by mi...@apache.org on 2014/03/21 06:36:11 UTC
svn commit: r1579888 - in /zookeeper/trunk: ./
src/java/main/org/apache/zookeeper/server/quorum/
Author: michim
Date: Fri Mar 21 05:36:11 2014
New Revision: 1579888
URL: http://svn.apache.org/r1579888
Log:
ZOOKEEPER-1796. Move common code from {Follower, Observer}ZooKeeperServer into LearnerZooKeeperServer (Raul Gutierrez Segales via michim)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1579888&r1=1579887&r2=1579888&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Fri Mar 21 05:36:11 2014
@@ -797,6 +797,9 @@ IMPROVEMENTS:
ZOOKEEPER-1638. Redundant zk.getZKDatabase().clear(); (neil bhakta via michim)
+ ZOOKEEPER-1796. Move common code from {Follower, Observer}ZooKeeperServer into
+ LearnerZooKeeperServer (Raul Gutierrez Segales via michim)
+
headers
Release 3.4.0 -
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java?rev=1579888&r1=1579887&r2=1579888&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java Fri Mar 21 05:36:11 2014
@@ -44,10 +44,6 @@ public class FollowerZooKeeperServer ext
private static final Logger LOG =
LoggerFactory.getLogger(FollowerZooKeeperServer.class);
- CommitProcessor commitProcessor;
-
- SyncRequestProcessor syncProcessor;
-
/*
* Pending sync requests
*/
@@ -132,24 +128,6 @@ public class FollowerZooKeeperServer ext
}
@Override
- public void shutdown() {
- LOG.info("Shutting down");
- try {
- super.shutdown();
- } catch (Exception e) {
- LOG.warn("Ignoring unexpected exception during shutdown", e);
- }
- try {
- if (syncProcessor != null) {
- syncProcessor.shutdown();
- }
- } catch (Exception e) {
- LOG.warn("Ignoring unexpected exception in syncprocessor shutdown",
- e);
- }
- }
-
- @Override
public String getState() {
return "follower";
}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java?rev=1579888&r1=1579887&r2=1579888&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerZooKeeperServer.java Fri Mar 21 05:36:11 2014
@@ -26,6 +26,7 @@ import org.apache.zookeeper.KeeperExcept
import org.apache.zookeeper.server.DataTreeBean;
import org.apache.zookeeper.server.quorum.LearnerSessionTracker;
import org.apache.zookeeper.server.ServerCnxn;
+import org.apache.zookeeper.server.SyncRequestProcessor;
import org.apache.zookeeper.server.ZKDatabase;
import org.apache.zookeeper.server.ZooKeeperServerBean;
import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
@@ -35,6 +36,12 @@ import org.apache.zookeeper.server.persi
*/
public abstract class LearnerZooKeeperServer extends QuorumZooKeeperServer {
+ /*
+ * Request processors
+ */
+ protected CommitProcessor commitProcessor;
+ protected SyncRequestProcessor syncProcessor;
+
public LearnerZooKeeperServer(FileTxnSnapLog logFactory, int tickTime,
int minSessionTimeout, int maxSessionTimeout,
ZKDatabase zkDb, QuorumPeer self)
@@ -148,4 +155,22 @@ public abstract class LearnerZooKeeperSe
}
jmxServerBean = null;
}
+
+ @Override
+ public void shutdown() {
+ LOG.info("Shutting down");
+ try {
+ super.shutdown();
+ } catch (Exception e) {
+ LOG.warn("Ignoring unexpected exception during shutdown", e);
+ }
+ try {
+ if (syncProcessor != null) {
+ syncProcessor.shutdown();
+ }
+ } catch (Exception e) {
+ LOG.warn("Ignoring unexpected exception in syncprocessor shutdown",
+ e);
+ }
+ }
}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java?rev=1579888&r1=1579887&r2=1579888&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java Fri Mar 21 05:36:11 2014
@@ -46,12 +46,6 @@ public class ObserverZooKeeperServer ext
private boolean syncRequestProcessorEnabled = this.self.getSyncEnabled();
/*
- * Request processors
- */
- private CommitProcessor commitProcessor;
- private SyncRequestProcessor syncProcessor;
-
- /*
* Pending sync requests
*/
ConcurrentLinkedQueue<Request> pendingSyncs =