ZOOKEEPER-234. Eliminate using statics to initialize the sever. Should allow server to be more embeddable in OSGi enviorments.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@734847 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -3,8 +3,8 @@ Trunk
 Non-backward compatible changes:
 
 BUGFIXES:
-  ZOOKEEPER-255. zoo_set() api does not return stat datastructure. (avery
-ching via mahadev)
+  ZOOKEEPER-255. zoo_set() api does not return stat datastructure.
+  (avery ching via mahadev)
 
 Backward compatibile changes:
 
@@ -64,7 +64,7 @@ BUGFIXES:
   files better. (mahadev via phunt)
  
   ZOOKEEPER-265. remove (deprecate) unused NoSyncConnected from KeeperState.
-(phunt via mahadev)
+  (phunt via mahadev)
  
 IMPROVEMENTS:
    
@@ -83,25 +83,29 @@ IMPROVEMENTS:
    ZOOKEEPER-230. Improvements to FLE. (Flavio via mahadev)
 
    ZOOKEEPER-225. c client should log an info message in zookeeper_init
-detailing connection parameters. (pat via mahadev)
+   detailing connection parameters. (pat via mahadev)
 
    ZOOKEEPER-222.  print C client log message timestamp in human readable
-form. (pat via mahadev) 
+   form. (pat via mahadev) 
   
-   ZOOKEEPER-246. review error code definition in both source and docs. (pat
-via mahadev)
+   ZOOKEEPER-246. review error code definition in both source and docs.
+   (pat via mahadev)
 
    ZOOKEEPER-256. support use of JMX to manage log4j configuration at runtime.
-(pat via mahadev)
+   (pat via mahadev)
 
-   ZOOKEEPER-214. add new "stat reset" command to server admin port. (pat via
-mahadev)
+   ZOOKEEPER-214. add new "stat reset" command to server admin port.
+   (pat via mahadev)
 
    ZOOKEEPER-258. docs incorrectly state max client timeout as 60 seconds
-(it's based on server ticktime). (phunt via mahadev)
+   (it's based on server ticktime). (phunt via mahadev)
 
    ZOOKEEPER-135. Fat jar build target. (phunt and breed via mahadev)
 
+   ZOOKEEPER-234. Eliminate using statics to initialize the sever. Should
+   allow server to be more embeddable in OSGi enviorments. (phunt)
+
+
 Release 3.0.0 - 2008-10-21
 
 Non-backward compatible changes:

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerBean.java

@@ -1,28 +0,0 @@
-/**
- * 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.jmx.server.quorum;
-
-/**
- * Follower MBean inteface implementation
- */
-public class FollowerBean extends ServerBean implements FollowerMXBean {
-    public String getName() {
-        return "Follower";
-    }
-}

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/FollowerMXBean.java

@@ -1,26 +0,0 @@
-/**
- * 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.jmx.server.quorum;
-
-/**
- * Follower MBean
- */
-public interface FollowerMXBean extends ServerMXBean {
-
-}

src/java/jmx/org/apache/zookeeper/server/ManagedZooKeeperServer.java

@@ -1,125 +0,0 @@
-/**
- * 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.server;
-
-import static org.apache.zookeeper.server.ServerConfig.getClientPort;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.log4j.Logger;
-import org.apache.zookeeper.jmx.MBeanRegistry;
-import org.apache.zookeeper.jmx.server.ConnectionBean;
-import org.apache.zookeeper.jmx.server.ConnectionMXBean;
-import org.apache.zookeeper.jmx.server.DataTreeBean;
-import org.apache.zookeeper.jmx.server.DataTreeMXBean;
-import org.apache.zookeeper.jmx.server.ZooKeeperServerBean;
-import org.apache.zookeeper.jmx.server.ZooKeeperServerMXBean;
-import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
-import org.apache.zookeeper.server.persistence.Util;
-
-import org.apache.zookeeper.server.util.ConnectionObserver;
-import org.apache.zookeeper.server.util.ObserverManager;
-import org.apache.zookeeper.server.util.ServerObserver;
-
-/**
- * This class launches a standalone zookeeper server with JMX support
- * enabled. The users can connect to the server JVM and manage the server state 
- * (such as currently open client connections) and view runtime statistics using 
- * one of existing GUI JMX consoles (jconsole, for example). Please refer to 
- * the JDK vendor documentation for further information on how to enable JMX 
- * support in the JVM.
- * <p>
- * The server provides following MBeans:
- * <ul>
- *  <li>Zookeeper server MBean -- provides various configuraton data and runtime 
- *  statistics, see {@link ZooKeeperServerMXBean}
- *  <li>Data tree MBean -- provides runtime data tree statistics, see 
- *  {@link DataTreeMXBean}
- *  <li>Client connection MBean -- provides runtime statistics as well as 
- *  connection management operations, see {@link ConnectionMXBean}
- * </ul>
- * The client connection is a dynamic resource and therefore the connection
- * MBeans are dynamically created and destroyed as the clients connect to and 
- * disconnect from the server.
- */
-public class ManagedZooKeeperServer extends ObservableZooKeeperServer {
-    private static final Logger LOG = Logger.getLogger(ManagedZooKeeperServer.class);
-
-    private ZooKeeperServerBean svrBean;
-
-    private class ManagedServerObserver implements ServerObserver {
-        private DataTreeBean dataTreeBean;
-
-        public void onShutdown(ZooKeeperServer server) {
-            MBeanRegistry.getInstance().unregister(dataTreeBean);
-            MBeanRegistry.getInstance().unregister(svrBean);
-        }
-
-        public void onStartup(ZooKeeperServer server) {
-            try {
-                svrBean = new ZooKeeperServerBean(server);
-                MBeanRegistry.getInstance().register(svrBean, null);
-                dataTreeBean = new DataTreeBean(server.dataTree);
-                MBeanRegistry.getInstance().register(dataTreeBean, svrBean);
-            } catch (Exception e) {
-                LOG.warn("Failed to register Standalone ZooKeeperServerMBean "
-                                + e.getMessage());
-            }
-        }
-    }
-
-    private class ManagedConnectionObserver implements ConnectionObserver {
-        private ConcurrentHashMap<ServerCnxn,ConnectionBean> map=
-            new ConcurrentHashMap<ServerCnxn,ConnectionBean>();
-
-        public void onClose(ServerCnxn sc) {
-            ConnectionBean b=map.remove(sc);
-            if(b!=null){
-                ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                        "Un-registering a ConnectionBean: "+b);
-                MBeanRegistry.getInstance().unregister(b);
-            }
-        }
-
-        public void onNew(ServerCnxn sc) {
-            ConnectionBean b=new ConnectionBean(sc,ManagedZooKeeperServer.this);
-            map.put(sc, b);
-            ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                    "Registering new ConnectionBean: "+b);
-            MBeanRegistry.getInstance().register(b, svrBean);            
-        }
-    }
-
-    public ManagedZooKeeperServer(FileTxnSnapLog logFactory, 
-            int tickTime,DataTreeBuilder treeBuilder) throws IOException {
-        super(logFactory, tickTime,treeBuilder);
-        ObserverManager.getInstance().add(new ManagedServerObserver());
-        ObserverManager.getInstance().add(new ManagedConnectionObserver());
-    }
-
-    public ManagedZooKeeperServer(FileTxnSnapLog logFactory,
-            DataTreeBuilder treeBuilder) throws IOException {
-        super(logFactory,treeBuilder);
-        ObserverManager.getInstance().add(new ManagedServerObserver());
-        ObserverManager.getInstance().add(new ManagedConnectionObserver());
-    }
-}

src/java/jmx/org/apache/zookeeper/server/ManagedZooKeeperServerMain.java

@@ -1,93 +0,0 @@
-/**
- * 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.server;
-
-import static org.apache.zookeeper.server.ServerConfig.getClientPort;
-
-import java.io.File;
-import java.io.IOException;
-
-import javax.management.JMException;
-
-import org.apache.log4j.Logger;
-import org.apache.zookeeper.jmx.server.ConnectionMXBean;
-import org.apache.zookeeper.jmx.server.DataTreeMXBean;
-import org.apache.zookeeper.jmx.server.ZooKeeperServerMXBean;
-import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
-import org.apache.zookeeper.server.util.ZooKeeperObserverManager;
-
-/**
- * This class launches a standalone zookeeper server with JMX support
- * enabled. The users can connect to the server JVM and manage the server state 
- * (such as currently open client connections) and view runtime statistics using 
- * one of existing GUI JMX consoles (jconsole, for example). Please refer to 
- * the JDK vendor documentation for further information on how to enable JMX 
- * support in the JVM.
- * <p>
- * The server provides following MBeans:
- * <ul>
- *  <li>Zookeeper server MBean -- provides various configuraton data and runtime 
- *  statistics, see {@link ZooKeeperServerMXBean}
- *  <li>Data tree MBean -- provides runtime data tree statistics, see 
- *  {@link DataTreeMXBean}
- *  <li>Client connection MBean -- provides runtime statistics as well as 
- *  connection management operations, see {@link ConnectionMXBean}
- * </ul>
- * The client connection is a dynamic resource and therefore the connection
- * MBeans are dynamically created and destroyed as the clients connect to and 
- * disconnect from the server.
- */
-public class ManagedZooKeeperServerMain extends ZooKeeperServerMain {
-    
-    private static final Logger LOG = Logger.getLogger(ManagedZooKeeperServerMain.class);
-    /**
-     * To start the server specify the client port number and the data directory
-     * on the command line.
-     * @see ServerConfig#parse(String[])
-     * @param args command line parameters.
-     */
-    public static void main(String[] args) {
-        try {
-            ManagedUtil.registerLog4jMBeans();
-        } catch (JMException e) {
-            LOG.warn("Unable to register log4j JMX control", e);
-        }
-
-        try {
-            ServerConfig.parse(args);
-        } catch(Exception e) {
-            LOG.fatal("Error in config", e);
-            System.exit(2);
-        }
-        ZooKeeperObserverManager.setAsConcrete();
-        runStandalone(new ZooKeeperServer.Factory() {
-            public NIOServerCnxn.Factory createConnectionFactory()throws IOException {
-                return new ObservableNIOServerCnxn.Factory(getClientPort());
-            }
-            public ZooKeeperServer createServer() throws IOException {
-                ManagedZooKeeperServer zks = new ManagedZooKeeperServer(
-                        new FileTxnSnapLog(new File(ServerConfig.getDataDir()),
-                        new File(ServerConfig.getDataLogDir())),
-                new ZooKeeperServer.BasicDataTreeBuilder());
-                return zks;
-            }
-        });
-    }
-
-}

src/java/jmx/org/apache/zookeeper/server/ObservableDataTree.java

@@ -1,115 +0,0 @@
-/**
- * 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.server;
-
-import java.util.ArrayList;
-
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.data.Stat;
-import org.apache.zookeeper.server.util.DataTreeObserver;
-import org.apache.zookeeper.server.util.EventInfo;
-import org.apache.zookeeper.server.util.ObservableComponent;
-import org.apache.zookeeper.server.util.ObserverManager;
-
-/**
- * An observable data tree notifies its observers about any data modification
- * operation, including znode creation, znode update operation, znode deletion 
- * and znode's ACL update.
- * 
- * In order to be able to receive connection notification, applications
- * are required to implement {@link ObservableDataTree} interface and register
- * its instance with {@link ObserverManager}.
- */
-public class ObservableDataTree extends DataTree implements ObservableComponent {
-    private enum Event {
-        ADD() {
-            public void dispatch(DataTree dt,DataNode node,DataTreeObserver o) {
-                o.onAdd(dt,node);
-            }
-        },
-        DELETE() {
-            public void dispatch(DataTree dt,DataNode node, DataTreeObserver o) {
-                o.onDelete(dt,node);
-            }
-        },
-        UPDATE() {
-            public void dispatch(DataTree dt,DataNode node, DataTreeObserver o) {
-                o.onUpdate(dt,node);
-            }
-        },
-        UPDATE_ACL() {
-            public void dispatch(DataTree dt,DataNode node, DataTreeObserver o) {
-                o.onUpdateACL(dt,node);
-            }
-        };
-        public abstract void dispatch(DataTree dt,DataNode node, DataTreeObserver o);
-    }
-
-    private class TreeEventInfo implements EventInfo{
-        private Event ev;
-        private DataNode node;
-        TreeEventInfo(Event ev, DataNode node){
-            this.ev=ev;
-            this.node=node;
-        }
-        public void dispatch(Object source, Object observer){
-            ev.dispatch((ObservableDataTree)source, node, (DataTreeObserver)observer);
-        }
-    }
-
-    public void dispatchEvent(Object observer, Object args) {
-        ((EventInfo)args).dispatch(this,observer);
-    }
-
-
-    public String createNode(String path, byte[] data, ArrayList<ACL> acl,
-            long ephemeralOwner, long zxid, long time) throws KeeperException {
-        String result=super.createNode(path, data, acl, ephemeralOwner, zxid, time);
-        ObserverManager.getInstance().notifyObservers(this,
-                new TreeEventInfo(Event.ADD,getNode(result)));
-        return result;
-    }
-
-    public void deleteNode(String path, long zxid)
-        throws KeeperException.NoNodeException
-    {
-        DataNode deleted=getNode(path);
-        super.deleteNode(path, zxid);
-        ObserverManager.getInstance().notifyObservers(this,
-                new TreeEventInfo(Event.DELETE,deleted));
-    }
-
-    public Stat setACL(String path, ArrayList<ACL> acl, int version)
-            throws KeeperException {
-        Stat stat=super.setACL(path, acl, version);
-        ObserverManager.getInstance().notifyObservers(this,
-                new TreeEventInfo(Event.UPDATE_ACL,getNode(path)));
-        return stat;
-    }
-
-
-    public Stat setData(String path, byte[] data, int version, long zxid,
-            long time) throws KeeperException.NoNodeException {
-        Stat stat=super.setData(path, data, version, zxid, time);
-        ObserverManager.getInstance().notifyObservers(this,
-                new TreeEventInfo(Event.UPDATE,getNode(path)));
-        return stat;
-    }    
-}

src/java/jmx/org/apache/zookeeper/server/ObservableNIOServerCnxn.java

@@ -1,85 +0,0 @@
-/**
- * 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.server;
-
-import java.io.IOException;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.SocketChannel;
-
-import org.apache.zookeeper.server.util.ConnectionObserver;
-import org.apache.zookeeper.server.util.ObservableComponent;
-import org.apache.zookeeper.server.util.ObserverManager;
-
-/**
- * This class implements an observable server connection. It supports two
- * types of connection events: a new connection event and a connection closed 
- * event.
- * 
- * In order to be able to receive connection notification, applications
- * are required to implement {@link ConnectionObserver} interface and register
- * its instance with {@link ObserverManager}.
- */
-public class ObservableNIOServerCnxn extends NIOServerCnxn implements ObservableComponent {
-    private enum ConnectionEvent {
-        NEW(){
-            public void dispatch(ServerCnxn c, ConnectionObserver o){
-                o.onNew(c);
-            }
-        },
-        CLOSE(){
-            public void dispatch(ServerCnxn c, ConnectionObserver o){
-                o.onClose(c);
-            }            
-        };
-        public abstract void dispatch(ServerCnxn c, ConnectionObserver o);
-    }
-
-    static public class Factory extends NIOServerCnxn.Factory{
-        @Override
-        protected NIOServerCnxn createConnection(SocketChannel sock,
-                SelectionKey sk) throws IOException {
-            return new ObservableNIOServerCnxn(zks,sock,sk,this);
-        }
-
-        public Factory(int port) throws IOException {
-            super(port);
-        }
-    }
-    
-    public ObservableNIOServerCnxn(ZooKeeperServer zk, SocketChannel sock,
-            SelectionKey sk, Factory factory) throws IOException {
-        super(zk, sock, sk, factory);
-    }
-
-    public void close() {
-        ObserverManager.getInstance().notifyObservers(this,ConnectionEvent.CLOSE);
-        super.close();
-    }
-
-    public void dispatchEvent(Object observer, Object args) {
-        ConnectionEvent ev=(ConnectionEvent)args;
-        ev.dispatch(this, (ConnectionObserver)observer);
-    }
-
-    public void finishSessionInit(boolean valid) {
-        super.finishSessionInit(valid);
-        if(valid && !closed)
-            ObserverManager.getInstance().notifyObservers(this,ConnectionEvent.NEW);
-    }
-}

src/java/jmx/org/apache/zookeeper/server/ObservableZooKeeperServer.java

@@ -1,56 +0,0 @@
-/**
- * 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.server;
-
-import java.io.IOException;
-
-
-import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
-import org.apache.zookeeper.server.util.ObserverManager;
-import org.apache.zookeeper.server.util.ServerObserver;
-
-/**
- * The observable server broadcast notifications when its state changes. 
- * 
- * The code interested in receiving the notification must implement 
- * the {@link ServerObserver} interface and register the instance with 
- * {@link ObserverManager}.
- */
-public class ObservableZooKeeperServer extends ZooKeeperServer{
-
-    private ZooKeeperObserverNotifier notifier=new ZooKeeperObserverNotifier(this);
-    public ObservableZooKeeperServer(FileTxnSnapLog logFactory, 
-            int tickTime,DataTreeBuilder treeBuilder) throws IOException {
-        super(logFactory, tickTime,treeBuilder);
-    }
-    public ObservableZooKeeperServer(FileTxnSnapLog logFactory,
-            DataTreeBuilder treeBuilder) throws IOException {
-        super(logFactory,treeBuilder);
-    }
-
-    public void shutdown() {
-        notifier.notifyShutdown();
-        super.shutdown();
-    }
-
-    public void startup() throws IOException, InterruptedException {
-        super.startup();
-        notifier.notifyStarted();
-    }
-}

src/java/jmx/org/apache/zookeeper/server/ZooKeeperObserverNotifier.java

