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 2013/06/06 19:42:42 UTC
svn commit: r1490376 - in /zookeeper/bookkeeper/branches/branch-4.2: ./
bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/
Author: ivank
Date: Thu Jun 6 17:42:42 2013
New Revision: 1490376
URL: http://svn.apache.org/r1490376
Log:
BOOKKEEPER-556: BookieServerMXBean#getServerState makes no sense (ivank)
Modified:
zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerBean.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerMXBean.java
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ServerStats.java
Modified: zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt?rev=1490376&r1=1490375&r2=1490376&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt Thu Jun 6 17:42:42 2013
@@ -1,3 +1,15 @@
+Release 4.2.2 - Unreleased
+
+ Backward compatible changes:
+
+ BUGFIXES:
+
+ bookkeeper-server:
+
+ BOOKKEEPER-556: BookieServerMXBean#getServerState makes no sense (ivank)
+
+ BOOKKEEPER-583: Read from a ReadOnlyBookie fails if index fileinfo is not in ledger cache (vinay via sijie)
+
Release 4.2.1 - 2013-02-19
Backward compatible changes:
@@ -18,12 +30,6 @@ Release 4.2.1 - 2013-02-19
BOOKKEEPER-569: Critical performance bug in InterleavedLedgerStorage (ivank via fpj)
- IMPROVEMENTS:
-
- bookkeeper-server:
-
- BOOKKEEPER-583: Read from a ReadOnlyBookie fails if index fileinfo is not in ledger cache (vinay via sijie)
-
Release 4.2.0 - 2013-01-14
Non-backward compatible changes:
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerBean.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerBean.java?rev=1490376&r1=1490375&r2=1490376&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerBean.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerBean.java Thu Jun 6 17:42:42 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/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerMXBean.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerMXBean.java?rev=1490376&r1=1490375&r2=1490376&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerMXBean.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieServerMXBean.java Thu Jun 6 17:42:42 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/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ServerStats.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ServerStats.java?rev=1490376&r1=1490375&r2=1490376&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ServerStats.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ServerStats.java Thu Jun 6 17:42:42 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;