This is an automated email from the ASF dual-hosted git repository.
ddiederen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 2d30656 ZOOKEEPER-4284: Add metrics for observer sync time
2d30656 is described below
commit 2d3065606a444c0b711c1809ce296db2ba56cb0c
Author: liwang <[email protected]>
AuthorDate: Wed Jun 30 06:53:49 2021 +0000
ZOOKEEPER-4284: Add metrics for observer sync time
Motivation
- With enabling the feature of followers hosting observers, we would need a
metric to measure the observer sync time just like what we have for the
follower sync time.
Changes
- Added the "observer_sync_time" metrics
- Added unit test on the metrics
Author: liwang <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Michael Han
<[email protected]>, Damien Diederen <[email protected]>
Closes #1691 from li4wang/ZOOKEEPER-4284
---
.../java/org/apache/zookeeper/server/ServerMetrics.java | 2 ++
.../java/org/apache/zookeeper/server/quorum/Observer.java | 4 ++++
.../java/org/apache/zookeeper/test/ObserverMasterTest.java | 14 ++++++++++++++
3 files changed, 20 insertions(+)
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerMetrics.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerMetrics.java
index 99e9206..8ef5235 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerMetrics.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/ServerMetrics.java
@@ -75,6 +75,7 @@ public final class ServerMetrics {
UPDATE_LATENCY = metricsContext.getSummary("updatelatency",
DetailLevel.ADVANCED);
PROPAGATION_LATENCY = metricsContext.getSummary("propagation_latency",
DetailLevel.ADVANCED);
FOLLOWER_SYNC_TIME = metricsContext.getSummary("follower_sync_time",
DetailLevel.BASIC);
+ OBSERVER_SYNC_TIME = metricsContext.getSummary("observer_sync_time",
DetailLevel.BASIC);
ELECTION_TIME = metricsContext.getSummary("election_time",
DetailLevel.BASIC);
LOOKING_COUNT = metricsContext.getCounter("looking_count");
DIFF_COUNT = metricsContext.getCounter("diff_count");
@@ -296,6 +297,7 @@ public final class ServerMetrics {
public final Summary PROPAGATION_LATENCY;
public final Summary FOLLOWER_SYNC_TIME;
+ public final Summary OBSERVER_SYNC_TIME;
public final Summary ELECTION_TIME;
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
index 55e273b..d3aa41b 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Observer.java
@@ -23,6 +23,7 @@ import java.nio.ByteBuffer;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.jute.Record;
+import org.apache.zookeeper.common.Time;
import org.apache.zookeeper.server.ObserverBean;
import org.apache.zookeeper.server.Request;
import org.apache.zookeeper.server.ServerMetrics;
@@ -114,11 +115,14 @@ public class Observer extends Learner {
throw new Exception("learned about role change");
}
+ final long startTime = Time.currentElapsedTime();
self.setLeaderAddressAndId(master.addr, master.getId());
self.setZabState(QuorumPeer.ZabState.SYNCHRONIZATION);
syncWithLeader(newLeaderZxid);
self.setZabState(QuorumPeer.ZabState.BROADCAST);
completedSync = true;
+ final long syncTime = Time.currentElapsedTime() - startTime;
+ ServerMetrics.getMetrics().OBSERVER_SYNC_TIME.add(syncTime);
QuorumPacket qp = new QuorumPacket();
while (this.isRunning() && nextLearnerMaster.get() == null) {
readPacket(qp);
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverMasterTest.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverMasterTest.java
index 2d2bea7..4ba33c7 100644
---
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverMasterTest.java
+++
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ObserverMasterTest.java
@@ -55,6 +55,7 @@ import org.apache.zookeeper.ZooKeeper.States;
import org.apache.zookeeper.admin.ZooKeeperAdmin;
import org.apache.zookeeper.jmx.MBeanRegistry;
import org.apache.zookeeper.jmx.ZKMBeanInfo;
+import org.apache.zookeeper.metrics.MetricsUtils;
import org.apache.zookeeper.server.admin.Commands;
import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
import org.apache.zookeeper.server.util.PortForwarder;
@@ -85,6 +86,8 @@ public class ObserverMasterTest extends
ObserverMasterTestBase {
assertTrue(ClientBase.waitForServerUp("127.0.0.1:" + CLIENT_PORT_OBS,
CONNECTION_TIMEOUT),
"waiting for server 3 being up");
+ validateObserverSyncTimeMetrics();
+
if (testObserverMaster) {
int masterPort = q3.getQuorumPeer().observer.getSocket().getPort();
LOG.info("port {} {}", masterPort, OM_PORT);
@@ -522,4 +525,15 @@ public class ObserverMasterTest extends
ObserverMasterTestBase {
}
+ private void validateObserverSyncTimeMetrics() {
+ final String name = "observer_sync_time";
+ final Map<String, Object> metrics =
MetricsUtils.currentServerMetrics();
+
+ assertEquals(5, metrics.keySet().stream().filter(key ->
key.contains(name)).count());
+ assertNotNull(metrics.get(String.format("avg_%s", name)));
+ assertNotNull(metrics.get(String.format("min_%s", name)));
+ assertNotNull(metrics.get(String.format("max_%s", name)));
+ assertNotNull(metrics.get(String.format("cnt_%s", name)));
+ assertNotNull(metrics.get(String.format("sum_%s", name)));
+ }
}