@@ -1,76 +0,0 @@
-/**
- * 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.server;
-
-import org.apache.zookeeper.server.util.ObservableComponent;
-import org.apache.zookeeper.server.util.ObserverManager;
-import org.apache.zookeeper.server.util.ServerObserver;
-
-/**
- * The class is responsible for triggering and dispatching of server life cycle events.
- * <p>
- * In order to make itself observable, the server class creates an instance of 
- * ZooKeeperObserverNotifier and then, calls the notifyStarted or notifyShutdown 
- * methods to notify all registered observers of a startup or shutdown event 
- * correspondingly.
- * 
- * Application wishing to be notified of a server state change should implement
- * {@link ServerObserver} interface and register an instance of the interface
- * with {@link ObserverManager}.
- */
-public class ZooKeeperObserverNotifier implements ObservableComponent {
-    private enum Event {
-        STARTUP() {
-            public void dispatch(ZooKeeperServer s, ServerObserver o) {
-                o.onStartup(s);
-            }
-        },
-        SHUTDOWN() {
-            public void dispatch(ZooKeeperServer s, ServerObserver o) {
-                o.onShutdown(s);
-            }
-        };
-        public abstract void dispatch(ZooKeeperServer s, ServerObserver o);
-    }
-
-    private ZooKeeperServer server;
-    
-    public ZooKeeperObserverNotifier(ZooKeeperServer server) {
-        this.server=server;
-    }
-
-    /**
-     * Generate a startup event.
-     */
-    public void notifyStarted(){
-        ObserverManager.getInstance().notifyObservers(this,Event.STARTUP);        
-    }
-    /**
-     * Generate a shutdown event.
-     */
-    public void notifyShutdown(){
-        ObserverManager.getInstance().notifyObservers(this,Event.SHUTDOWN);        
-    }
-    
-    public void dispatchEvent(Object observer, Object args) {
-        Event ev=(Event)args;
-        ev.dispatch(server,(ServerObserver)observer);
-    }
-
-}

src/java/jmx/org/apache/zookeeper/server/quorum/ManagedQuorumPeer.java

@@ -1,225 +0,0 @@
-/**
- * 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.server.quorum;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.log4j.Logger;
-import org.apache.zookeeper.jmx.MBeanRegistry;
-import org.apache.zookeeper.jmx.ZKMBeanInfo;
-import org.apache.zookeeper.jmx.server.ConnectionBean;
-import org.apache.zookeeper.jmx.server.ConnectionMXBean;
-import org.apache.zookeeper.jmx.server.DataTreeBean;
-import org.apache.zookeeper.jmx.server.DataTreeMXBean;
-import org.apache.zookeeper.jmx.server.ZooKeeperServerMXBean;
-import org.apache.zookeeper.jmx.server.quorum.FollowerBean;
-import org.apache.zookeeper.jmx.server.quorum.LeaderBean;
-import org.apache.zookeeper.jmx.server.quorum.LeaderElectionBean;
-import org.apache.zookeeper.jmx.server.quorum.LeaderElectionMXBean;
-import org.apache.zookeeper.jmx.server.quorum.LocalPeerBean;
-import org.apache.zookeeper.jmx.server.quorum.LocalPeerMXBean;
-import org.apache.zookeeper.jmx.server.quorum.QuorumBean;
-import org.apache.zookeeper.jmx.server.quorum.QuorumMXBean;
-import org.apache.zookeeper.jmx.server.quorum.RemotePeerBean;
-import org.apache.zookeeper.jmx.server.quorum.RemotePeerMXBean;
-import org.apache.zookeeper.jmx.server.quorum.ServerBean;
-import org.apache.zookeeper.server.NIOServerCnxn;
-import org.apache.zookeeper.server.ServerCnxn;
-import org.apache.zookeeper.server.ZooKeeperServer;
-import org.apache.zookeeper.server.ZooTrace;
-import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
-import org.apache.zookeeper.server.persistence.Util;
-import org.apache.zookeeper.server.util.ConnectionObserver;
-import org.apache.zookeeper.server.util.ObserverManager;
-import org.apache.zookeeper.server.util.QuorumPeerObserver;
-import org.apache.zookeeper.server.util.ServerObserver;
-
-/**
- * This class launches a replicated zookeeper server with JMX support
- * enabled. The users can connect to the server JVM and manage 
- * the server state (such as currently open client connections) and view runtime
- * statistics using one of existing GUI JMX consoles (jconsole, for example).
- * Please refer to the JDK vendor documentation for further information on how
- * to enable JMX support in the JVM.
- * <p>
- * The server provides following MBeans:
- * <ul>
- *  <li>Quorum MBean -- provides quorum runtime statistics, see {@link QuorumMXBean}.
- *  <li>Peer MBean -- provides information about quorum peers (local and remote),
- *  see {@link LocalPeerMXBean} and {@link RemotePeerMXBean}.
- *  <li>Leader election MBean -- provides runtime info on leader election protocol,
- *  see {@link LeaderElectionMXBean}
- *  <li>Zookeeper server MBean -- provides various configuraton data and runtime 
- *  statistics, see {@link ZooKeeperServerMXBean}
- *  <li>Data tree MBean -- provides runtime data tree statistics, see 
- *  {@link DataTreeMXBean}
- *  <li>Client connection MBean -- provides runtime statistics as well as 
- *  connection management operations, see {@link ConnectionMXBean}
- * </ul>
- * The client connection is a dynamic resource and therefore the connection
- * MBeans are dynamically created and destroyed as the clients connect to and 
- * disconnect from the server.
- */
-public class ManagedQuorumPeer extends ObservableQuorumPeer {
-    private static final Logger LOG = Logger.getLogger(ManagedQuorumPeer.class);
-
-    private QuorumBean quorumBean;
-    private LocalPeerBean localPeerBean;
-    private ServerBean svrBean;
-    private LeaderElectionBean leBean;
-    
-    // tracking state of the quorum peer
-    private class ManagedQuorumPeerObserver implements QuorumPeerObserver {
-        public void onFollowerShutdown(QuorumPeer qp, Follower follower) {
-            ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                    "Follower shutdown "+follower);
-            MBeanRegistry.getInstance().unregister(svrBean);
-            svrBean=null;
-        }
-
-        public void onFollowerStarted(QuorumPeer qp, Follower newFollower) {
-            ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                    "Follower started "+newFollower);
-            MBeanRegistry.getInstance().unregister(leBean);
-            leBean=null;
-            svrBean=new FollowerBean();
-            MBeanRegistry.getInstance().register(svrBean, localPeerBean);
-        }
-
-        public void onLeaderElectionStarted(QuorumPeer qp) {
-            ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                    "Running leader election protocol...");
-            leBean=new LeaderElectionBean();
-            MBeanRegistry.getInstance().register(leBean, localPeerBean);            
-        }
-
-        public void onLeaderShutdown(QuorumPeer qp, Leader leader) {
-            ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                    "Leader shutdown "+leader);
-            MBeanRegistry.getInstance().unregister(svrBean);
-            svrBean=null;
-        }
-
-        public void onLeaderStarted(QuorumPeer qp, Leader newLeader) {
-            ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                    "Leader started "+newLeader);
-            MBeanRegistry.getInstance().unregister(leBean);
-            leBean=null;
-            svrBean=new LeaderBean();
-            MBeanRegistry.getInstance().register(svrBean, localPeerBean);
-        }
-
-        public void onShutdown(QuorumPeer qp) {
-            ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                    "Shutting down quorum peer");
-            MBeanRegistry.getInstance().unregisterAll();
-        }
-
-        public void onStartup(QuorumPeer qp) {
-            ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                    "Starting quorum peer");
-            quorumBean=new QuorumBean(qp);
-            MBeanRegistry.getInstance().register(quorumBean, null);
-            for(QuorumServer s: qp.quorumPeers.values()){
-                ZKMBeanInfo p;
-                if(qp.getId()==s.id)
-                    p=localPeerBean=new LocalPeerBean(qp);
-                else
-                    p=new RemotePeerBean(s);
-                MBeanRegistry.getInstance().register(p, quorumBean);
-            }
-        }
-    }
-
-    // on client connect/disconnect this observer will register/unregister 
-    // a connection MBean with the MBean server
-    private class ManagedConnectionObserver implements ConnectionObserver {
-        private ConcurrentHashMap<ServerCnxn,ConnectionBean> map=
-            new ConcurrentHashMap<ServerCnxn,ConnectionBean>();
-
-        public void onClose(ServerCnxn sc) {
-            ConnectionBean b=map.remove(sc);
-            if(b!=null){
-                ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                        "Un-registering a ConnectionBean: "+b);
-                MBeanRegistry.getInstance().unregister(b);
-            }
-        }
-
-        public void onNew(ServerCnxn sc) {
-            ConnectionBean b=new ConnectionBean(sc,getActiveServer());
-            map.put(sc, b);
-            ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                    "Registering new ConnectionBean: "+b);
-            MBeanRegistry.getInstance().register(b, localPeerBean);            
-        }
-    }
-
-    // this observer tracks the state of the zookeeper server 
-    private class ManagedServerObserver implements ServerObserver {
-        private DataTreeBean dataTreeBean;
-
-        public void onShutdown(ZooKeeperServer server) {
-            ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                    "Shutdown zookeeper server: "+server);
-            MBeanRegistry.getInstance().unregister(dataTreeBean);
-            dataTreeBean=null;
-        }
-
-        public void onStartup(ZooKeeperServer server) {
-            ZooTrace.logTraceMessage(LOG, ZooTrace.JMX_TRACE_MASK,
-                    "Started new zookeeper server: "+server);
-            try {
-                dataTreeBean = new DataTreeBean(server.dataTree);
-                MBeanRegistry.getInstance().register(dataTreeBean, svrBean);
-            } catch (Exception e) {
-                LOG.warn("Failed to register Standalone ZooKeeperServerMBean "
-                                + e.getMessage());
-            }
-        }
-    }
-
-    private void setupObservers(){
-        ObserverManager.getInstance().add(new ManagedQuorumPeerObserver());
-        ObserverManager.getInstance().add(new ManagedServerObserver());        
-        ObserverManager.getInstance().add(new ManagedConnectionObserver());        
-    }
-    
-    public ManagedQuorumPeer() {
-        super();
-        setupObservers();
-    }
-
-    public ManagedQuorumPeer(HashMap<Long,QuorumServer> quorumPeers, File dataDir, File dataLogDir, int clientPort, int electionAlg, long myid, int tickTime, int initLimit,
-                                int syncLimit) throws IOException {
-        super(quorumPeers, dataDir, dataLogDir, clientPort, electionAlg, myid, tickTime, initLimit, 
-syncLimit);
-        setupObservers();
-    }
-
-    public ManagedQuorumPeer(HashMap<Long,QuorumServer> quorumPeers, File dataDir, File dataLogDir, int electionType, long myid, int tickTime, int initLimit, int syncLimit,
-                                NIOServerCnxn.Factory cnxnFactory) throws IOException {
-        super(quorumPeers, dataDir, dataLogDir, electionType, myid, tickTime, initLimit, syncLimit, cnxnFactory);
-        setupObservers();
-    }
-
-}

src/java/jmx/org/apache/zookeeper/server/quorum/ManagedQuorumPeerMain.java

@@ -1,139 +0,0 @@
-/**
- * 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.server.quorum;
-
-import static org.apache.zookeeper.server.ServerConfig.getClientPort;
-
-import java.io.File;
-import java.io.IOException;
-
-import javax.management.JMException;
-
-import org.apache.log4j.Logger;
-import org.apache.zookeeper.jmx.server.ConnectionMXBean;
-import org.apache.zookeeper.jmx.server.DataTreeMXBean;
-import org.apache.zookeeper.jmx.server.ZooKeeperServerMXBean;
-import org.apache.zookeeper.jmx.server.quorum.LeaderElectionMXBean;
-import org.apache.zookeeper.jmx.server.quorum.LocalPeerMXBean;
-import org.apache.zookeeper.jmx.server.quorum.QuorumMXBean;
-import org.apache.zookeeper.jmx.server.quorum.RemotePeerMXBean;
-import org.apache.zookeeper.server.ManagedUtil;
-import org.apache.zookeeper.server.ManagedZooKeeperServerMain;
-import org.apache.zookeeper.server.NIOServerCnxn;
-import org.apache.zookeeper.server.ObservableNIOServerCnxn;
-import org.apache.zookeeper.server.ServerConfig;
-import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
-import org.apache.zookeeper.server.util.ZooKeeperObserverManager;
-
-/**
- * This class launches a replicated zookeeper server with JMX support
- * enabled. The users can connect to the server JVM and manage 
- * the server state (such as currently open client connections) and view runtime
- * statistics using one of existing GUI JMX consoles (jconsole, for example).
- * Please refer to the JDK vendor documentation for further information on how
- * to enable JMX support in the JVM.
- * <p>
- * The server provides following MBeans:
- * <ul>
- *  <li>Quorum MBean -- provides quorum runtime statistics, see {@link QuorumMXBean}.
- *  <li>Peer MBean -- provides information about quorum peers (local and remote),
- *  see {@link LocalPeerMXBean} and {@link RemotePeerMXBean}.
- *  <li>Leader election MBean -- provides runtime info on leader election protocol,
- *  see {@link LeaderElectionMXBean}
- *  <li>Zookeeper server MBean -- provides various configuraton data and runtime 
- *  statistics, see {@link ZooKeeperServerMXBean}
- *  <li>Data tree MBean -- provides runtime data tree statistics, see 
- *  {@link DataTreeMXBean}
- *  <li>Client connection MBean -- provides runtime statistics as well as 
- *  connection management operations, see {@link ConnectionMXBean}
- * </ul>
- * The client connection is a dynamic resource and therefore the connection
- * MBeans are dynamically created and destroyed as the clients connect to and 
- * disconnect from the server.
- */
-public class ManagedQuorumPeerMain {
-    
-    private static final Logger LOG = Logger.getLogger(ManagedQuorumPeerMain.class);
-
-    /**
-     * To start the replicated server specify the configuration file name on the
-     * command line.
-     * @param args command line
-     */
-    public static void main(String[] args) {
-        if (args.length == 2) {
-            ManagedZooKeeperServerMain.main(args);
-            return;
-        }
-        try {
-            QuorumPeerConfig.parse(args);
-        } catch(Exception e) {
-            LOG.fatal("Error in config ", e);
-            System.exit(2);
-        }
-        if (!QuorumPeerConfig.isStandalone()) {
-            try {
-                ManagedUtil.registerLog4jMBeans();
-            } catch (JMException e) {
-                LOG.warn("Unable to register log4j JMX control", e);
-            }
-
-            ZooKeeperObserverManager.setAsConcrete();
-            runPeer(new QuorumPeer.Factory() {
-                public QuorumPeer create(NIOServerCnxn.Factory cnxnFactory)
-                throws IOException {
-                    ManagedQuorumPeer peer = new ManagedQuorumPeer();
-                    peer.setClientPort(ServerConfig.getClientPort());
-                    FileTxnSnapLog factory = new FileTxnSnapLog(new 
-                            File(ServerConfig.getDataLogDir()), new  
-                                    File(ServerConfig.getDataDir()));
-                    peer.setTxnFactory(factory);
-                    peer.setQuorumPeers(QuorumPeerConfig.getServers());
-                    peer.setElectionType(QuorumPeerConfig.getElectionAlg());
-                    peer.setMyid(QuorumPeerConfig.getServerId());
-                    peer.setTickTime(QuorumPeerConfig.getTickTime());
-                    peer.setInitLimit(QuorumPeerConfig.getInitLimit());
-                    peer.setSyncLimit(QuorumPeerConfig.getSyncLimit());
-                    peer.setCnxnFactory(cnxnFactory);
-                    return peer;
-
-                }
-                public NIOServerCnxn.Factory createConnectionFactory() throws IOException {
-                    return new ObservableNIOServerCnxn.Factory(getClientPort());
-                }
-            });
-        }else{
-            // there is only server in the quorum -- run as standalone
-            ManagedZooKeeperServerMain.main(args);
-        }
-    }
-    
-    public static void runPeer(QuorumPeer.Factory qpFactory) {
-        try {
-            QuorumStats.registerAsConcrete();
-            QuorumPeer self = qpFactory.create(qpFactory.createConnectionFactory());
-            self.start();
-            self.join();
-        } catch (Exception e) {
-            LOG.fatal("Unexpected exception",e);
-        }
-        System.exit(2);
-    }
-
-}

src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollower.java

@@ -1,78 +0,0 @@
-/**
- * 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.server.quorum;
-
-import org.apache.zookeeper.server.util.EventInfo;
-import org.apache.zookeeper.server.util.ObserverManager;
-import org.apache.zookeeper.server.util.QuorumPeerObserver;
-
-/**
- * This observable follower implementation notifies its registered observers
- * of its important life cycle events: startup and shutdown.
- * <p>
- * In order to be able to receive leader notifications, application must 
- * implement {@link QuorumPeerObserver} and register an instance of the interface
- * with {@link ObserverManager}.
- */
-public class ObservableFollower extends Follower {
-
-    private enum Event{
-        STARTUP() {
-            public void dispatch(ObservableQuorumPeer peer,
-                    QuorumPeerObserver ob,Follower follower) {
-                ob.onFollowerStarted(peer,follower);
-            }
-        },
-        SHUTDOWN() {
-            public void dispatch(ObservableQuorumPeer peer,
-                    QuorumPeerObserver ob,Follower follower) {
-                ob.onFollowerShutdown(peer,follower);
-            }
-        };
-        public abstract void dispatch(ObservableQuorumPeer peer,
-                QuorumPeerObserver ob,Follower follower);
-    }
-
-    public ObservableFollower(QuorumPeer self, FollowerZooKeeperServer zk) {
-        super(self, zk);
-    }
-
-    static private class PeerEvent implements EventInfo{
-        private Event ev;
-        private Follower info;
-        PeerEvent(Event ev,Follower info){
-            this.ev=ev;
-            this.info=info;
-        }
-        public void dispatch(Object source, Object ob) {
-            ev.dispatch((ObservableQuorumPeer)source,(QuorumPeerObserver)ob,info);
-        }
-    }
-    void followLeader() throws InterruptedException {
-        try{
-            ObserverManager.getInstance().notifyObservers((ObservableQuorumPeer)self, 
-                    new PeerEvent(Event.STARTUP,this));
-            super.followLeader();
-        }finally{
-            ObserverManager.getInstance().notifyObservers((ObservableQuorumPeer)self, 
-                    new PeerEvent(Event.SHUTDOWN,this));            
-        }
-    }
-
-}

src/java/jmx/org/apache/zookeeper/server/quorum/ObservableFollowerZooKeeperServer.java

