From 678cab39e123078e118fbd7eb4bb5b8c8e630ab5 Mon Sep 17 00:00:00 2001
From: Chengyang He <Aaron-He@users.noreply.github.com>
Date: Mon, 13 Jan 2020 17:11:55 +0800
Subject: [PATCH] [ISSUE #1656] Fix StatsItem bug (#1704)

Fix bug: The stats data could be inaccurate of first minute/hour/day
---
 .../rocketmq/common/stats/StatsItem.java      |  9 ++++++
 .../common/stats/StatsItemSetTest.java        | 29 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/common/src/main/java/org/apache/rocketmq/common/stats/StatsItem.java b/common/src/main/java/org/apache/rocketmq/common/stats/StatsItem.java
index bd575bab..6304ea2c 100644
--- a/common/src/main/java/org/apache/rocketmq/common/stats/StatsItem.java
+++ b/common/src/main/java/org/apache/rocketmq/common/stats/StatsItem.java
@@ -152,6 +152,9 @@ public class StatsItem {
 
     public void samplingInSeconds() {
         synchronized (this.csListMinute) {
+            if (this.csListMinute.size() == 0) {
+                this.csListMinute.add(new CallSnapshot(System.currentTimeMillis() - 10 * 1000, 0, 0));
+            }
             this.csListMinute.add(new CallSnapshot(System.currentTimeMillis(), this.times.get(), this.value
                 .get()));
             if (this.csListMinute.size() > 7) {
@@ -162,6 +165,9 @@ public class StatsItem {
 
     public void samplingInMinutes() {
         synchronized (this.csListHour) {
+            if (this.csListHour.size() == 0) {
+                this.csListHour.add(new CallSnapshot(System.currentTimeMillis() - 10 * 60 * 1000, 0, 0));
+            }
             this.csListHour.add(new CallSnapshot(System.currentTimeMillis(), this.times.get(), this.value
                 .get()));
             if (this.csListHour.size() > 7) {
@@ -172,6 +178,9 @@ public class StatsItem {
 
     public void samplingInHour() {
         synchronized (this.csListDay) {
+            if (this.csListDay.size() == 0) {
+                this.csListDay.add(new CallSnapshot(System.currentTimeMillis() - 1 * 60 * 60 * 1000, 0, 0));
+            }
             this.csListDay.add(new CallSnapshot(System.currentTimeMillis(), this.times.get(), this.value
                 .get()));
             if (this.csListDay.size() > 25) {
diff --git a/common/src/test/java/org/apache/rocketmq/common/stats/StatsItemSetTest.java b/common/src/test/java/org/apache/rocketmq/common/stats/StatsItemSetTest.java
index bd6550d7..4b4a8676 100644
--- a/common/src/test/java/org/apache/rocketmq/common/stats/StatsItemSetTest.java
+++ b/common/src/test/java/org/apache/rocketmq/common/stats/StatsItemSetTest.java
@@ -44,6 +44,35 @@ public class StatsItemSetTest {
         assertEquals(10, test_unit_moment().longValue());
     }
 
+    @Test
+    public void test_statsOfFirstStatisticsCycle() throws InterruptedException {
+        final StatsItemSet statsItemSet = new StatsItemSet("topicTest", scheduler, null);
+        executor = new ThreadPoolExecutor(10, 20, 10, TimeUnit.SECONDS,
+            new ArrayBlockingQueue<Runnable>(100), new ThreadFactoryImpl("testMultiThread"));
+        for (int i = 0; i < 10; i++) {
+            executor.submit(new Runnable() {
+                @Override
+                public void run() {
+                    statsItemSet.addValue("topicTest", 2, 1);
+                }
+            });
+        }
+        while (true) {
+            if (executor.getCompletedTaskCount() == 10) {
+                break;
+            }
+            Thread.sleep(1000);
+        }
+        // simulate schedule task execution
+        statsItemSet.getStatsItem("topicTest").samplingInSeconds();
+        statsItemSet.getStatsItem("topicTest").samplingInMinutes();
+        statsItemSet.getStatsItem("topicTest").samplingInHour();
+
+        assertEquals(20L, statsItemSet.getStatsDataInMinute("topicTest").getSum());
+        assertEquals(20L, statsItemSet.getStatsDataInHour("topicTest").getSum());
+        assertEquals(20L, statsItemSet.getStatsDataInDay("topicTest").getSum());
+    }
+
     private AtomicLong test_unit() throws InterruptedException {
         final StatsItemSet statsItemSet = new StatsItemSet("topicTest", scheduler, null);
         executor = new ThreadPoolExecutor(10, 20, 10, TimeUnit.SECONDS,
-- 
GitLab