From commits-return-7817-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Tue May 28 13:55:30 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id B986718067E for ; Tue, 28 May 2019 15:55:29 +0200 (CEST) Received: (qmail 36781 invoked by uid 500); 28 May 2019 13:55:28 -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@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 36769 invoked by uid 99); 28 May 2019 13:55:28 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 May 2019 13:55:28 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 29A228A130; Tue, 28 May 2019 13:55:28 +0000 (UTC) Date: Tue, 28 May 2019 13:55:28 +0000 To: "commits@zookeeper.apache.org" Subject: [zookeeper] branch master updated: ZOOKEEPER-3401: Fix metric PROPOSAL_ACK_CREATION_LATENCY MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155905172803.16174.17671421692636782594@gitbox.apache.org> From: nkalmar@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: zookeeper X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d713419bde97374a2d1b1cbe51fcb17b4416a196 X-Git-Newrev: bb94aa44de61bfb2ecd5bbd12b4eb390c2cf39c1 X-Git-Rev: bb94aa44de61bfb2ecd5bbd12b4eb390c2cf39c1 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. nkalmar 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 bb94aa4 ZOOKEEPER-3401: Fix metric PROPOSAL_ACK_CREATION_LATENCY bb94aa4 is described below commit bb94aa44de61bfb2ecd5bbd12b4eb390c2cf39c1 Author: Jie Huang AuthorDate: Tue May 28 15:55:11 2019 +0200 ZOOKEEPER-3401: Fix metric PROPOSAL_ACK_CREATION_LATENCY Author: Jie Huang Reviewers: Enrico Olivelli , Norbert Kalmar Closes #957 from jhuan31/ZOOKEEPER-3401 --- .../org/apache/zookeeper/server/quorum/AckRequestProcessor.java | 7 +++++-- .../org/apache/zookeeper/server/quorum/LearnerMetricsTest.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/AckRequestProcessor.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/AckRequestProcessor.java index 8e7e472..9d4188d 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/AckRequestProcessor.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/AckRequestProcessor.java @@ -18,6 +18,7 @@ package org.apache.zookeeper.server.quorum; +import org.apache.zookeeper.server.ServerMetrics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,10 +43,12 @@ class AckRequestProcessor implements RequestProcessor { */ public void processRequest(Request request) { QuorumPeer self = leader.self; - if(self != null) + if(self != null) { + request.logLatency(ServerMetrics.getMetrics().PROPOSAL_ACK_CREATION_LATENCY); leader.processAck(self.getId(), request.zxid, null); - else + } else { LOG.error("Null QuorumPeer"); + } } public void shutdown() { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerMetricsTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerMetricsTest.java index 8895f1f..85bbe31 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerMetricsTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/LearnerMetricsTest.java @@ -81,7 +81,7 @@ public class LearnerMetricsTest extends QuorumPeerTestBase { Assert.assertEquals(8L, values.get("learner_proposal_received_count")); Assert.assertEquals(8L, values.get("cnt_proposal_latency")); Assert.assertThat((long)values.get("min_proposal_latency"), greaterThan(0L)); - Assert.assertEquals(8L, values.get("cnt_proposal_ack_creation_latency")); + Assert.assertEquals(10L, values.get("cnt_proposal_ack_creation_latency")); Assert.assertThat((long)values.get("min_proposal_ack_creation_latency"), greaterThan(0L)); // there are five learners, each received two commits, one for leader election, one for the create request