@@ -1,55 +0,0 @@
-/**
- * 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.server.quorum;
-
-import java.io.IOException;
-
-import org.apache.zookeeper.server.ZooKeeperObserverNotifier;
-import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
-import org.apache.zookeeper.server.util.ObserverManager;
-import org.apache.zookeeper.server.util.ServerObserver;
-
-/**
- * This observable follower server class notifies the registered observers
- * whenever the server instance is started or stopped.
- * <p>
- * Application wishing to be notified of a server state change should implement
- * {@link ServerObserver} interface and register an instance of the interface
- * with {@link ObserverManager}.
- */
-public class ObservableFollowerZooKeeperServer extends FollowerZooKeeperServer {
-
-    private ZooKeeperObserverNotifier notifier;
-
-    public ObservableFollowerZooKeeperServer(FileTxnSnapLog logFactory,
-            QuorumPeer self, DataTreeBuilder treeBuilder) throws IOException {
-        super(logFactory, self, treeBuilder);
-        notifier=new ZooKeeperObserverNotifier(this);
-    }
-    
-    public void shutdown() {
-        notifier.notifyShutdown();
-        super.shutdown();
-    }
-
-    public void startup() throws IOException, InterruptedException {
-        super.startup();
-        notifier.notifyStarted();
-    }
-}

src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeader.java

@@ -1,82 +0,0 @@
-/**
- * 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.server.quorum;
-
-import java.io.IOException;
-
-import org.apache.zookeeper.server.util.EventInfo;
-import org.apache.zookeeper.server.util.ObserverManager;
-import org.apache.zookeeper.server.util.QuorumPeerObserver;
-
-/**
- * This observable leader implementation notifies its registered observers
- * of its important life cycle events: startup and shutdown.
- * <p>
- * In order to be able to receive leader notifications, application must 
- * implement {@link QuorumPeerObserver} and register an instance of the interface
- * with {@link ObserverManager}.
- */
-public class ObservableLeader extends Leader{
-
-    private enum Event{
-        STARTUP() {
-            public void dispatch(ObservableQuorumPeer peer,
-                    QuorumPeerObserver ob,Leader leader) {
-                ob.onLeaderStarted(peer,leader);
-            }
-        },
-        SHUTDOWN() {
-            public void dispatch(ObservableQuorumPeer peer,
-                    QuorumPeerObserver ob,Leader leader) {
-                ob.onLeaderShutdown(peer,leader);
-            }
-        };
-        public abstract void dispatch(ObservableQuorumPeer peer,
-                QuorumPeerObserver ob,Leader leader);
-    }
-
-    public ObservableLeader(QuorumPeer self, LeaderZooKeeperServer zk)
-            throws IOException {
-        super(self, zk);
-    }
-
-    static private class PeerEvent implements EventInfo{
-        private Event ev;
-        private Leader info;
-        PeerEvent(Event ev,Leader info){
-            this.ev=ev;
-            this.info=info;
-        }
-        public void dispatch(Object source, Object ob) {
-            ev.dispatch((ObservableQuorumPeer)source,(QuorumPeerObserver)ob,info);
-        }
-    }
-    // QuorumPeer calls this method as soon as the peer has been elected a leader
-    void lead() throws IOException, InterruptedException {
-        try{
-            ObserverManager.getInstance().notifyObservers((ObservableQuorumPeer)self, 
-                    new PeerEvent(Event.STARTUP,this));
-            super.lead();
-        }finally{
-            ObserverManager.getInstance().notifyObservers((ObservableQuorumPeer)self, 
-                    new PeerEvent(Event.SHUTDOWN,this));            
-        }
-    }
-
-}

src/java/jmx/org/apache/zookeeper/server/quorum/ObservableLeaderZooKeeperServer.java

@@ -1,55 +0,0 @@
-/**
- * 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.server.quorum;
-
-import java.io.IOException;
-
-import org.apache.zookeeper.server.ZooKeeperObserverNotifier;
-import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
-import org.apache.zookeeper.server.util.ObserverManager;
-import org.apache.zookeeper.server.util.ServerObserver;
-
-/**
- * This observable leader server class notifies the registered observers
- * whenever the server is started or stopped.
- * <p>
- * Application wishing to be notified of a server state change should implement
- * {@link ServerObserver} interface and register an instance of the interface
- * with {@link ObserverManager}.
- */
-public class ObservableLeaderZooKeeperServer extends LeaderZooKeeperServer {
-
-    private ZooKeeperObserverNotifier notifier;
-
-    public ObservableLeaderZooKeeperServer(FileTxnSnapLog logFactory,
-            QuorumPeer self, DataTreeBuilder treeBuilder) throws IOException {
-        super(logFactory, self, treeBuilder);
-        notifier=new ZooKeeperObserverNotifier(this);
-    }
-
-    public void shutdown() {
-        notifier.notifyShutdown();
-        super.shutdown();
-    }
-
-    public void startup() throws IOException, InterruptedException {
-        super.startup();
-        notifier.notifyStarted();
-    }
-}

src/java/jmx/org/apache/zookeeper/server/quorum/ObservableQuorumPeer.java

@@ -1,115 +0,0 @@
-/**
- * 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.server.quorum;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.net.InetSocketAddress;
-
-import org.apache.zookeeper.server.NIOServerCnxn;
-import org.apache.zookeeper.server.ZooKeeperServer;
-import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
-import org.apache.zookeeper.server.util.EventInfo;
-import org.apache.zookeeper.server.util.ObservableComponent;
-import org.apache.zookeeper.server.util.ObserverManager;
-import org.apache.zookeeper.server.util.QuorumPeerObserver;
-
-/**
- * The observable quorum peer sends notifications to all registered observers
- * when its state changes. Events of interest include peer startup, shutdown and
- * the initiation of a leader election protocol.
- * <p>
- * In order to be able to receive QuorumPeer notifications, application must 
- * implement {@link QuorumPeerObserver} and register an instance of the interface
- * with {@link ObserverManager}.
- */
-public class ObservableQuorumPeer extends QuorumPeer implements ObservableComponent{
-
-    private enum Event{
-        STARTUP(){
-            public void dispatch(ObservableQuorumPeer peer,QuorumPeerObserver ob){
-                ob.onStartup(peer);
-            }
-        },
-        SHUTDOWN(){
-            public void dispatch(ObservableQuorumPeer peer,QuorumPeerObserver ob){
-                ob.onShutdown(peer);                
-            }            
-        },
-        LEADER_ELECTION(){
-            public void dispatch(ObservableQuorumPeer peer,QuorumPeerObserver ob){
-                ob.onLeaderElectionStarted(peer);                
-            }
-        };
-        public abstract void dispatch(ObservableQuorumPeer peer,QuorumPeerObserver ob);
-    }
-    public ObservableQuorumPeer() {
-        super();
-    }
-
-    public ObservableQuorumPeer(HashMap<Long,QuorumServer> quorumPeers, File dataDir, File dataLogDir, int clientPort, int electionAlg, long myid, int tickTime, int initLimit,
-                                int syncLimit) throws IOException {
-        super(quorumPeers, dataDir, dataLogDir, clientPort, electionAlg, myid, tickTime, initLimit, syncLimit);
-    }
-
-    public ObservableQuorumPeer(HashMap<Long,QuorumServer> quorumPeers, File dataDir, File dataLogDir, int electionType, long myid, int tickTime, int initLimit, int syncLimit,
-                                NIOServerCnxn.Factory cnxnFactory) throws IOException {
-        super(quorumPeers, dataDir, dataLogDir, electionType, myid, tickTime, initLimit, syncLimit, cnxnFactory);
-    }
-
-
-    // instantiate an observable follower
-    protected Follower makeFollower(FileTxnSnapLog logFactory) throws IOException {
-        return new ObservableFollower(this, 
-                new ObservableFollowerZooKeeperServer(logFactory, this,
-                        new ZooKeeperServer.BasicDataTreeBuilder()));
-    }
-
-    // instantiate an observable leader
-    protected Leader makeLeader(FileTxnSnapLog logFactory) throws IOException {
-        return new ObservableLeader(this, 
-                new ObservableLeaderZooKeeperServer(logFactory, 
-                        this,new ZooKeeperServer.BasicDataTreeBuilder()));
-    }
-
-    public void run() {
-        try {
-            ObserverManager.getInstance().notifyObservers(this, Event.STARTUP);
-            super.run();
-        } finally {
-            ObserverManager.getInstance().notifyObservers(this, Event.SHUTDOWN);
-        }
-    }
-
-    public void dispatchEvent(Object observer, Object args) {
-        if(args instanceof ObservableQuorumPeer.Event)
-            ((Event)args).dispatch(this,(QuorumPeerObserver)observer);
-        else
-            ((EventInfo)args).dispatch(this,observer);        
-    }
-
-    // this method is called by the base class when leader election is about to
-    // start; override the method to send a notification before election protocol 
-    // started
-    protected Election makeLEStrategy() {
-        ObserverManager.getInstance().notifyObservers(this,Event.LEADER_ELECTION);
-        return super.makeLEStrategy();
-    }
-}

src/java/jmx/org/apache/zookeeper/server/util/ConnectionObserver.java

@@ -1,38 +0,0 @@
-/**
- * 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.server.util;
-
-import org.apache.zookeeper.server.ServerCnxn;
-
-/**
- * Application must implement this interface and register its instance with
- * the {@link ObserverManager}.
- */
-public interface ConnectionObserver {
-    /**
-     * A new client connection started
-     * @param sc the new connection instance
-     */
-    public void onNew(ServerCnxn sc);
-    /**
-     * A client connected closed
-     * @param sc the connection instance
-     */
-    public void onClose(ServerCnxn sc);
-}

src/java/jmx/org/apache/zookeeper/server/util/DataTreeObserver.java

@@ -1,53 +0,0 @@
-/**
- * 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.server.util;
-
-import org.apache.zookeeper.server.DataNode;
-import org.apache.zookeeper.server.DataTree;
-
-/**
- * Application must implement this interface and register its instance with
- * the {@link ObserverManager}.
- */
-public interface DataTreeObserver {
-    /**
-     * A new znode has been created.
-     * @param dt the data tree instance
-     * @param node the new znode
-     */
-    public void onAdd(DataTree dt,DataNode node);
-    /**
-     * A znode has been deleted.
-     * @param dt the data tree instance
-     * @param node the deleted znode
-     */
-    public void onDelete(DataTree dt,DataNode node);
-    /**
-     * A znode value has changed.
-     * @param dt the data tree instance
-     * @param node the znode whose value's changed 
-     */
-    public void onUpdate(DataTree dt, DataNode node);
-    /**
-     * A znode's ACL has been modified. 
-     * @param dt the data tree instance
-     * @param node the znode whose ACL has changed
-     */
-    public void onUpdateACL(DataTree dt, DataNode node);
-}

src/java/jmx/org/apache/zookeeper/server/util/EventInfo.java

@@ -1,30 +0,0 @@
-/**
- * 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.server.util;
-
-/**
- * A helper interface used to make event generation and dispatching more 
- * consistent. An instance of the interface is normally used as the second 
- * argument to the {@link ObserverManager#notifyObservers()} call.
- * 
- * @see ObservableDataTree implements the interface 
- */
-public interface EventInfo {
-    public void dispatch(Object source, Object observer);
-}

src/java/jmx/org/apache/zookeeper/server/util/ObservableComponent.java

@@ -1,34 +0,0 @@
-/**
- * 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.server.util;
-
-/**
- * An observable component is responsible for decoding and dispatching its events
- * to an observer. Normally, an observable component is also responsible for
- * triggering of its events.
- */
-public interface ObservableComponent {
-    /**
-     * Dispatch an event to the observer.
-     * 
-     * @param observer the observer to be notified
-     * @param args application specific event payload
-     */
-    public void dispatchEvent(Object observer,Object args);
-}

src/java/jmx/org/apache/zookeeper/server/util/ObserverManager.java

