Fixed the conflicts

up1 · Jun 22, 2012 · ea0c80b · ea0c80b
2 parents f70b3c2 + d1b9bb8
commit ea0c80b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/java/voldemort/client/AbstractStoreClientFactory.java b/src/java/voldemort/client/AbstractStoreClientFactory.java
@@ -274,8 +274,13 @@ public FailureDetector getFailureDetector() {
             synchronized(this) {
                 // second check: avoids double initialization
                 result = failureDetector;
-                if(result == null)
+                if(result == null) {
                     failureDetector = result = initFailureDetector(config, cluster.getNodes());
+                    JmxUtils.registerMbean(failureDetector,
+                                           JmxUtils.createObjectName(JmxUtils.getPackageName(failureDetector.getClass()),
+                                                                     JmxUtils.getClassName(failureDetector.getClass())
+                                                                             + jmxId()));
+                }
             }
         }
 
@@ -400,7 +405,7 @@ public void close() {
     }
 
     /* Give a unique id to avoid jmx clashes */
-    private String jmxId() {
+    public String jmxId() {
         return jmxId == 0 ? "" : Integer.toString(jmxId);
     }
 

diff --git a/src/java/voldemort/client/SocketStoreClientFactory.java b/src/java/voldemort/client/SocketStoreClientFactory.java
@@ -38,6 +38,7 @@
 import voldemort.store.socket.SocketStoreFactory;
 import voldemort.store.socket.clientrequest.ClientRequestExecutorPool;
 import voldemort.utils.ByteArray;
+import voldemort.utils.JmxUtils;
 import voldemort.versioning.InconsistencyResolver;
 import voldemort.versioning.Versioned;
 
@@ -68,6 +69,11 @@ public SocketStoreClientFactory(ClientConfig config) {
                                                           config.getSocketBufferSize(),
                                                           config.getSocketKeepAlive(),
                                                           config.isJmxEnabled());
+        if(config.isJmxEnabled())
+            JmxUtils.registerMbean(storeFactory,
+                                   JmxUtils.createObjectName(JmxUtils.getPackageName(storeFactory.getClass()),
+                                                             JmxUtils.getClassName(storeFactory.getClass())
+                                                                     + jmxId()));
     }
 
     @Override