Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C1E9FE311 for ; Sat, 9 Feb 2013 08:00:21 +0000 (UTC) Received: (qmail 9633 invoked by uid 500); 9 Feb 2013 08:00:20 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 9367 invoked by uid 500); 9 Feb 2013 08:00:11 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 9313 invoked by uid 99); 9 Feb 2013 08:00:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Feb 2013 08:00:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Feb 2013 08:00:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1763B23888D2; Sat, 9 Feb 2013 07:59:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1444340 - in /zookeeper/bookkeeper/trunk: ./ bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ Date: Sat, 09 Feb 2013 07:59:47 -0000 To: commits@zookeeper.apache.org From: sijie@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130209075948.1763B23888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sijie Date: Sat Feb 9 07:59:47 2013 New Revision: 1444340 URL: http://svn.apache.org/r1444340 Log: BOOKKEEPER-556: BookieServerMXBean#getServerState makes no sense (ivank via sijie) Modified: zookeeper/bookkeeper/trunk/CHANGES.txt zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerBean.java zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerMXBean.java zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ServerStats.java Modified: zookeeper/bookkeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1444340&r1=1444339&r2=1444340&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/CHANGES.txt (original) +++ zookeeper/bookkeeper/trunk/CHANGES.txt Sat Feb 9 07:59:47 2013 @@ -20,6 +20,8 @@ Trunk (unreleased changes) BOOKKEEPER-312: Implementation of JMS provider (mridul via ivank) + BOOKKEEPER-556: BookieServerMXBean#getServerState makes no sense (ivank via sijie) + Release 4.2.0 - 2013-01-14 Non-backward compatible changes: Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerBean.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerBean.java?rev=1444340&r1=1444339&r2=1444340&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerBean.java (original) +++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerBean.java Sat Feb 9 07:59:47 2013 @@ -75,11 +75,6 @@ public class BookieServerBean implements } @Override - public String getServerState() { - return bks.nioServerFactory.stats.getServerState(); - } - - @Override public String getServerPort() { try { return StringUtils.addrToString(Bookie.getBookieAddress(conf)); Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerMXBean.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerMXBean.java?rev=1444340&r1=1444339&r2=1444340&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerMXBean.java (original) +++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerMXBean.java Sat Feb 9 07:59:47 2013 @@ -46,11 +46,6 @@ public interface BookieServerMXBean { public OpStatData getReadStats(); /** - * @return server state - */ - public String getServerState(); - - /** * @return server port */ public String getServerPort(); Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ServerStats.java URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ServerStats.java?rev=1444340&r1=1444339&r2=1444340&view=diff ============================================================================== --- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ServerStats.java (original) +++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ServerStats.java Sat Feb 9 07:59:47 2013 @@ -25,32 +25,10 @@ public class ServerStats { private long totalLatency = 0; private long count = 0; - 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() { } @@ -69,17 +47,6 @@ public class ServerStats { return maxLatency; } - public long getOutstandingRequests() { - synchronized (mutex) { - return (provider != null) ? provider.getOutstandingRequests() : -1; - } - } - - public long getLastProcessedZxid() { - synchronized (mutex) { - return (provider != null) ? provider.getLastProcessedZxid() : -1; - } - } synchronized public long getPacketsReceived() { return packetsReceived; @@ -89,31 +56,15 @@ public class ServerStats { return packetsSent; } - public String getServerState() { - return "standalone"; - } - @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("Latency min/avg/max: " + getMinLatency() + "/" + getAvgLatency() + "/" + getMaxLatency() + "\n"); sb.append("Received: " + getPacketsReceived() + "\n"); sb.append("Sent: " + getPacketsSent() + "\n"); - if (provider != null) { - sb.append("Outstanding: " + getOutstandingRequests() + "\n"); - sb.append("Zxid: 0x" + Long.toHexString(getLastProcessedZxid()) + "\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 = MathUtils.now() - requestCreateTime; totalLatency += latency;