@@ -1,95 +0,0 @@
-/**
- * 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.server.util;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-/**
- * Abstract observer manager -- a liason between an observable component 
- * (event producer) and one or more event listeners (event consumers). It takes 
- * care of the bookeeping chores and of broadcasting events to the observers.
- * <p>
- * Observers register themselves using the add() method.
- */
-public abstract class ObserverManager {
-    private static ObserverManager instance=null;
-    private Map<ObservableComponent,Set<Object>> observableCache=
-        Collections.synchronizedMap(new WeakHashMap<ObservableComponent,Set<Object>>());
-    
-    protected abstract Set<Object> getObserverList(Object key);
-    
-    protected static void setInstance(ObserverManager newInstance){
-        instance=newInstance;
-    }
-    
-    public static ObserverManager getInstance(){
-        assert instance!=null;
-        return instance;
-    }
-    /**
-     * Add an observer to the list of registered observers. 
-     * @param observer to be registered
-     */
-    public void add(Object observer) {
-        Set<Object> ob=getObserverList(observer);
-        assert ob!=null;
-        synchronized(ob){
-            ob.add(observer);
-        }
-    }
-
-    /**
-     * An ObservableComponent will call this method to notify its observers
-     * about an event.
-     * @param source the ObservableComponent instance
-     * @param args application event-specific payload (not used by the ObserverManager) 
-     */
-    public void notifyObservers(ObservableComponent source, Object args) {
-        Set<Object> obs = observableCache.get(source);
-        if(obs==null){
-            obs=getObserverList(source);
-            observableCache.put(source, obs);
-        }
-        synchronized (obs) {
-            for (Object o : obs) {
-                try {
-                    source.dispatchEvent(o, args);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    /**
-     * Unregister the observer.
-     * @param observer to be unregistered.
-     */
-    public void remove(Object observer) {
-        Set<Object> ob=getObserverList(observer);
-        if(ob!=null){
-            synchronized(ob){
-                ob.remove(observer);
-            }
-        }
-    }
-}

src/java/jmx/org/apache/zookeeper/server/util/QuorumPeerObserver.java

@@ -1,69 +0,0 @@
-/**
- * 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.server.util;
-
-import org.apache.zookeeper.server.quorum.Follower;
-import org.apache.zookeeper.server.quorum.Leader;
-import org.apache.zookeeper.server.quorum.QuorumPeer;
-
-/**
-* Application must implement this interface and register its instance with
-* the {@link ObserverManager}.
-*/
-public interface QuorumPeerObserver {
-    /**
-     * The local quorum peer qp has started.
-     * @param qp the quorum peer.
-     */
-    public void onStartup(QuorumPeer qp);
-    /**
-     * The local quorum peer is about to shutdown.
-     * @param qp the quorum peer.
-     */
-    public void onShutdown(QuorumPeer qp);
-    /**
-     * Leader election protocol has started
-     * @param qp quorum peer running the protocol
-     */
-    public void onLeaderElectionStarted(QuorumPeer qp);
-    /**
-     * A new leader has been elected.
-     * @param qp quorum peer hosting the leader
-     * @param newLeader the new leader
-     */
-    public void onLeaderStarted(QuorumPeer qp, Leader newLeader);
-    /**
-     * The leader instance is shutting down.
-     * @param qp the quorum peer hosting the leader.
-     * @param leader the leader instance
-     */
-    public void onLeaderShutdown(QuorumPeer qp, Leader leader);
-    /**
-     * A new follower has started.
-     * @param qp the quorum peer instance
-     * @param newFollower the new follower instance
-     */
-    public void onFollowerStarted(QuorumPeer qp, Follower newFollower);
-    /**
-     * The follower is shutting down.
-     * @param qp the quorum peer instance
-     * @param follower the follower instance
-     */
-    public void onFollowerShutdown(QuorumPeer qp, Follower follower);
-}

src/java/jmx/org/apache/zookeeper/server/util/ServerObserver.java

@@ -1,38 +0,0 @@
-/**
- * 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.server.util;
-
-import org.apache.zookeeper.server.ZooKeeperServer;
-
-/**
- * Application must implement this interface and register its instance with
- * the {@link ObserverManager}.
- */
-public interface ServerObserver {
-    /**
-     * The server just started.
-     * @param server the new fully initialized instance of the server
-     */
-    public void onStartup(ZooKeeperServer server);
-    /**
-     * Tne server is about to shutdown.
-     * @param server instance of zookeeper server
-     */
-    public void onShutdown(ZooKeeperServer server);
-}

src/java/jmx/org/apache/zookeeper/server/util/ZooKeeperObserverManager.java

@@ -1,61 +0,0 @@
-/**
- * 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.server.util;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.zookeeper.server.DataTree;
-import org.apache.zookeeper.server.ServerCnxn;
-import org.apache.zookeeper.server.ZooKeeperObserverNotifier;
-import org.apache.zookeeper.server.quorum.QuorumPeer;
-
-/**
- * Zookeeper specific implementation of ObserverManager. It implements a mapping
- * of observer classes to a set of observer instances.
- */
-public class ZooKeeperObserverManager extends ObserverManager {
-
-    private ZooKeeperObserverManager(){}
-    
-    /**
-     * Explicitly set this class as a concrete instance of ObserverManager.
-     */
-    public static void setAsConcrete(){
-        setInstance(new ZooKeeperObserverManager());
-    }
-    
-    protected Set<Object> getObserverList(Object ob){
-        if(ob instanceof ConnectionObserver || ob instanceof ServerCnxn)
-            return connectionObservers;
-        else if(ob instanceof ServerObserver || ob instanceof ZooKeeperObserverNotifier)
-            return serverObservers;
-        else if(ob instanceof QuorumPeerObserver || ob instanceof QuorumPeer)
-            return quorumPeerObservers;
-        else if(ob instanceof DataTreeObserver || ob instanceof DataTree)
-            return dataTreeObservers;
-        assert false;
-        return null;
-    }
-    
-    private Set<Object> serverObservers=new HashSet<Object>();
-    private Set<Object> connectionObservers=new HashSet<Object>();
-    private Set<Object> dataTreeObservers=new HashSet<Object>();
-    private Set<Object> quorumPeerObservers=new HashSet<Object>();
-}

src/java/jmx/org/apache/zookeeper/jmx/CommonNames.java → src/java/main/org/apache/zookeeper/jmx/CommonNames.java

@@ -23,7 +23,7 @@ package org.apache.zookeeper.jmx;
  * TODO: will get rid of it eventually.
  */
 public class CommonNames {
-    public static final String DOMAIN="org.apache.ZookeeperService";
+    public static final String DOMAIN="org.apache.ZooKeeperService";
     public static final String DATA_TREE_KEY="DataTree";
     public static final String STANDALONE_SERVER_KEY="StandaloneServer";
 }

src/java/jmx/org/apache/zookeeper/jmx/MBeanRegistry.java → src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java

@@ -35,9 +35,14 @@ import org.apache.log4j.Logger;
  */
 public class MBeanRegistry {
     private static final Logger LOG = Logger.getLogger(MBeanRegistry.class);
+    
     private static MBeanRegistry instance=new MBeanRegistry(); 
-    private Map<ZKMBeanInfo, String> mapBean2Path = new ConcurrentHashMap<ZKMBeanInfo, String>();
-    private Map<String, ZKMBeanInfo> mapName2Bean = new ConcurrentHashMap<String, ZKMBeanInfo>();
+    
+    private Map<ZKMBeanInfo, String> mapBean2Path =
+        new ConcurrentHashMap<ZKMBeanInfo, String>();
+    
+    private Map<String, ZKMBeanInfo> mapName2Bean =
+        new ConcurrentHashMap<String, ZKMBeanInfo>();
 
     public static MBeanRegistry getInstance(){
         return instance;

src/java/jmx/org/apache/zookeeper/server/ManagedUtil.java → src/java/main/org/apache/zookeeper/jmx/ManagedUtil.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.server;
+package org.apache.zookeeper.jmx;
 
 import java.lang.management.ManagementFactory;
 import java.util.Enumeration;

src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionBean.java → src/java/main/org/apache/zookeeper/server/ConnectionBean.java

@@ -16,17 +16,14 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server;
+package org.apache.zookeeper.server;
 
 import java.util.Arrays;
 import java.util.Date;
 
 import org.apache.log4j.Logger;
-
 import org.apache.zookeeper.jmx.MBeanRegistry;
 import org.apache.zookeeper.jmx.ZKMBeanInfo;
-import org.apache.zookeeper.server.ServerCnxn;
-import org.apache.zookeeper.server.ZooKeeperServer;
 
 /**
  * Implementation of connection MBean interface.
@@ -44,7 +41,7 @@ public class ConnectionBean implements ConnectionMXBean, ZKMBeanInfo {
     }
     
     public String getSessionId() {
-        return Long.toHexString(connection.getSessionId());
+        return "0x" + Long.toHexString(connection.getSessionId());
     }
 
     

src/java/jmx/org/apache/zookeeper/jmx/server/ConnectionMXBean.java → src/java/main/org/apache/zookeeper/server/ConnectionMXBean.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server;
+package org.apache.zookeeper.server;
 
 /**
  * This MBean represents a client connection.

src/java/main/org/apache/zookeeper/server/DataNode.java

@@ -19,15 +19,11 @@
 package org.apache.zookeeper.server;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 
-import org.apache.jute.Index;
 import org.apache.jute.InputArchive;
 import org.apache.jute.OutputArchive;
 import org.apache.jute.Record;
-import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
 import org.apache.zookeeper.data.StatPersisted;
 

src/java/main/org/apache/zookeeper/server/DataTree.java

@@ -44,7 +44,6 @@ import org.apache.zookeeper.ZooDefs.OpCode;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
 import org.apache.zookeeper.data.StatPersisted;
-import org.apache.zookeeper.proto.WatcherEvent;
 import org.apache.zookeeper.txn.CreateTxn;
 import org.apache.zookeeper.txn.DeleteTxn;
 import org.apache.zookeeper.txn.ErrorTxn;
@@ -68,7 +67,8 @@ public class DataTree {
      * This hashtable provides a fast lookup to the datanodes. The tree is the
      * source of truth and is where all the locking occurs
      */
-    private ConcurrentHashMap<String, DataNode> nodes = new ConcurrentHashMap<String, DataNode>();
+    private ConcurrentHashMap<String, DataNode> nodes =
+        new ConcurrentHashMap<String, DataNode>();
 
     private WatchManager dataWatches = new WatchManager();
 
@@ -212,6 +212,19 @@ public class DataTree {
         return dataWatches.size()+childWatches.size();
     }
 
+    /**
+     * Get the size of the nodes based on path and data length.
+     * @return size of the data
+     */
+    public long approximateDataSize() {
+        long result = 0;
+        for (Map.Entry<String, DataNode> entry : nodes.entrySet()) {
+            result += entry.getKey().length();
+            result += entry.getValue().data.length;
+        }
+        return result;
+    }
+    
     /**
      * This is a pointer to the root of the DataTree. It is the source of truth,
      * but we usually use the nodes hashmap to find nodes in the tree.

src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeBean.java → src/java/main/org/apache/zookeeper/server/DataTreeBean.java

@@ -16,59 +16,41 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server;
+package org.apache.zookeeper.server;
+
+import java.util.HashSet;
+import java.util.Map;
 
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.jmx.ZKMBeanInfo;
+import org.apache.zookeeper.server.DataTree;
 
 /**
  * This class implements the data tree MBean.
  */
 public class DataTreeBean implements DataTreeMXBean, ZKMBeanInfo {
-    private static final Logger LOG = Logger.getLogger(DataTreeBean.class);
-
-    org.apache.zookeeper.server.DataTree dataTree;
+    DataTree dataTree;
     
-    public DataTreeBean(){
-    }
-
     public DataTreeBean(org.apache.zookeeper.server.DataTree dataTree){
-        this.dataTree=dataTree;
+        this.dataTree = dataTree;
     }
     
     public int getNodeCount() {
         return dataTree.getNodeCount();
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.zookeeper.jmx.server.DataTreeMBean#getDataSize()
-     */
-    //TODO: it's useful info but can be expensive to get
-    public long getDataSize() {
-      /*  We need a more efficient way to do this
-        ByteArrayOutputStream stream=new ByteArrayOutputStream();
-        BinaryOutputArchive oa = BinaryOutputArchive.getArchive(stream);
-        try {
-            dataTree.serialize(oa, "tree");
-        } catch (Exception e) {
-            LOG.warn("Failed to get data tree size: "+e.getMessage());            
-        }
-        return stream.size();
-      */
-        LOG.warn("Not Implemented");            
-        return -1;
+    public long approximateDataSize() {
+        return dataTree.approximateDataSize();
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.zookeeper.jmx.server.DataTreeMBean#getEphemeralCount()
-     */
-    public int getEphemeralCount() {
-        return dataTree.getSessions().size();
+    public int countEphemerals() {
+        Map<Long, HashSet<String>> map = dataTree.getEphemeralsMap();
+        int result = 0;
+        for (HashSet<String> set : map.values()) {
+            result += set.size();
+        }
+        return result;
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.zookeeper.jmx.server.DataTreeMBean#getWatchCount()
-     */
     public int getWatchCount() {
         return dataTree.getWatchCount();
     }
@@ -81,8 +63,8 @@ public class DataTreeBean implements DataTreeMXBean, ZKMBeanInfo {
         return false;
     }
 
-    public long getLastZxid() {
-        return dataTree.lastProcessedZxid;
+    public String getLastZxid() {
+        return "0x" + Long.toHexString(dataTree.lastProcessedZxid);
     }
 
 }

src/java/jmx/org/apache/zookeeper/jmx/server/DataTreeMXBean.java → src/java/main/org/apache/zookeeper/server/DataTreeMXBean.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server;
+package org.apache.zookeeper.server;
 
 /**
  * Zookeeper data tree MBean.
@@ -26,21 +26,22 @@ public interface DataTreeMXBean {
      * @return number of znodes in the data tree.
      */
     public int getNodeCount();
-    /**
-     * @return data tree size in bytes. The size includes the znode path and 
-     * its value.
-     */
-    public long getDataSize();
     /**
      * @return the most recent zxid processed by the data tree.
      */
-    public long getLastZxid();
+    public String getLastZxid();
     /**
      * @return number of watches set.
      */
     public int getWatchCount();
+    
+    /**
+     * @return data tree size in bytes. The size includes the znode path and 
+     * its value.
+     */
+    public long approximateDataSize();
     /**
      * @return number of ephemeral nodes in the data tree
      */
-    public int getEphemeralCount();
+    public int countEphemerals();
 }

src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java

@@ -251,7 +251,7 @@ public class FinalRequestProcessor implements RequestProcessor {
         }
         ReplyHeader hdr =
             new ReplyHeader(request.cxid, request.zxid, err.intValue());
-        ServerStats.getInstance().updateLatency(request.createTime);
+        zks.serverStats().updateLatency(request.createTime);
         try {
             request.cnxn.sendResponse(hdr, rsp, "response");
         } catch (IOException e) {

src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java

@@ -50,6 +50,7 @@ import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooDefs.OpCode;
 import org.apache.zookeeper.data.Id;
+import org.apache.zookeeper.jmx.MBeanRegistry;
 import org.apache.zookeeper.proto.AuthPacket;
 import org.apache.zookeeper.proto.ConnectRequest;
 import org.apache.zookeeper.proto.ConnectResponse;
@@ -66,6 +67,8 @@ import org.apache.zookeeper.server.auth.ProviderRegistry;
 public class NIOServerCnxn implements Watcher, ServerCnxn {
     private static final Logger LOG = Logger.getLogger(NIOServerCnxn.class);
 
+    private ConnectionBean jmxConnectionBean;
+
     static public class Factory extends Thread {
         ZooKeeperServer zks;
 
@@ -113,7 +116,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
         public ZooKeeperServer getZooKeeperServer() {
             return this.zks;
         }
- 
+
         public InetSocketAddress getLocalAddress(){
             return (InetSocketAddress)ss.socket().getLocalSocketAddress();
         }
@@ -294,13 +297,13 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                         readLength(k);
                     } else if (!initialized) {
                         stats.packetsReceived++;
-                        ServerStats.getInstance().incrementPacketsReceived();
+                        zk.serverStats().incrementPacketsReceived();
                         readConnectRequest();
                         lenBuffer.clear();
                         incomingBuffer = lenBuffer;
                     } else {
                         stats.packetsReceived++;
-                        ServerStats.getInstance().incrementPacketsReceived();
+                        zk.serverStats().incrementPacketsReceived();
                         readRequest();
                         lenBuffer.clear();
                         incomingBuffer = lenBuffer;
@@ -378,7 +381,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                         stats.packetsSent++;
                         /* We've sent the whole buffer, so drop the buffer */
                         sent -= bb.remaining();
-                        ServerStats.getInstance().incrementPacketsSent();
+                        zk.serverStats().incrementPacketsSent();
                         outgoingBuffers.remove();
                     }
                     // ZooLog.logTraceMessage(LOG,
@@ -423,7 +426,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
             String scheme = authPacket.getScheme();
             AuthenticationProvider ap = ProviderRegistry.getProvider(scheme);
             if (ap == null
-                    || (ap.handleAuthentication(this, authPacket.getAuth()) 
+                    || (ap.handleAuthentication(this, authPacket.getAuth())
                             != KeeperException.Code.OK)) {
                 if (ap == null)
                     LOG.error("No authentication provider for scheme: "
@@ -526,7 +529,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
             // We take advantage of the limited size of the length to look
             // for cmds. They are all 4-bytes which fits inside of an int
             if (len == ruokCmd) {
-                LOG.info("Processing ruok command from " 
+                LOG.info("Processing ruok command from "
                         + sock.socket().getRemoteSocketAddress());
 
                 sendBuffer(imok.duplicate());
@@ -534,11 +537,11 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                 k.interestOps(SelectionKey.OP_WRITE);
                 return;
             } else if (len == killCmd) {
-                LOG.info("Processing kill command from " 
+                LOG.info("Processing kill command from "
                         + sock.socket().getRemoteSocketAddress());
                 System.exit(0);
             } else if (len == getTraceMaskCmd) {
-                LOG.info("Processing getracemask command from " 
+                LOG.info("Processing getracemask command from "
                         + sock.socket().getRemoteSocketAddress());
                 long traceMask = ZooTrace.getTextTraceLevel();
                 ByteBuffer resp = ByteBuffer.allocate(8);
@@ -549,7 +552,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                 k.interestOps(SelectionKey.OP_WRITE);
                 return;
             } else if (len == setTraceMaskCmd) {
-                LOG.info("Processing settracemask command from " 
+                LOG.info("Processing settracemask command from "
                         + sock.socket().getRemoteSocketAddress());
                 incomingBuffer = ByteBuffer.allocate(8);
 
@@ -569,7 +572,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                 k.interestOps(SelectionKey.OP_WRITE);
                 return;
             } else if (len == dumpCmd) {
-                LOG.info("Processing dump command from " 
+                LOG.info("Processing dump command from "
                         + sock.socket().getRemoteSocketAddress());
                 if (zk == null) {
                     sendBuffer(ByteBuffer.wrap("ZooKeeper not active \n"
@@ -585,7 +588,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                 k.interestOps(SelectionKey.OP_WRITE);
                 return;
             } else if (len == reqsCmd) {
-                LOG.info("Processing reqs command from " 
+                LOG.info("Processing reqs command from "
                         + sock.socket().getRemoteSocketAddress());
                 StringBuffer sb = new StringBuffer();
                 sb.append("Requests:\n");
@@ -599,7 +602,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                 k.interestOps(SelectionKey.OP_WRITE);
                 return;
             } else if (len == statCmd) {
-                LOG.info("Processing stat command from " 
+                LOG.info("Processing stat command from "
                         + sock.socket().getRemoteSocketAddress());
                 StringBuffer sb = new StringBuffer();
                 if(zk!=null){
@@ -612,7 +615,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                         }
                     }
                     sb.append("\n");
-                    sb.append(ServerStats.getInstance().toString());
+                    sb.append(zk.serverStats().toString());
                     sb.append("Node count: ").append(zk.dataTree.getNodeCount()).
                         append("\n");
                 }else
@@ -622,12 +625,12 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                 k.interestOps(SelectionKey.OP_WRITE);
                 return;
             } else if (len == enviCmd) {
-                LOG.info("Processing envi command from " 
+                LOG.info("Processing envi command from "
                         + sock.socket().getRemoteSocketAddress());
                 StringBuffer sb = new StringBuffer();
-                
+
                 List<Environment.Entry> env = Environment.list();
-                
+
                 sb.append("Environment:\n");
                 for(Environment.Entry e : env) {
                     sb.append(e.getKey()).append("=").append(e.getValue())
@@ -638,10 +641,9 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
                 k.interestOps(SelectionKey.OP_WRITE);
                 return;
             } else if (len == srstCmd) {
-                LOG.info("Processing srst command from " 
+                LOG.info("Processing srst command from "
                         + sock.socket().getRemoteSocketAddress());
-                ServerStats stats = ServerStats.getInstance();
-                stats.reset();
+                zk.serverStats().reset();
 
                 sendBuffer(ByteBuffer.wrap("Stats reset.\n".getBytes()));
                 k.interestOps(SelectionKey.OP_WRITE);
@@ -707,6 +709,16 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
      * @see org.apache.zookeeper.server.ServerCnxnIface#close()
      */
     public void close() {
+        // unregister from JMX
+        try {
+            if(jmxConnectionBean != null){
+                MBeanRegistry.getInstance().unregister(jmxConnectionBean);
+            }
+        } catch (Exception e) {
+            LOG.warn("Failed to unregister with JMX", e);
+        }
+        jmxConnectionBean = null;
+
         if (closed) {
             return;
         }
@@ -812,16 +824,24 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
         ReplyHeader h = new ReplyHeader(-1, -1L, 0);
         ZooTrace.logTraceMessage(LOG, ZooTrace.EVENT_DELIVERY_TRACE_MASK,
                                  "Deliver event " + event + " to 0x"
-                                 + Long.toHexString(this.sessionId) 
+                                 + Long.toHexString(this.sessionId)
                                  + " through " + this);
 
         // Convert WatchedEvent to a type that can be sent over the wire
         WatcherEvent e = event.getWrapper();
-        
+
         sendResponse(h, e, "notification");
     }
 
     public void finishSessionInit(boolean valid) {
+        // register with JMX
+        try {
+            jmxConnectionBean = new ConnectionBean(this, zk);
+            MBeanRegistry.getInstance().register(jmxConnectionBean, zk.jmxServerBean);
+        } catch (Exception e) {
+            LOG.warn("Failed to register with JMX", e);
+        }
+
         try {
             ConnectResponse rsp = new ConnectResponse(0, valid ? sessionTimeout
                     : 0, valid ? sessionId : 0, // send 0 if session is no
@@ -850,7 +870,7 @@ public class NIOServerCnxn implements Watcher, ServerCnxn {
             close();
         }
     }
-
+    
     /*
      * (non-Javadoc)
      *

src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java

@@ -27,14 +27,13 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 import org.apache.jute.Record;
 import org.apache.log4j.Logger;
+import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException.Code;
 import org.apache.zookeeper.ZooDefs.OpCode;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Id;
-import org.apache.zookeeper.data.Stat;
 import org.apache.zookeeper.data.StatPersisted;
 import org.apache.zookeeper.proto.CreateRequest;
 import org.apache.zookeeper.proto.DeleteRequest;

src/java/main/org/apache/zookeeper/server/ServerCnxn.java

@@ -24,11 +24,10 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
 import org.apache.jute.Record;
-import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.WatchedEvent;
+import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.data.Id;
 import org.apache.zookeeper.proto.ReplyHeader;
-import org.apache.zookeeper.proto.WatcherEvent;
 
 public interface ServerCnxn extends Watcher {
     

src/java/main/org/apache/zookeeper/server/ServerStats.java

@@ -19,47 +19,37 @@
 package org.apache.zookeeper.server;
 
 
+/**
+ * Basic Server Statistics
+ */
 public class ServerStats {
-    private static ServerStats instance=null;
     private long packetsSent;
     private long packetsReceived;
     private long maxLatency;
     private long minLatency = Long.MAX_VALUE;
     private long totalLatency = 0;
     private long count = 0;
-    
-    public interface Provider{
+
+    private final Provider provider;
+
+    public interface Provider {
         public long getOutstandingRequests();
         public long getLastProcessedZxid();
     }
-    private Provider provider=null;
-    private Object mutex=new Object();
     
-    static public ServerStats getInstance(){
-        return instance;
-    }
-    static public void registerAsConcrete() {
-        setInstance(new ServerStats());
-    }
-    static synchronized public void unregister() {
-        instance=null;
-    }
-    static synchronized protected void setInstance(ServerStats newInstance){
-        assert instance==null;
-        instance = newInstance;
-    }
-    protected ServerStats() {
-        // protected constructor
+    public ServerStats(Provider provider) {
+        this.provider = provider;
     }
     
     // getters
     synchronized public long getMinLatency() {
-        return (minLatency == Long.MAX_VALUE) ? 0 : minLatency;
+        return minLatency == Long.MAX_VALUE ? 0 : minLatency;
     }
 
     synchronized public long getAvgLatency() {
-        if(count!=0)
+        if (count != 0) {
             return totalLatency / count;
+        }
         return 0;
     }
 
@@ -68,15 +58,13 @@ public class ServerStats {
     }
 
     public long getOutstandingRequests() {
-        synchronized(mutex){
-            return (provider!=null)?provider.getOutstandingRequests():-1;
-        }
+        return provider.getOutstandingRequests();
     }
+    
     public long getLastProcessedZxid(){
-        synchronized(mutex){
-            return (provider!=null)?provider.getLastProcessedZxid():-1;
-        }
+        return provider.getLastProcessedZxid();
     }
+    
     synchronized public long getPacketsReceived() {
         return packetsReceived;
     }
@@ -85,7 +73,7 @@ public class ServerStats {
         return packetsSent;
     }
 
-    public String getServerState(){
+    public String getServerState() {
         return "standalone";
     }
     
@@ -100,15 +88,10 @@ public class ServerStats {
             sb.append("Outstanding: " + getOutstandingRequests() + "\n");
             sb.append("Zxid: 0x"+ Long.toHexString(getLastProcessedZxid())+ "\n");
         }
-        sb.append("Mode: "+getServerState()+"\n");
+        sb.append("Mode: " + getServerState() + "\n");
         return sb.toString();
     }
     // mutators
-    public void setStatsProvider(Provider zk){
-        synchronized(mutex){
-            provider=zk;
-        }
-    }
     synchronized void updateLatency(long requestCreateTime) {
         long latency = System.currentTimeMillis() - requestCreateTime;
         totalLatency += latency;
@@ -121,11 +104,13 @@ public class ServerStats {
         }
     }
     synchronized public void resetLatency(){
-        totalLatency=count=maxLatency=0;
-        minLatency=Long.MAX_VALUE;
+        totalLatency = 0;
+        count = 0;
+        maxLatency = 0;
+        minLatency = Long.MAX_VALUE;
     }
     synchronized public void resetMaxLatency(){
-        maxLatency=getMinLatency();
+        maxLatency = getMinLatency();
     }
     synchronized public void incrementPacketsReceived() {
         packetsReceived++;
@@ -134,7 +119,8 @@ public class ServerStats {
         packetsSent++;
     }
     synchronized public void resetRequestCounters(){
-        packetsReceived=packetsSent=0;
+        packetsReceived = 0;
+        packetsSent = 0;
     }
     
     synchronized public void reset() {

src/java/main/org/apache/zookeeper/server/WatchManager.java

@@ -23,12 +23,10 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
-
+import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.EventType;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.proto.WatcherEvent;
 
 /**
  * This class manages watches. It allows watches to be associated with a string

src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java

@@ -41,6 +41,7 @@ import org.apache.zookeeper.ZooDefs.OpCode;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Id;
 import org.apache.zookeeper.data.StatPersisted;
+import org.apache.zookeeper.jmx.MBeanRegistry;
 import org.apache.zookeeper.proto.RequestHeader;
 import org.apache.zookeeper.server.SessionTracker.SessionExpirer;
 import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
@@ -57,7 +58,7 @@ import org.apache.zookeeper.txn.TxnHeader;
  * PrepRequestProcessor -> SyncRequestProcessor -> FinalRequestProcessor
  */
 public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
-    private static final Logger LOG;
+    protected static final Logger LOG;
     
     static {
         LOG = Logger.getLogger(ZooKeeperServer.class);
@@ -65,8 +66,11 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
         Environment.logEnv("Server environment:", LOG);
     }
 
+    protected ZooKeeperServerBean jmxServerBean;
+    protected DataTreeBean jmxDataTreeBean;
+
     /**
-     * Create an instance of Zookeeper server
+     * Create an instance of ZooKeeper server
      */
     static public interface Factory {
         public ZooKeeperServer createServer() throws IOException;
@@ -105,20 +109,23 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
     protected RequestProcessor firstProcessor;
     LinkedBlockingQueue<Long> sessionsToDie = new LinkedBlockingQueue<Long>();
     protected volatile boolean running;
+
     /**
      * This is the secret that we use to generate passwords, for the moment it
      * is more of a sanity check.
      */
     final private long superSecret = 0XB3415C00L;
+
     int requestsInProcess;
     List<ChangeRecord> outstandingChanges = new ArrayList<ChangeRecord>();
     private NIOServerCnxn.Factory serverCnxnFactory;
     private int clientPort;
-    
+
+    private final ServerStats serverStats;
+
     void removeCnxn(ServerCnxn cnxn) {
         dataTree.removeCnxn(cnxn);
     }
-
  
     /**
      * Creates a ZooKeeperServer instance. Nothing is setup, use the setX
@@ -128,10 +135,9 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
      * @throws IOException
      */
     public ZooKeeperServer() {
-        ServerStats.getInstance().setStatsProvider(this);
+        serverStats = new ServerStats(this);
         treeBuilder = new BasicDataTreeBuilder();
     }
-
     
     /**
      * Creates a ZooKeeperServer instance. It sets everything up, but doesn't
@@ -142,14 +148,19 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
      */
     public ZooKeeperServer(FileTxnSnapLog txnLogFactory, int tickTime,
             DataTreeBuilder treeBuilder) throws IOException {
-        this.txnLogFactory=txnLogFactory;
-        this.tickTime = tickTime;
+        serverStats = new ServerStats(this);
         this.treeBuilder = treeBuilder;
-        ServerStats.getInstance().setStatsProvider(this);
+
+        this.txnLogFactory = txnLogFactory;
+        this.tickTime = tickTime;
         
         LOG.info("Created server");
     }
 
+    public ServerStats serverStats() {
+        return serverStats;
+    }
+    
     /**
      * This constructor is for backward compatibility with the existing unit
      * test code.
@@ -324,12 +335,27 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
         }
     }
 
+    protected void registerJMX() {
+        // register with JMX
+        try {
+            jmxServerBean = new ZooKeeperServerBean(this);
+            MBeanRegistry.getInstance().register(jmxServerBean, null);
+            jmxDataTreeBean = new DataTreeBean(dataTree);
+            MBeanRegistry.getInstance().register(jmxDataTreeBean, jmxServerBean);
+        } catch (Exception e) {
+            LOG.warn("Failed to register with JMX", e);
+        }
+    }
+    
     public void startup() throws IOException, InterruptedException {
         if (dataTree == null) {
             loadData();
         }
         createSessionTracker();
         setupRequestProcessors();
+
+        registerJMX();
+
         synchronized (this) {
             running = true;
             notifyAll();
@@ -367,6 +393,24 @@ public class ZooKeeperServer implements SessionExpirer, ServerStats.Provider {
         if (dataTree != null) {
             dataTree.clear();
         }
+
+        unregisterJMX();
+    }
+
+    protected void unregisterJMX() {
+        // unregister from JMX
+        try {
+            if (jmxDataTreeBean != null) {
+                MBeanRegistry.getInstance().unregister(jmxDataTreeBean);
+            }
+            if (jmxServerBean != null) {
+                MBeanRegistry.getInstance().unregister(jmxServerBean);
+            }
+        } catch (Exception e) {
+            LOG.warn("Failed to unregister with JMX", e);
+        }
+        jmxServerBean = null;
+        jmxDataTreeBean = null;
     }
 
     synchronized public void incInProcess() {

src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerBean.java → src/java/main/org/apache/zookeeper/server/ZooKeeperServerBean.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server;
+package org.apache.zookeeper.server;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -28,23 +28,21 @@ import org.apache.zookeeper.server.ServerStats;
 import org.apache.zookeeper.server.ZooKeeperServer;
 
 /**
- * This class implements the zookeeper server MBean interface.
+ * This class implements the ZooKeeper server MBean interface.
  */
 public class ZooKeeperServerBean implements ZooKeeperServerMXBean, ZKMBeanInfo {
-    private Date startTime=new Date();
-    private ZooKeeperServer zooKeeperServer;
+    private final Date startTime;
+    private final String name;
     
-    public ZooKeeperServerBean() {        
-    }
-    public ZooKeeperServerBean(ZooKeeperServer zooKeeperServer) {
-        this.zooKeeperServer = zooKeeperServer;
+    protected final ZooKeeperServer zks;
+    
+    public ZooKeeperServerBean(ZooKeeperServer zks) {
+        startTime = new Date();
+        this.zks = zks;
+        name = "StandaloneServer_port" + zks.getClientPort();
     }
-
+    
     public String getClientPort() {
-        ZooKeeperServer zks = getZooKeeperServer();
-        if( zks == null ) {
-            return null;
-        }
         try {
             return InetAddress.getLocalHost().getHostAddress() + ":"
                     + zks.getClientPort();
@@ -54,7 +52,7 @@ public class ZooKeeperServerBean implements ZooKeeperServerMXBean, ZKMBeanInfo {
     }
     
     public String getName() {
-        return "StandaloneServer";
+        return name;
     }
     
     public boolean isHidden() {
@@ -70,48 +68,49 @@ public class ZooKeeperServerBean implements ZooKeeperServerMXBean, ZKMBeanInfo {
     }
     
     public long getAvgRequestLatency() {
-        return ServerStats.getInstance().getAvgLatency();
+        return zks.serverStats().getAvgLatency();
     }
     
     public long getMaxRequestLatency() {
-        return ServerStats.getInstance().getMaxLatency();
+        return zks.serverStats().getMaxLatency();
     }
     
     public long getMinRequestLatency() {
-        return ServerStats.getInstance().getMinLatency();
+        return zks.serverStats().getMinLatency();
     }
     
     public long getOutstandingRequests() {
-        return ServerStats.getInstance().getOutstandingRequests();
+        return zks.serverStats().getOutstandingRequests();
+    }
+
+    public int getTickTime() {
+        return zks.getTickTime();
     }
+
+    public void setTickTime(int tickTime) {
+        zks.setTickTime(tickTime);
+    }
+
     
     public long getPacketsReceived() {
-        return ServerStats.getInstance().getPacketsReceived();
+        return zks.serverStats().getPacketsReceived();
     }
     
     public long getPacketsSent() {
-        return ServerStats.getInstance().getPacketsSent();
+        return zks.serverStats().getPacketsSent();
     }
     
     public void resetLatency() {
-        ServerStats.getInstance().resetLatency();
+        zks.serverStats().resetLatency();
     }
     
     public void resetMaxLatency() {
-        ServerStats.getInstance().resetMaxLatency();
+        zks.serverStats().resetMaxLatency();
     }
 
     public void resetStatistics() {
-        ServerStats.getInstance().resetRequestCounters();
-        ServerStats.getInstance().resetLatency();
-    }
-
-    public ZooKeeperServer getZooKeeperServer() {
-        return zooKeeperServer;
+        ServerStats serverStats = zks.serverStats();
+        serverStats.resetRequestCounters();
+        serverStats.resetLatency();
     }
-
-    public void setZooKeeperServer(ZooKeeperServer zooKeeperServer) {
-        this.zooKeeperServer = zooKeeperServer;
-    }
-
 }

src/java/jmx/org/apache/zookeeper/jmx/server/ZooKeeperServerMXBean.java → src/java/main/org/apache/zookeeper/server/ZooKeeperServerMXBean.java

@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server;
+package org.apache.zookeeper.server;
 
 /**
- * Zookeeper server MBean.
+ * ZooKeeper server MBean.
  */
 public interface ZooKeeperServerMXBean {
     /**
@@ -58,7 +58,15 @@ public interface ZooKeeperServerMXBean {
      * @return number of outstanding requests.
      */
     public long getOutstandingRequests();
-    
+    /**
+     * Current TickTime of server
+     */
+    public int getTickTime();
+    /**
+     * Set TickTime of server
+     */
+    public void setTickTime(int tickTime);
+
     /**
      * Reset packet and latency statistics 
      */

src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java

@@ -21,9 +21,11 @@ package org.apache.zookeeper.server;
 import java.io.File;
 import java.io.IOException;
 
+import javax.management.JMException;
+
 import org.apache.log4j.Logger;
+import org.apache.zookeeper.jmx.ManagedUtil;
 import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
-import org.apache.zookeeper.server.ZooKeeperServer.BasicDataTreeBuilder;
 
 /**
  * This class starts and runs a standalone ZooKeeperServer.
@@ -38,6 +40,12 @@ public class ZooKeeperServerMain {
      * @param args the port and data directory
      */
     public static void main(String[] args) {
+        try {
+            ManagedUtil.registerLog4jMBeans();
+        } catch (JMException e) {
+            LOG.warn("Unable to register log4j JMX control", e);
+        }
+
         try {
             ServerConfig.parse(args);
         } catch(Exception e) {
@@ -64,17 +72,17 @@ public class ZooKeeperServerMain {
         });
     }
 
-    public static void runStandalone(ZooKeeperServer.Factory factory) {
+    public static void runStandalone(ZooKeeperServer.Factory serverFactory) {
         try {
             // Note that this thread isn't going to be doing anything else,
             // so rather than spawning another thread, we will just call
             // run() in this thread.
-            ServerStats.registerAsConcrete();
-            ZooKeeperServer zk = factory.createServer();
+            ZooKeeperServer zk = serverFactory.createServer();
             zk.startup();
-            NIOServerCnxn.Factory t = factory.createConnectionFactory();
-            t.setZooKeeperServer(zk);
-            t.join();
+            NIOServerCnxn.Factory cnxnFactory =
+                serverFactory.createConnectionFactory();
+            cnxnFactory.setZooKeeperServer(zk);
+            cnxnFactory.join();
             if (zk.isRunning()) {
                 zk.shutdown();
             }

src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java

@@ -26,7 +26,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.apache.jute.Record;
 import org.apache.log4j.Logger;
 import org.apache.zookeeper.ZooDefs.OpCode;
-import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.server.DataTree;
 import org.apache.zookeeper.server.Request;
 import org.apache.zookeeper.server.ZooTrace;

src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java

@@ -19,7 +19,6 @@
 
 package org.apache.zookeeper.server.quorum;
 
-import java.net.InetAddress;
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.HashMap;

src/java/main/org/apache/zookeeper/server/quorum/Follower.java

@@ -60,6 +60,16 @@ public class Follower {
         this.zk=zk;
     }
 
+    @Override
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("Follower ").append(sock);
+        sb.append(" lastQueuedZxid:").append(lastQueued);
+        sb.append(" pendingRevalidationCount:")
+            .append(pendingRevalidations.size());
+        return sb.toString();
+    }
+
     private InputArchive leaderIs;
 
     private OutputArchive leaderOs;
@@ -111,182 +121,193 @@ public class Follower {
      * @throws InterruptedException
      */
     void followLeader() throws InterruptedException {
-        InetSocketAddress addr = null;
-        // Find the leader by id
-        Vote current = self.getCurrentVote();
-        for (QuorumServer s : self.quorumPeers.values()) {
-            if (s.id == current.id) {
-                addr = s.addr;
-                break;
-            }
-        }
-        if (addr == null) {
-            LOG.warn("Couldn't find the leader with id = "
-                    + current.id);
-        }
-        LOG.info("Following " + addr);
-        sock = new Socket();
+        zk.registerJMX(new FollowerBean(this, zk), self.jmxLocalPeerBean);
+
         try {
-            QuorumPacket ack = new QuorumPacket(Leader.ACK, 0, null, null);
-            sock.setSoTimeout(self.tickTime * self.initLimit);
-            for (int tries = 0; tries < 5; tries++) {
-                try {
-                    //sock = new Socket();
-                    //sock.setSoTimeout(self.tickTime * self.initLimit);
-                    sock.connect(addr, self.tickTime * self.syncLimit);
-                    sock.setTcpNoDelay(true);
+            InetSocketAddress addr = null;
+            // Find the leader by id
+            Vote current = self.getCurrentVote();
+            for (QuorumServer s : self.quorumPeers.values()) {
+                if (s.id == current.id) {
+                    addr = s.addr;
                     break;
-                } catch (ConnectException e) {
-                    if (tries == 4) {
-                        LOG.error("Unexpected exception",e);
-                        throw e;
-                    } else {
-                        LOG.warn("Unexpected exception",e);
-                        sock = new Socket();
-                        sock.setSoTimeout(self.tickTime * self.initLimit);
-                    }
                 }
-                Thread.sleep(1000);
             }
-            leaderIs = BinaryInputArchive.getArchive(new BufferedInputStream(
-                    sock.getInputStream()));
-            bufferedOutput = new BufferedOutputStream(sock.getOutputStream());
-            leaderOs = BinaryOutputArchive.getArchive(bufferedOutput);
-            QuorumPacket qp = new QuorumPacket();
-            qp.setType(Leader.LASTZXID);
-            long sentLastZxid = self.getLastLoggedZxid();
-            qp.setZxid(sentLastZxid);
-            writePacket(qp);
-            readPacket(qp);
-            long newLeaderZxid = qp.getZxid();
-
-            if (qp.getType() != Leader.NEWLEADER) {
-                LOG.error("First packet should have been NEWLEADER");
-                throw new IOException("First packet should have been NEWLEADER");
+            if (addr == null) {
+                LOG.warn("Couldn't find the leader with id = "
+                        + current.id);
             }
-            readPacket(qp);
-            synchronized (zk) {
-                if (qp.getType() == Leader.DIFF) {
-                    LOG.info("Getting a diff from the leader!");
-                    zk.loadData();
-                }
-                else if (qp.getType() == Leader.SNAP) {
-                    LOG.info("Getting a snapshot from leader");
-                    // The leader is going to dump the database
-                    zk.deserializeSnapshot(leaderIs);
-                    String signature = leaderIs.readString("signature");
-                    if (!signature.equals("BenWasHere")) {
-                        LOG.error("Missing signature. Got " + signature);
-                        throw new IOException("Missing signature");
-                    }
-                } else if (qp.getType() == Leader.TRUNC) {
-                    //we need to truncate the log to the lastzxid of the leader
-                    LOG.warn("Truncating log to get in sync with the leader 0x"
-                            + Long.toHexString(qp.getZxid()));
-                    boolean truncated=zk.getLogWriter().truncateLog(qp.getZxid());
-                    if (!truncated) {
-                        // not able to truncate the log
-                        LOG.error("Not able to truncate the log "
-                                + Long.toHexString(qp.getZxid()));
-                        System.exit(13);
+            LOG.info("Following " + addr);
+            sock = new Socket();
+            try {
+                QuorumPacket ack = new QuorumPacket(Leader.ACK, 0, null, null);
+                sock.setSoTimeout(self.tickTime * self.initLimit);
+                for (int tries = 0; tries < 5; tries++) {
+                    try {
+                        //sock = new Socket();
+                        //sock.setSoTimeout(self.tickTime * self.initLimit);
+                        sock.connect(addr, self.tickTime * self.syncLimit);
+                        sock.setTcpNoDelay(true);
+                        break;
+                    } catch (ConnectException e) {
+                        if (tries == 4) {
+                            LOG.error("Unexpected exception",e);
+                            throw e;
+                        } else {
+                            LOG.warn("Unexpected exception",e);
+                            sock = new Socket();
+                            sock.setSoTimeout(self.tickTime * self.initLimit);
+                        }
                     }
-
-                    zk.loadData();
+                    Thread.sleep(1000);
                 }
-                else {
-                    LOG.error("Got unexpected packet from leader "
-                            + qp.getType() + " exiting ... " );
-                    System.exit(13);
+                leaderIs = BinaryInputArchive.getArchive(new BufferedInputStream(
+                        sock.getInputStream()));
+                bufferedOutput = new BufferedOutputStream(sock.getOutputStream());
+                leaderOs = BinaryOutputArchive.getArchive(bufferedOutput);
+                QuorumPacket qp = new QuorumPacket();
+                qp.setType(Leader.LASTZXID);
+                long sentLastZxid = self.getLastLoggedZxid();
+                qp.setZxid(sentLastZxid);
+                writePacket(qp);
+                readPacket(qp);
+                long newLeaderZxid = qp.getZxid();
+    
+                if (qp.getType() != Leader.NEWLEADER) {
+                    LOG.error("First packet should have been NEWLEADER");
+                    throw new IOException("First packet should have been NEWLEADER");
                 }
-                zk.dataTree.lastProcessedZxid = newLeaderZxid;
-            }
-            ack.setZxid(newLeaderZxid & ~0xffffffffL);
-            writePacket(ack);
-            sock.setSoTimeout(self.tickTime * self.syncLimit);
-            zk.startup();
-            while (self.running) {
                 readPacket(qp);
-                switch (qp.getType()) {
-                case Leader.PING:
-                    // Send back the ping with our session data
-                    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                    DataOutputStream dos = new DataOutputStream(bos);
-                    HashMap<Long, Integer> touchTable = zk
-                            .getTouchSnapshot();
-                    for (Entry<Long, Integer> entry : touchTable.entrySet()) {
-                        dos.writeLong(entry.getKey());
-                        dos.writeInt(entry.getValue());
+                synchronized (zk) {
+                    if (qp.getType() == Leader.DIFF) {
+                        LOG.info("Getting a diff from the leader!");
+                        zk.loadData();
                     }
-                    qp.setData(bos.toByteArray());
-                    writePacket(qp);
-                    break;
-                case Leader.PROPOSAL:
-                    TxnHeader hdr = new TxnHeader();
-                    BinaryInputArchive ia = BinaryInputArchive
-                            .getArchive(new ByteArrayInputStream(qp.getData()));
-                    Record txn = SerializeUtils.deserializeTxn(ia, hdr);
-                    if (hdr.getZxid() != lastQueued + 1) {
-                        LOG.warn("Got zxid 0x"
-                                + Long.toHexString(hdr.getZxid())
-                                + " expected 0x"
-                                + Long.toHexString(lastQueued + 1));
+                    else if (qp.getType() == Leader.SNAP) {
+                        LOG.info("Getting a snapshot from leader");
+                        // The leader is going to dump the database
+                        zk.deserializeSnapshot(leaderIs);
+                        String signature = leaderIs.readString("signature");
+                        if (!signature.equals("BenWasHere")) {
+                            LOG.error("Missing signature. Got " + signature);
+                            throw new IOException("Missing signature");
+                        }
+                    } else if (qp.getType() == Leader.TRUNC) {
+                        //we need to truncate the log to the lastzxid of the leader
+                        LOG.warn("Truncating log to get in sync with the leader 0x"
+                                + Long.toHexString(qp.getZxid()));
+                        boolean truncated=zk.getLogWriter().truncateLog(qp.getZxid());
+                        if (!truncated) {
+                            // not able to truncate the log
+                            LOG.error("Not able to truncate the log "
+                                    + Long.toHexString(qp.getZxid()));
+                            System.exit(13);
+                        }
+    
+                        zk.loadData();
                     }
-                    lastQueued = hdr.getZxid();
-                    zk.logRequest(hdr, txn);
-                    break;
-                case Leader.COMMIT:
-                    zk.commit(qp.getZxid());
-                    break;
-                case Leader.UPTODATE:
-                    zk.takeSnapshot();
-                    self.cnxnFactory.setZooKeeperServer(zk);
-                    break;
-                case Leader.REVALIDATE:
-                    ByteArrayInputStream bis = new ByteArrayInputStream(qp
-                            .getData());
-                    DataInputStream dis = new DataInputStream(bis);
-                    long sessionId = dis.readLong();
-                    boolean valid = dis.readBoolean();
-                    synchronized (pendingRevalidations) {
-                        ServerCnxn cnxn = pendingRevalidations
-                                .remove(sessionId);
-                        if (cnxn == null) {
-                            LOG.warn("Missing session 0x"
-                                    + Long.toHexString(sessionId)
-                                    + " for validation");
-                        } else {
-                            cnxn.finishSessionInit(valid);
+                    else {
+                        LOG.error("Got unexpected packet from leader "
+                                + qp.getType() + " exiting ... " );
+                        System.exit(13);
+                    }
+                    zk.dataTree.lastProcessedZxid = newLeaderZxid;
+                }
+                ack.setZxid(newLeaderZxid & ~0xffffffffL);
+                writePacket(ack);
+                sock.setSoTimeout(self.tickTime * self.syncLimit);
+                zk.startup();
+                while (self.running) {
+                    readPacket(qp);
+                    switch (qp.getType()) {
+                    case Leader.PING:
+                        // Send back the ping with our session data
+                        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+                        DataOutputStream dos = new DataOutputStream(bos);
+                        HashMap<Long, Integer> touchTable = zk
+                                .getTouchSnapshot();
+                        for (Entry<Long, Integer> entry : touchTable.entrySet()) {
+                            dos.writeLong(entry.getKey());
+                            dos.writeInt(entry.getValue());
+                        }
+                        qp.setData(bos.toByteArray());
+                        writePacket(qp);
+                        break;
+                    case Leader.PROPOSAL:
+                        TxnHeader hdr = new TxnHeader();
+                        BinaryInputArchive ia = BinaryInputArchive
+                                .getArchive(new ByteArrayInputStream(qp.getData()));
+                        Record txn = SerializeUtils.deserializeTxn(ia, hdr);
+                        if (hdr.getZxid() != lastQueued + 1) {
+                            LOG.warn("Got zxid 0x"
+                                    + Long.toHexString(hdr.getZxid())
+                                    + " expected 0x"
+                                    + Long.toHexString(lastQueued + 1));
+                        }
+                        lastQueued = hdr.getZxid();
+                        zk.logRequest(hdr, txn);
+                        break;
+                    case Leader.COMMIT:
+                        zk.commit(qp.getZxid());
+                        break;
+                    case Leader.UPTODATE:
+                        zk.takeSnapshot();
+                        self.cnxnFactory.setZooKeeperServer(zk);
+                        break;
+                    case Leader.REVALIDATE:
+                        ByteArrayInputStream bis = new ByteArrayInputStream(qp
+                                .getData());
+                        DataInputStream dis = new DataInputStream(bis);
+                        long sessionId = dis.readLong();
+                        boolean valid = dis.readBoolean();
+                        synchronized (pendingRevalidations) {
+                            ServerCnxn cnxn = pendingRevalidations
+                                    .remove(sessionId);
+                            if (cnxn == null) {
+                                LOG.warn("Missing session 0x"
+                                        + Long.toHexString(sessionId)
+                                        + " for validation");
+                            } else {
+                                cnxn.finishSessionInit(valid);
+                            }
                         }
+                        ZooTrace.logTraceMessage(LOG, ZooTrace.SESSION_TRACE_MASK,
+                                                 "Session 0x" 
+                                                 + Long.toHexString(sessionId)
+                                                 + " is valid: " + valid);
+                        break;
+                    case Leader.SYNC:
+                        zk.sync();
+                        break;
                     }
-                    ZooTrace.logTraceMessage(LOG, ZooTrace.SESSION_TRACE_MASK,
-                                             "Session 0x" 
-                                             + Long.toHexString(sessionId)
-                                             + " is valid: " + valid);
-                    break;
-                case Leader.SYNC:
-                    zk.sync();
-                    break;
+                }
+            } catch (IOException e) {
+                LOG.warn("Exception when following the leader", e);
+                try {
+                    sock.close();
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+    
+                synchronized (pendingRevalidations) {
+                    // clear pending revalitions
+                    pendingRevalidations.clear();
+                    pendingRevalidations.notifyAll();
                 }
             }
-        } catch (IOException e) {
-            LOG.warn("Exception when following the leader", e);
-            try {
-                sock.close();
-            } catch (IOException e1) {
-                e1.printStackTrace();
-            }
-
-            synchronized (pendingRevalidations) {
-                // clear pending revalitions
-                pendingRevalidations.clear();
-                pendingRevalidations.notifyAll();
-            }
+        } finally {
+            zk.unregisterJMX(this);
         }
     }
 
     private long lastQueued;
 
-    ConcurrentHashMap<Long, ServerCnxn> pendingRevalidations = new ConcurrentHashMap<Long, ServerCnxn>();
+    final ConcurrentHashMap<Long, ServerCnxn> pendingRevalidations =
+        new ConcurrentHashMap<Long, ServerCnxn>();
+    
+    public int getPendingRevalidationsCount() {
+        return pendingRevalidations.size();
+    }
 
     /**
      * validate a seesion for a client
@@ -362,6 +383,10 @@ public class Follower {
         }
         return -1;
     }
+    
+    public long getLastQueued() {
+        return lastQueued;
+    }
 
     public void shutdown() {
         // set the zookeeper server to null

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerBean.java → src/java/main/org/apache/zookeeper/server/quorum/FollowerBean.java

@@ -16,38 +16,35 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.server.quorum;
 
-import org.apache.zookeeper.jmx.server.ZooKeeperServerBean;
 import org.apache.zookeeper.server.ZooKeeperServer;
-import org.apache.zookeeper.server.quorum.QuorumPeer;
+import org.apache.zookeeper.server.ZooKeeperServerBean;
 
 /**
- * Implementation of the local peer MBean interface.
+ * Follower MBean inteface implementation
  */
-public class LocalPeerBean extends ZooKeeperServerBean implements LocalPeerMXBean {
+public class FollowerBean extends ZooKeeperServerBean implements FollowerMXBean {
+    private final Follower follower;
 
-    private QuorumPeer peer;
-    
-    public LocalPeerBean(QuorumPeer peer){
-        this.peer=peer;
+    public FollowerBean(Follower follower, ZooKeeperServer zks) {
+        super(zks);
+        this.follower = follower;
     }
-
+    
     public String getName() {
-        return "replica."+peer.getId();
-    }
-
-    public boolean isHidden() {
-        return false;
+        return "Follower";
     }
 
     public String getQuorumAddress() {
-        return peer.getQuorumAddress().getHostName()+":"+
-            peer.getQuorumAddress().getPort();
+        return follower.sock.toString();
     }
-
-    @Override
-    public ZooKeeperServer getZooKeeperServer() {
-        return peer.getActiveServer();
+    
+    public String getLastQueuedZxid() {
+        return "0x" + Long.toHexString(follower.getLastQueued());
+    }
+    
+    public int getPendingRevalidationCount() {
+        return follower.getPendingRevalidationsCount();
     }
 }

src/java/main/org/apache/zookeeper/server/quorum/FollowerHandler.java

@@ -47,16 +47,17 @@ import org.apache.zookeeper.txn.TxnHeader;
 public class FollowerHandler extends Thread {
     private static final Logger LOG = Logger.getLogger(FollowerHandler.class);
 
-    public Socket sock;
+    public final Socket sock;
 
-    Leader leader;
+    final Leader leader;
 
     long tickOfLastAck;
 
     /**
      * The packets to be sent to the follower
      */
-    LinkedBlockingQueue<QuorumPacket> queuedPackets = new LinkedBlockingQueue<QuorumPacket>();
+    final LinkedBlockingQueue<QuorumPacket> queuedPackets =
+        new LinkedBlockingQueue<QuorumPacket>();
 
     private BinaryInputArchive ia;
 
@@ -71,11 +72,21 @@ public class FollowerHandler extends Thread {
         leader.addFollowerHandler(this);
         start();
     }
+    
+    @Override
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("FollowerHandler ").append(sock);
+        sb.append(" tickOfLastAck:").append(tickOfLastAck());
+        sb.append(" synced?:").append(synced());
+        sb.append(" queuedPacketLength:").append(queuedPackets.size());
+        return sb.toString();
+    }
 
     /**
      * If this packet is queued, the sender thread will exit
      */
-    QuorumPacket proposalOfDeath = new QuorumPacket();
+    final QuorumPacket proposalOfDeath = new QuorumPacket();
 
     /**
      * This method will use the thread to send packets added to the

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LocalPeerMXBean.java → src/java/main/org/apache/zookeeper/server/quorum/FollowerMXBean.java

@@ -16,19 +16,26 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.server.quorum;
 
-import org.apache.zookeeper.jmx.server.ZooKeeperServerMXBean;
+import org.apache.zookeeper.server.ZooKeeperServerMXBean;
 
 /**
- * A local zookeeper server MBean interface. Unlike the remote peer, the local
- * peer provides complete state/statistics at runtime and can be managed (just 
- * like a standalone zookeeper server).
+ * Follower MBean
  */
-public interface LocalPeerMXBean extends ZooKeeperServerMXBean{
+public interface FollowerMXBean extends ZooKeeperServerMXBean {
     /**
-     * @return the IP address used for running quorum protocols and data 
-     * replication
+     * @return socket address
      */
     public String getQuorumAddress();
+    
+    /**
+     * @return last queued zxid
+     */
+    public String getLastQueuedZxid();
+    
+    /**
+     * @return count of pending revalidations
+     */
+    public int getPendingRevalidationCount();
 }

src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java

@@ -20,11 +20,13 @@ package org.apache.zookeeper.server.quorum;
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.LinkedBlockingQueue;
 
 import org.apache.jute.Record;
 import org.apache.log4j.Logger;
+import org.apache.zookeeper.jmx.MBeanRegistry;
+import org.apache.zookeeper.server.DataTreeBean;
 import org.apache.zookeeper.server.FinalRequestProcessor;
 import org.apache.zookeeper.server.Request;
 import org.apache.zookeeper.server.RequestProcessor;
@@ -174,4 +176,56 @@ public class FollowerZooKeeperServer extends ZooKeeperServer {
             LOG.error("FIXMSG",e);
         }
     }
+
+
+    @Override
+    protected void registerJMX() {
+        // register with JMX
+        try {
+            jmxDataTreeBean = new DataTreeBean(dataTree);
+            MBeanRegistry.getInstance().register(jmxDataTreeBean, jmxServerBean);
+        } catch (Exception e) {
+            LOG.warn("Failed to register with JMX", e);
+        }
+    }
+
+    public void registerJMX(FollowerBean followerBean,
+            LocalPeerBean localPeerBean)
+    {
+        // register with JMX
+        try {
+            MBeanRegistry.getInstance().unregister(self.jmxLeaderElectionBean);
+            self.jmxLeaderElectionBean = null;
+
+            jmxServerBean = followerBean;
+            MBeanRegistry.getInstance().register(followerBean, localPeerBean);
+        } catch (Exception e) {
+            LOG.warn("Failed to register with JMX", e);
+        }
+    }
+
+    @Override
+    protected void unregisterJMX() {
+        // unregister from JMX
+        try {
+            if (jmxDataTreeBean != null) {
+                MBeanRegistry.getInstance().unregister(jmxDataTreeBean);
+            }
+        } catch (Exception e) {
+            LOG.warn("Failed to unregister with JMX", e);
+        }
+        jmxDataTreeBean = null;
+    }
+
+    protected void unregisterJMX(Follower follower) {
+        // unregister from JMX
+        try {
+            if (jmxServerBean != null) {
+                MBeanRegistry.getInstance().unregister(jmxServerBean);
+            }
+        } catch (Exception e) {
+            LOG.warn("Failed to unregister with JMX", e);
+        }
+        jmxServerBean = null;
+    }
 }

src/java/main/org/apache/zookeeper/server/quorum/Leader.java

@@ -32,9 +32,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.log4j.Logger;
-
 import org.apache.jute.BinaryOutputArchive;
+import org.apache.log4j.Logger;
 import org.apache.zookeeper.server.FinalRequestProcessor;
 import org.apache.zookeeper.server.Request;
 import org.apache.zookeeper.server.RequestProcessor;
@@ -241,85 +240,91 @@ public class Leader {
      * @throws InterruptedException
      */
     void lead() throws IOException, InterruptedException {
-        self.tick = 0;
-        zk.loadData();
-        zk.startup();
-        long epoch = self.getLastLoggedZxid() >> 32L;
-        epoch++;
-        zk.setZxid(epoch << 32L);
-        zk.dataTree.lastProcessedZxid = zk.getZxid();
-        lastProposed = zk.getZxid();
-        newLeaderProposal.packet = new QuorumPacket(NEWLEADER, zk.getZxid(),
-                null, null);
-        if ((newLeaderProposal.packet.getZxid() & 0xffffffffL) != 0) {
-            LOG.warn("NEWLEADER proposal has Zxid of "
-                    + newLeaderProposal.packet.getZxid());
-        }
-        outstandingProposals.add(newLeaderProposal);
-        
-        // Start thread that waits for connection requests from 
-        // new followers.
-        cnxAcceptor = new FollowerCnxAcceptor();
-        cnxAcceptor.start();
-        
-        // We have to get at least a majority of servers in sync with
-        // us. We do this by waiting for the NEWLEADER packet to get
-        // acknowledged
-        newLeaderProposal.ackCount++;
-        while (newLeaderProposal.ackCount <= self.quorumPeers.size() / 2) {
-            if (self.tick > self.initLimit) {
-                // Followers aren't syncing fast enough,
-                // renounce leadership!
-                shutdown("Waiting for " + (self.quorumPeers.size() / 2)
-                        + " followers, only synced with "
-                        + newLeaderProposal.ackCount);
-                if (followers.size() >= self.quorumPeers.size() / 2) {
-                    LOG.warn("Enough followers present. "+
-                            "Perhaps the initTicks need to be increased.");
-                }
-                return;
+        zk.registerJMX(new LeaderBean(this, zk), self.jmxLocalPeerBean);
+
+        try {
+            self.tick = 0;
+            zk.loadData();
+            zk.startup();
+            long epoch = self.getLastLoggedZxid() >> 32L;
+            epoch++;
+            zk.setZxid(epoch << 32L);
+            zk.dataTree.lastProcessedZxid = zk.getZxid();
+            lastProposed = zk.getZxid();
+            newLeaderProposal.packet = new QuorumPacket(NEWLEADER, zk.getZxid(),
+                    null, null);
+            if ((newLeaderProposal.packet.getZxid() & 0xffffffffL) != 0) {
+                LOG.warn("NEWLEADER proposal has Zxid of "
+                        + newLeaderProposal.packet.getZxid());
             }
-            Thread.sleep(self.tickTime);
-            self.tick++;
-        }
-        if (!System.getProperty("zookeeper.leaderServes", "yes").equals("no")) {
-            self.cnxnFactory.setZooKeeperServer(zk);
-        }
-        // Everything is a go, simply start counting the ticks
-        // WARNING: I couldn't find any wait statement on a synchronized
-        // block that would be notified by this notifyAll() call, so
-        // I commented it out
-        //synchronized (this) {
-        //    notifyAll();
-        //}
-        // We ping twice a tick, so we only update the tick every other
-        // iteration
-        boolean tickSkip = true;
-
-        while (true) {
-            Thread.sleep(self.tickTime / 2);
-            if (!tickSkip) {
+            outstandingProposals.add(newLeaderProposal);
+            
+            // Start thread that waits for connection requests from 
+            // new followers.
+            cnxAcceptor = new FollowerCnxAcceptor();
+            cnxAcceptor.start();
+            
+            // We have to get at least a majority of servers in sync with
+            // us. We do this by waiting for the NEWLEADER packet to get
+            // acknowledged
+            newLeaderProposal.ackCount++;
+            while (newLeaderProposal.ackCount <= self.quorumPeers.size() / 2) {
+                if (self.tick > self.initLimit) {
+                    // Followers aren't syncing fast enough,
+                    // renounce leadership!
+                    shutdown("Waiting for " + (self.quorumPeers.size() / 2)
+                            + " followers, only synced with "
+                            + newLeaderProposal.ackCount);
+                    if (followers.size() >= self.quorumPeers.size() / 2) {
+                        LOG.warn("Enough followers present. "+
+                                "Perhaps the initTicks need to be increased.");
+                    }
+                    return;
+                }
+                Thread.sleep(self.tickTime);
                 self.tick++;
             }
-            int syncedCount = 0;
-            // lock on the followers when we use it.
-            synchronized (followers) {
-                for (FollowerHandler f : followers) {
-                    if (f.synced()) {
-                        syncedCount++;
+            if (!System.getProperty("zookeeper.leaderServes", "yes").equals("no")) {
+                self.cnxnFactory.setZooKeeperServer(zk);
+            }
+            // Everything is a go, simply start counting the ticks
+            // WARNING: I couldn't find any wait statement on a synchronized
+            // block that would be notified by this notifyAll() call, so
+            // I commented it out
+            //synchronized (this) {
+            //    notifyAll();
+            //}
+            // We ping twice a tick, so we only update the tick every other
+            // iteration
+            boolean tickSkip = true;
+    
+            while (true) {
+                Thread.sleep(self.tickTime / 2);
+                if (!tickSkip) {
+                    self.tick++;
+                }
+                int syncedCount = 0;
+                // lock on the followers when we use it.
+                synchronized (followers) {
+                    for (FollowerHandler f : followers) {
+                        if (f.synced()) {
+                            syncedCount++;
+                        }
+                        f.ping();
                     }
-                    f.ping();
                 }
+                if (!tickSkip && syncedCount < self.quorumPeers.size() / 2) {
+                    // Lost quorum, shutdown
+                    shutdown("Only " + syncedCount + " followers, need "
+                            + (self.quorumPeers.size() / 2));
+                    // make sure the order is the same!
+                    // the leader goes to looking
+                    return;
+                }
+                tickSkip = !tickSkip;
             }
-            if (!tickSkip && syncedCount < self.quorumPeers.size() / 2) {
-                // Lost quorum, shutdown
-                shutdown("Only " + syncedCount + " followers, need "
-                        + (self.quorumPeers.size() / 2));
-                // make sure the order is the same!
-                // the leader goes to looking
-                return;
-            }
-            tickSkip = !tickSkip;
+        } finally {
+            zk.unregisterJMX(this);
         }
     }
 

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderBean.java → src/java/main/org/apache/zookeeper/server/quorum/LeaderBean.java

@@ -16,14 +16,38 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.server.quorum;
+
+import org.apache.zookeeper.server.ZooKeeperServerBean;
+import org.apache.zookeeper.server.ZooKeeperServer;
+import org.apache.zookeeper.server.quorum.FollowerHandler;
+import org.apache.zookeeper.server.quorum.Leader;
 
 /**
  * Leader MBean interface implementation.
  */
-public class LeaderBean extends ServerBean implements LeaderMXBean {
-
+public class LeaderBean extends ZooKeeperServerBean implements LeaderMXBean {
+    private final Leader leader;
+    
+    public LeaderBean(Leader leader, ZooKeeperServer zks) {
+        super(zks);
+        this.leader = leader;
+    }
+    
     public String getName() {
         return "Leader";
     }
+
+    public String getCurrentZxid() {
+        return "0x" + Long.toHexString(zks.getZxid());
+    }
+    
+    public String followerInfo() {
+        StringBuffer sb = new StringBuffer();
+        for (FollowerHandler handler : leader.followers) {
+            sb.append(handler.toString()).append("\n");
+        }
+        return sb.toString();
+    }
+
 }

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionBean.java → src/java/main/org/apache/zookeeper/server/quorum/LeaderElectionBean.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.server.quorum;
 
 import java.util.Date;
 
@@ -25,8 +25,8 @@ import org.apache.zookeeper.jmx.ZKMBeanInfo;
 /**
  * Leader election MBean interface implementation
  */
-public class LeaderElectionBean implements LeaderElectionMXBean,ZKMBeanInfo {
-    private final Date startTime=new Date();
+public class LeaderElectionBean implements LeaderElectionMXBean, ZKMBeanInfo {
+    private final Date startTime = new Date();
 
     public String getName() {
         return "LeaderElection";
@@ -39,5 +39,4 @@ public class LeaderElectionBean implements LeaderElectionMXBean,ZKMBeanInfo {
     public String getStartTime() {
         return startTime.toString();
     }
-
 }

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderElectionMXBean.java → src/java/main/org/apache/zookeeper/server/quorum/LeaderElectionMXBean.java

@@ -16,16 +16,13 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.server.quorum;
+
 
 /**
  * Leader election protocol MBean. 
  */
 public interface LeaderElectionMXBean {
-    /**
-     * @return leader election instance name
-     */
-    public String getName();
     /**
      * 
      * @return the time when the leader election started

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/LeaderMXBean.java → src/java/main/org/apache/zookeeper/server/quorum/LeaderMXBean.java

@@ -16,11 +16,21 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.server.quorum;
+
+import org.apache.zookeeper.server.ZooKeeperServerMXBean;
 
 /**
  * Leader MBean.
  */
-public interface LeaderMXBean extends ServerMXBean {
+public interface LeaderMXBean extends ZooKeeperServerMXBean {
+    /**
+     * Current zxid of cluster.
+     */
+    public String getCurrentZxid();
 
+    /**
+     * @return information on current followers
+     */
+    public String followerInfo();
 }

src/java/main/org/apache/zookeeper/server/quorum/LeaderZooKeeperServer.java

@@ -20,6 +20,8 @@ package org.apache.zookeeper.server.quorum;
 
 import java.io.IOException;
 
+import org.apache.zookeeper.jmx.MBeanRegistry;
+import org.apache.zookeeper.server.DataTreeBean;
 import org.apache.zookeeper.server.FinalRequestProcessor;
 import org.apache.zookeeper.server.PrepRequestProcessor;
 import org.apache.zookeeper.server.RequestProcessor;
@@ -85,4 +87,55 @@ public class LeaderZooKeeperServer extends ZooKeeperServer {
     public void setZxid(long zxid) {
         hzxid = zxid;
     }
+
+    @Override
+    protected void registerJMX() {
+        // register with JMX
+        try {
+            jmxDataTreeBean = new DataTreeBean(dataTree);
+            MBeanRegistry.getInstance().register(jmxDataTreeBean, jmxServerBean);
+        } catch (Exception e) {
+            LOG.warn("Failed to register with JMX", e);
+        }
+    }
+
+    public void registerJMX(LeaderBean leaderBean,
+            LocalPeerBean localPeerBean)
+    {
+        // register with JMX
+        try {
+            MBeanRegistry.getInstance().unregister(self.jmxLeaderElectionBean);
+            self.jmxLeaderElectionBean = null;
+
+            jmxServerBean = leaderBean;
+            MBeanRegistry.getInstance().register(leaderBean, localPeerBean);
+        } catch (Exception e) {
+            LOG.warn("Failed to register with JMX", e);
+        }
+    }
+
+    @Override
+    protected void unregisterJMX() {
+        // unregister from JMX
+        try {
+            if (jmxDataTreeBean != null) {
+                MBeanRegistry.getInstance().unregister(jmxDataTreeBean);
+            }
+        } catch (Exception e) {
+            LOG.warn("Failed to unregister with JMX", e);
+        }
+        jmxDataTreeBean = null;
+    }
+
+    protected void unregisterJMX(Leader leader) {
+        // unregister from JMX
+        try {
+            if (jmxServerBean != null) {
+                MBeanRegistry.getInstance().unregister(jmxServerBean);
+            }
+        } catch (Exception e) {
+            LOG.warn("Failed to unregister with JMX", e);
+        }
+        jmxServerBean = null;
+    }
 }

src/java/main/org/apache/zookeeper/server/quorum/LocalPeerBean.java

@@ -0,0 +1,68 @@
+/**
+ * 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.server.quorum;
+
+import org.apache.zookeeper.server.quorum.QuorumPeer;
+
+/**
+ * Implementation of the local peer MBean interface.
+ */
+public class LocalPeerBean extends ServerBean implements LocalPeerMXBean {
+    private final QuorumPeer peer;
+    
+    public LocalPeerBean(QuorumPeer peer) {
+        this.peer = peer;
+    }
+
+    public String getName() {
+        return "replica." + peer.getId();
+    }
+
+    public boolean isHidden() {
+        return false;
+    }
+
+    public int getTickTime() {
+        return peer.getTickTime();
+    }
+    
+    public int getInitLimit() {
+        return peer.getInitLimit();
+    }
+    
+    public int getSyncLimit() {
+        return peer.getSyncLimit();
+    }
+    
+    public int getTick() {
+        return peer.getTick();
+    }
+    
+    public String getState() {
+        return peer.getState().toString();
+    }
+    
+    public String getQuorumAddress() {
+        return peer.getQuorumAddress().toString();
+    }
+    
+    public int getElectionType() {
+        return peer.getElectionType();
+    }
+}

src/java/main/org/apache/zookeeper/server/quorum/LocalPeerMXBean.java

@@ -0,0 +1,64 @@
+/**
+ * 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.server.quorum;
+
+
+/**
+ * A local zookeeper server MBean interface. Unlike the remote peer, the local
+ * peer provides complete state/statistics at runtime and can be managed (just 
+ * like a standalone zookeeper server).
+ */
+public interface LocalPeerMXBean extends ServerMXBean {
+    
+    /**
+     * @return the number of milliseconds of each tick
+     */
+    public int getTickTime();
+    
+    /**
+     * @return the number of ticks that the initial sync phase can take
+     */
+    public int getInitLimit();
+    
+    /**
+     * @return the number of ticks that can pass between sending a request
+     * and getting a acknowledgment
+     */
+    public int getSyncLimit();
+    
+    /**
+     * @return the current tick
+     */
+    public int getTick();
+    
+    /**
+     * @return the current server state
+     */
+    public String getState();
+    
+    /**
+     * @return the quorum address
+     */
+    public String getQuorumAddress();
+    
+    /**
+     * @return the election type
+     */
+    public int getElectionType();
+}

src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java

@@ -18,7 +18,6 @@
 
 package org.apache.zookeeper.server.quorum;
 
-import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.server.Request;
 import org.apache.zookeeper.server.RequestProcessor;
 import org.apache.zookeeper.server.SyncRequestProcessor;

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumBean.java → src/java/main/org/apache/zookeeper/server/quorum/QuorumBean.java

@@ -16,21 +16,22 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.server.quorum;
 
 import org.apache.zookeeper.jmx.ZKMBeanInfo;
 import org.apache.zookeeper.server.quorum.QuorumPeer;
 
-public class QuorumBean implements QuorumMXBean,ZKMBeanInfo {
-
-    private QuorumPeer peer;
+public class QuorumBean implements QuorumMXBean, ZKMBeanInfo {
+    private final QuorumPeer peer;
+    private final String name;
     
     public QuorumBean(QuorumPeer peer){
-        this.peer=peer;
+        this.peer = peer;
+        name = "ReplicatedServer_id" + peer.getMyid();
     }
     
     public String getName() {
-        return "ReplicatedServer";
+        return name;
     }
     
     public boolean isHidden() {
@@ -40,5 +41,4 @@ public class QuorumBean implements QuorumMXBean,ZKMBeanInfo {
     public int getQuorumSize() {
         return peer.getQuorumSize();
     }
-
 }

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/QuorumMXBean.java → src/java/main/org/apache/zookeeper/server/quorum/QuorumMXBean.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.server.quorum;
 
 /**
  * An MBean representing a zookeeper cluster nodes (aka quorum peers)
@@ -26,6 +26,7 @@ public interface QuorumMXBean {
      * @return the name of the quorum
      */
     public String getName();
+    
     /**
      * @return configured number of peers in the quorum
      */

src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java

@@ -28,20 +28,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.jute.BinaryInputArchive;
-import org.apache.jute.InputArchive;
 import org.apache.log4j.Logger;
+import org.apache.zookeeper.jmx.MBeanRegistry;
+import org.apache.zookeeper.jmx.ZKMBeanInfo;
 import org.apache.zookeeper.server.NIOServerCnxn;
 import org.apache.zookeeper.server.ZooKeeperServer;
 import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
 
-import static org.apache.zookeeper.server.quorum.QuorumPeerConfig.getElectionAlg;
-import static org.apache.zookeeper.server.quorum.QuorumPeerConfig.getInitLimit;
-import static org.apache.zookeeper.server.quorum.QuorumPeerConfig.getServerId;
-import static org.apache.zookeeper.server.quorum.QuorumPeerConfig.getServers;
-import static org.apache.zookeeper.server.quorum.QuorumPeerConfig.getSyncLimit;
-import static org.apache.zookeeper.server.quorum.QuorumPeerConfig.getTickTime;
-
 /**
  * This class manages the quorum protocol. There are three states this server
  * can be in:
@@ -72,6 +65,10 @@ import static org.apache.zookeeper.server.quorum.QuorumPeerConfig.getTickTime;
 public class QuorumPeer extends Thread implements QuorumStats.Provider {
     private static final Logger LOG = Logger.getLogger(QuorumPeer.class);
 
+    QuorumBean jmxQuorumBean;
+    LocalPeerBean jmxLocalPeerBean;
+    LeaderElectionBean jmxLeaderElectionBean;
+
     /**
      * Create an instance of a quorum peer
      */
@@ -151,7 +148,7 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
 
     /**
      * The number of ticks that can pass between sending a request and getting
-     * an acknowledgement
+     * an acknowledgment
      */
     int syncLimit;
 
@@ -255,17 +252,18 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
     NIOServerCnxn.Factory cnxnFactory;
     private FileTxnSnapLog logFactory = null;
 
+    private final QuorumStats quorumStats;
     
     public QuorumPeer() {
         super("QuorumPeer");
-        QuorumStats.getInstance().setStatsProvider(this);
+        quorumStats = new QuorumStats(this);
     }
     
     public QuorumPeer(Map<Long, QuorumServer> quorumPeers, File dataDir,
             File dataLogDir, int electionType,
             long myid, int tickTime, int initLimit, int syncLimit,
             NIOServerCnxn.Factory cnxnFactory) throws IOException {
-        super("QuorumPeer");
+        this();
         this.cnxnFactory = cnxnFactory;
         this.quorumPeers = quorumPeers;
         this.electionType = electionType;
@@ -274,7 +272,10 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
         this.initLimit = initLimit;
         this.syncLimit = syncLimit;        
         this.logFactory = new FileTxnSnapLog(dataLogDir, dataDir);
-        QuorumStats.getInstance().setStatsProvider(this);
+    }
+    
+    QuorumStats quorumStats() {
+        return quorumStats;
     }
     
     @Override
@@ -318,9 +319,12 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
      */
     public QuorumPeer(Map<Long,QuorumServer> quorumPeers, File snapDir,
             File logDir, int clientPort, int electionAlg,
-            long myid, int tickTime, int initLimit, int syncLimit) throws IOException {
+            long myid, int tickTime, int initLimit, int syncLimit)
+        throws IOException
+    {
         this(quorumPeers, snapDir, logDir, electionAlg,
-                myid,tickTime, initLimit,syncLimit,new NIOServerCnxn.Factory(clientPort));
+                myid,tickTime, initLimit,syncLimit,
+                new NIOServerCnxn.Factory(clientPort));
     }
     
     public long getLastLoggedZxid(){
@@ -362,6 +366,14 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
     }
 
     protected Election makeLEStrategy(){
+        LOG.debug("Running leader election protocol...");
+        try {
+            jmxLeaderElectionBean = new LeaderElectionBean();
+            MBeanRegistry.getInstance().register(jmxLeaderElectionBean, jmxLocalPeerBean);        
+        } catch (Exception e) {
+            LOG.warn("Failed to register with JMX", e);
+        }
+
         if(electionAlg==null)
             return new LeaderElection(this);
         return electionAlg;
@@ -387,52 +399,79 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
     public void run() {
         setName("QuorumPeer:" + cnxnFactory.getLocalAddress());
 
-        /*
-         * Main loop
-         */
-        while (running) {
-            switch (getPeerState()) {
-            case LOOKING:
-                try {
-                    LOG.info("LOOKING");
-                    setCurrentVote(makeLEStrategy().lookForLeader());
-                } catch (Exception e) {
-                    LOG.warn("Unexpected exception",e);
-                    setPeerState(ServerState.LOOKING);
-                }
-                break;
-            case FOLLOWING:
-                try {
-                    LOG.info("FOLLOWING");
-                    setFollower(makeFollower(logFactory));
-                    follower.followLeader();
-                } catch (Exception e) {
-                    LOG.warn("Unexpected exception",e);
-                } finally {
-                    follower.shutdown();
-                    setFollower(null);
-                    setPeerState(ServerState.LOOKING);
+        LOG.debug("Starting quorum peer");
+        try {
+            jmxQuorumBean = new QuorumBean(this);
+            MBeanRegistry.getInstance().register(jmxQuorumBean, null);
+            for(QuorumServer s: quorumPeers.values()){
+                ZKMBeanInfo p;
+                if (getId() == s.id) {
+                    p = jmxLocalPeerBean = new LocalPeerBean(this);
+                } else {
+                    p = new RemotePeerBean(s);
                 }
-                break;
-            case LEADING:
-                LOG.info("LEADING");
-                try {
-                    setLeader(makeLeader(logFactory));
-                    leader.lead();
-                    setLeader(null);
-                } catch (Exception e) {
-                    LOG.warn("Unexpected exception",e);
-                } finally {
-                    if (leader != null) {
-                        leader.shutdown("Forcing shutdown");
+                MBeanRegistry.getInstance().register(p, jmxQuorumBean);
+            }
+        } catch (Exception e) {
+            LOG.warn("Failed to register with JMX", e);
+        }
+
+        try {
+            /*
+             * Main loop
+             */
+            while (running) {
+                switch (getPeerState()) {
+                case LOOKING:
+                    try {
+                        LOG.info("LOOKING");
+                        setCurrentVote(makeLEStrategy().lookForLeader());
+                    } catch (Exception e) {
+                        LOG.warn("Unexpected exception",e);
+                        setPeerState(ServerState.LOOKING);
+                    }
+                    break;
+                case FOLLOWING:
+                    try {
+                        LOG.info("FOLLOWING");
+                        setFollower(makeFollower(logFactory));
+                        follower.followLeader();
+                    } catch (Exception e) {
+                        LOG.warn("Unexpected exception",e);
+                    } finally {
+                        follower.shutdown();
+                        setFollower(null);
+                        setPeerState(ServerState.LOOKING);
+                    }
+                    break;
+                case LEADING:
+                    LOG.info("LEADING");
+                    try {
+                        setLeader(makeLeader(logFactory));
+                        leader.lead();
                         setLeader(null);
+                    } catch (Exception e) {
+                        LOG.warn("Unexpected exception",e);
+                    } finally {
+                        if (leader != null) {
+                            leader.shutdown("Forcing shutdown");
+                            setLeader(null);
+                        }
+                        setPeerState(ServerState.LOOKING);
                     }
-                    setPeerState(ServerState.LOOKING);
+                    break;
                 }
-                break;
             }
+        } finally {
+            LOG.warn("QuorumPeer main thread exited");
+            try {
+                MBeanRegistry.getInstance().unregisterAll();
+            } catch (Exception e) {
+                LOG.warn("Failed to unregister with JMX", e);
+            }
+            jmxQuorumBean = null;
+            jmxLocalPeerBean = null;
         }
-        LOG.warn("QuorumPeer main thread exited");
     }
 
     public void shutdown() {
@@ -523,6 +562,13 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
         this.initLimit = initLimit;
     }
 
+    /**
+     * Get the current tick
+     */
+    public int getTick() {
+        return tick;
+    }
+    
     /**
      * Get an instance of LeaderElection
      */

src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java

@@ -22,7 +22,10 @@ import static org.apache.zookeeper.server.ServerConfig.getClientPort;
 import java.io.File;
 import java.io.IOException;
 
+import javax.management.JMException;
+
 import org.apache.log4j.Logger;
+import org.apache.zookeeper.jmx.ManagedUtil;
 import org.apache.zookeeper.server.NIOServerCnxn;
 import org.apache.zookeeper.server.ServerConfig;
 import org.apache.zookeeper.server.ZooKeeperServerMain;
@@ -74,6 +77,12 @@ public class QuorumPeerMain {
             System.exit(2);
         }
         if (!QuorumPeerConfig.isStandalone()) {
+            try {
+                ManagedUtil.registerLog4jMBeans();
+            } catch (JMException e) {
+                LOG.warn("Unable to register log4j JMX control", e);
+            }
+
             runPeer(new QuorumPeer.Factory() {
                 public QuorumPeer create(NIOServerCnxn.Factory cnxnFactory) throws IOException {
                     QuorumPeer peer = new QuorumPeer();
@@ -102,7 +111,6 @@ public class QuorumPeerMain {
     
     public static void runPeer(QuorumPeer.Factory qpFactory) {
         try {
-            QuorumStats.registerAsConcrete();
             QuorumPeer self = qpFactory.create(qpFactory.createConnectionFactory());
             self.start();
             self.join();

src/java/main/org/apache/zookeeper/server/quorum/QuorumStats.java

@@ -18,43 +18,29 @@
 
 package org.apache.zookeeper.server.quorum;
 
-import org.apache.zookeeper.server.ServerStats;
-
-public class QuorumStats extends ServerStats {
+public class QuorumStats {
+    private final Provider provider;
     
     public interface Provider {
-        static public final String UNKNOWN_STATE="unknown";
-        static public final String LOOKING_STATE="leaderelection";
-        static public final String LEADING_STATE="leading";
-        static public final String FOLLOWING_STATE="following";
+        static public final String UNKNOWN_STATE = "unknown";
+        static public final String LOOKING_STATE = "leaderelection";
+        static public final String LEADING_STATE = "leading";
+        static public final String FOLLOWING_STATE = "following";
         
         public String[] getQuorumPeers();
         public String getServerState();
     }
-    private Provider qprovider=null;
     
-    static public QuorumStats getInstance(){
-        ServerStats i=ServerStats.getInstance();
-        assert i==null || i instanceof QuorumStats;
-        return (QuorumStats)i;
-    }
-    static public void registerAsConcrete(){
-        assert getInstance()==null;
-        setInstance(new QuorumStats());
+    protected QuorumStats(Provider provider) {
+        this.provider = provider;
     }
-    protected QuorumStats(){}
     
-    public void setStatsProvider(Provider newProvider){
-        qprovider=newProvider;
-    }
-    
-    @Override
     public String getServerState(){
-        return (qprovider!=null)?qprovider.getServerState():Provider.UNKNOWN_STATE;
+        return provider.getServerState();
     }
     
     public String[] getQuorumPeers(){
-        return (qprovider!=null)?qprovider.getQuorumPeers():new String[0];
+        return provider.getQuorumPeers();
     }
 
     @Override

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerBean.java → src/java/main/org/apache/zookeeper/server/quorum/RemotePeerBean.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.server.quorum;
 
 import org.apache.zookeeper.jmx.ZKMBeanInfo;
 import org.apache.zookeeper.server.quorum.QuorumPeer;

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/RemotePeerMXBean.java → src/java/main/org/apache/zookeeper/server/quorum/RemotePeerMXBean.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.server.quorum;
 
 /**
  * A proxy for a remote quorum peer.

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerBean.java → src/java/main/org/apache/zookeeper/server/quorum/ServerBean.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.server.quorum;
 
 import java.util.Date;
 

src/java/jmx/org/apache/zookeeper/jmx/server/quorum/ServerMXBean.java → src/java/main/org/apache/zookeeper/server/quorum/ServerMXBean.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zookeeper.jmx.server.quorum;
+package org.apache.zookeeper.server.quorum;
 
 /**
  * A quorum server MBean.

src/java/test/org/apache/zookeeper/server/CRCTest.java

@@ -51,11 +51,9 @@ public class CRCTest extends TestCase implements Watcher{
     @Override
     protected void setUp() throws Exception {
         LOG.info("STARTING " + getName());
-        ServerStats.registerAsConcrete();
     }
     @Override
     protected void tearDown() throws Exception {
-        ServerStats.unregister();
         LOG.info("FINISHED " + getName());
     }
     

src/java/test/org/apache/zookeeper/server/InvalidSnapshotTest.java

@@ -21,6 +21,8 @@ package org.apache.zookeeper.server;
 import java.io.File;
 import java.io.RandomAccessFile;
 
+import junit.framework.TestCase;
+
 import org.apache.log4j.Logger;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.WatchedEvent;
@@ -29,8 +31,6 @@ import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.test.ClientBase;
 
-import junit.framework.TestCase;
-
 /**
  * this test checks that the server works 
  * even if the last snapshot is invalidated
@@ -43,17 +43,6 @@ public class InvalidSnapshotTest extends TestCase implements Watcher {
     ZooKeeperServer zks = null;
     private static final int CONNECTION_TIMEOUT = 3000;
     
-    @Override
-    protected void setUp() throws Exception {
-        ServerStats.registerAsConcrete();
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        ServerStats.unregister();
-    }
-    
-   
     /**
      * this test does the main work of testing 
      * an invalid snapshot

src/java/test/org/apache/zookeeper/test/ACLTest.java

@@ -18,26 +18,25 @@
 
 package org.apache.zookeeper.test;
 
+import static org.apache.zookeeper.test.ClientBase.CONNECTION_TIMEOUT;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import junit.framework.TestCase;
-import static org.apache.zookeeper.test.ClientBase.CONNECTION_TIMEOUT;
+
 import org.apache.log4j.Logger;
 import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Id;
-import org.apache.zookeeper.data.Stat;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.server.DataTree;
 import org.apache.zookeeper.server.NIOServerCnxn;
-import org.apache.zookeeper.server.ServerStats;
 import org.apache.zookeeper.server.SyncRequestProcessor;
 import org.apache.zookeeper.server.ZooKeeperServer;
 
@@ -50,11 +49,9 @@ public class ACLTest extends TestCase implements Watcher {
     @Override
     protected void setUp() throws Exception {
         LOG.info("STARTING " + getName());
-        ServerStats.registerAsConcrete();
     }
     @Override
     protected void tearDown() throws Exception {
-        ServerStats.unregister();
         LOG.info("FINISHED " + getName());
     }
 

src/java/test/org/apache/zookeeper/test/ClientBase.java

@@ -39,7 +39,6 @@ import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
 import org.apache.zookeeper.server.NIOServerCnxn;
-import org.apache.zookeeper.server.ServerStats;
 import org.apache.zookeeper.server.ZooKeeperServer;
 import org.apache.zookeeper.server.persistence.FileTxnLog;
 
@@ -288,8 +287,6 @@ public abstract class ClientBase extends TestCase {
     protected void setUp() throws Exception {
         LOG.info("STARTING " + getName());
 
-        ServerStats.registerAsConcrete();
-
         tmpDir = createTmpDir(BASETEST);
         
         setupTestEnv();
@@ -322,8 +319,6 @@ public abstract class ClientBase extends TestCase {
             recursiveDelete(tmpDir);
         }
 
-        ServerStats.unregister();
-
         LOG.info("FINISHED " + getName());
     }
 

src/java/test/org/apache/zookeeper/test/FLETest.java

@@ -25,18 +25,14 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Random;
 
+import junit.framework.TestCase;
+
 import org.apache.log4j.Logger;
 import org.apache.zookeeper.server.quorum.FastLeaderElection;
-import org.apache.zookeeper.server.quorum.QuorumCnxManager;
 import org.apache.zookeeper.server.quorum.QuorumPeer;
-import org.apache.zookeeper.server.quorum.QuorumStats;
 import org.apache.zookeeper.server.quorum.Vote;
 import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
 import org.apache.zookeeper.server.quorum.QuorumPeer.ServerState;
-
-import junit.framework.TestCase;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 public class FLETest extends TestCase {
@@ -93,7 +89,6 @@ public class FLETest extends TestCase {
         successCount = 0;
         finalObj = new Object();
         
-        QuorumStats.registerAsConcrete();
         LOG.info("SetUp " + getName());
     }
 

src/java/test/org/apache/zookeeper/test/LETest.java

@@ -21,18 +21,16 @@ package org.apache.zookeeper.test;
 import java.io.File;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
-import java.util.Random;
 import java.util.HashMap;
+import java.util.Random;
+
+import junit.framework.TestCase;
 
-import org.apache.log4j.Logger;
 import org.apache.zookeeper.server.quorum.LeaderElection;
 import org.apache.zookeeper.server.quorum.QuorumPeer;
-import org.apache.zookeeper.server.quorum.QuorumStats;
 import org.apache.zookeeper.server.quorum.Vote;
 import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
 
-import junit.framework.TestCase;
-
 public class LETest extends TestCase {
     volatile Vote votes[];
     volatile boolean leaderDies;
@@ -92,7 +90,6 @@ public class LETest extends TestCase {
         File tmpdir[] = new File[count];
         int port[] = new int[count];
         votes = new Vote[count];
-        QuorumStats.registerAsConcrete();
         for(int i = 0; i < count; i++) {
             peers.put(Long.valueOf(i), new QuorumServer(i, new InetSocketAddress("127.0.0.1", baseport+100+i)));
             tmpdir[i] = File.createTempFile("letest", "test");

src/java/test/org/apache/zookeeper/test/QuorumTest.java

@@ -26,7 +26,6 @@ import java.util.HashMap;
 import org.apache.log4j.Logger;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.server.quorum.QuorumPeer;
-import org.apache.zookeeper.server.quorum.QuorumStats;
 import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
 import org.junit.After;
 import org.junit.Before;
@@ -61,7 +60,6 @@ public class QuorumTest extends ClientBase {
         LOG.info("Setup finished");
     }
     void startServers() throws IOException, InterruptedException {
-        QuorumStats.registerAsConcrete();
         int tickTime = 2000;
         int initLimit = 3;
         int syncLimit = 3;
@@ -123,7 +121,6 @@ public class QuorumTest extends ClientBase {
             LOG.info(hp + " is no longer accepting client connections");
         }
 
-        QuorumStats.unregister();
         LOG.info("FINISHED " + getName());
     }
 

src/java/test/org/apache/zookeeper/test/RecoveryTest.java

@@ -35,7 +35,6 @@ import org.apache.zookeeper.Watcher.Event.KeeperState;
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.data.Stat;
 import org.apache.zookeeper.server.NIOServerCnxn;
-import org.apache.zookeeper.server.ServerStats;
 import org.apache.zookeeper.server.SyncRequestProcessor;
 import org.apache.zookeeper.server.ZooKeeperServer;
 import org.junit.Test;
@@ -50,11 +49,9 @@ public class RecoveryTest extends TestCase implements Watcher {
     @Override
     protected void setUp() throws Exception {
         LOG.info("STARTING " + getName());
-        ServerStats.registerAsConcrete();
     }
     @Override
     protected void tearDown() throws Exception {
-        ServerStats.unregister();
         LOG.info("FINISHED " + getName());
     }
 

src/java/test/org/apache/zookeeper/test/RepeatStartupTest.java

@@ -18,8 +18,6 @@
 
 package org.apache.zookeeper.test;
 
-import java.io.IOException;
-
 import junit.framework.TestCase;
 
 import org.apache.zookeeper.CreateMode;
@@ -27,7 +25,6 @@ import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.server.NIOServerCnxn;
 import org.apache.zookeeper.server.ZooKeeperServer;
-import org.apache.zookeeper.server.quorum.QuorumPeer;
 
 /**
  * this test fails quorum peers 

src/java/test/org/apache/zookeeper/test/SessionTest.java

@@ -30,13 +30,12 @@ import junit.framework.TestCase;
 import org.apache.log4j.Logger;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.data.Stat;
-import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.server.NIOServerCnxn;
-import org.apache.zookeeper.server.ServerStats;
 import org.apache.zookeeper.server.ZooKeeperServer;
 import org.junit.Test;
 
@@ -52,8 +51,6 @@ public class SessionTest extends TestCase implements Watcher {
     protected void setUp() throws Exception {
         LOG.info("STARTING " + getName());
 
-        ServerStats.registerAsConcrete();
-
         File tmpDir = ClientBase.createTmpDir();
 
         ClientBase.setupTestEnv();
@@ -74,7 +71,6 @@ public class SessionTest extends TestCase implements Watcher {
                    ClientBase.waitForServerDown(HOSTPORT,
                                                 CONNECTION_TIMEOUT));
 
-        ServerStats.unregister();
         LOG.info("FINISHED " + getName());
     }
 

src/java/test/org/apache/zookeeper/test/SledgeHammer.java

@@ -22,13 +22,13 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.data.Stat;
-import org.apache.zookeeper.WatchedEvent;
 
 public class SledgeHammer extends Thread implements Watcher {
     ZooKeeper zk;

src/java/test/org/apache/zookeeper/test/UpgradeTest.java

@@ -36,7 +36,6 @@ import org.apache.zookeeper.Watcher.Event.KeeperState;
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.data.Stat;
 import org.apache.zookeeper.server.NIOServerCnxn;
-import org.apache.zookeeper.server.ServerStats;
 import org.apache.zookeeper.server.SyncRequestProcessor;
 import org.apache.zookeeper.server.ZooKeeperServer;
 import org.apache.zookeeper.server.upgrade.UpgradeMain;
@@ -52,11 +51,9 @@ public class UpgradeTest extends TestCase implements Watcher {
     @Override
     protected void setUp() throws Exception {
         LOG.info("STARTING " + getName());
-        ServerStats.registerAsConcrete();
     }
     @Override
     protected void tearDown() throws Exception {
-        ServerStats.unregister();
         LOG.info("FINISHED " + getName());
     }
     

src/java/test/org/apache/zookeeper/test/WatcherTest.java

@@ -29,8 +29,6 @@ import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.TestableZooKeeper;
 import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.AsyncCallback.StatCallback;
 import org.apache.zookeeper.AsyncCallback.VoidCallback;