You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2012/08/03 19:42:05 UTC
svn commit: r1369115 - in /zookeeper/bookkeeper/trunk: ./
hedwig-server/src/main/java/org/apache/hedwig/server/netty/
hedwig-server/src/main/java/org/apache/hedwig/server/persistence/
Author: ivank
Date: Fri Aug 3 17:42:05 2012
New Revision: 1369115
URL: http://svn.apache.org/viewvc?rev=1369115&view=rev
Log:
BOOKKEEPER-343: Failed to register hedwig JMX beans in test cases (sijie via ivank)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServerBean.java
zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1369115&r1=1369114&r2=1369115&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Fri Aug 3 17:42:05 2012
@@ -56,6 +56,8 @@ Trunk (unreleased changes)
BOOKKEEPER-330: System.currentTimeMillis usage in Hedwig (uma via sijie)
+ BOOKKEEPER-343: Failed to register hedwig JMX beans in test cases (sijie via ivank)
+
IMPROVEMENTS:
bookkeeper-server:
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java?rev=1369115&r1=1369114&r2=1369115&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java Fri Aug 3 17:42:05 2012
@@ -86,6 +86,8 @@ public class PubSubServer {
static Logger logger = LoggerFactory.getLogger(PubSubServer.class);
+ private static final String JMXNAME_PREFIX = "PubSubServer_";
+
// Netty related variables
ServerSocketChannelFactory serverChannelFactory;
ClientSocketChannelFactory clientChannelFactory;
@@ -283,7 +285,9 @@ public class PubSubServer {
protected void registerJMX(Map<OperationType, Handler> handlers) {
try {
- jmxServerBean = new PubSubServerBean();
+ String jmxName = JMXNAME_PREFIX + conf.getServerPort() + "_"
+ + conf.getSSLServerPort();
+ jmxServerBean = new PubSubServerBean(jmxName);
HedwigMBeanRegistry.getInstance().register(jmxServerBean, null);
try {
jmxNettyBean = new NettyHandlerBean(handlers);
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServerBean.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServerBean.java?rev=1369115&r1=1369114&r2=1369115&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServerBean.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServerBean.java Fri Aug 3 17:42:05 2012
@@ -28,9 +28,15 @@ import org.apache.hedwig.protocol.PubSub
*/
public class PubSubServerBean implements PubSubServerMXBean, HedwigMBeanInfo {
+ private final String name;
+
+ public PubSubServerBean(String jmxName) {
+ this.name = jmxName;
+ }
+
@Override
public String getName() {
- return "PubSubServer";
+ return name;
}
@Override
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java?rev=1369115&r1=1369114&r2=1369115&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java Fri Aug 3 17:42:05 2012
@@ -727,7 +727,7 @@ public class ReadAheadCache implements P
public void registerJMX(HedwigMBeanInfo parent) {
try {
jmxCacheBean = new ReadAheadCacheBean(this);
- HedwigMBeanRegistry.getInstance().register(jmxCacheBean, null);
+ HedwigMBeanRegistry.getInstance().register(jmxCacheBean, parent);
} catch (Exception e) {
logger.warn("Failed to register readahead cache with JMX", e);
jmxCacheBean = null;