FLUME-2844. SpillableMemoryChannel must start ChannelCounter

Reviewed by Bessenyei Balázs Donát (Denes Arvay via Mike Percy)
mzav · Aug 17, 2016 · 118d5a4 · 118d5a4
1 parent b6dede8
commit 118d5a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/...illable-memory-channel/src/main/java/org/apache/flume/channel/SpillableMemoryChannel.java b/...illable-memory-channel/src/main/java/org/apache/flume/channel/SpillableMemoryChannel.java
@@ -790,6 +790,7 @@ public synchronized void start() {
       drainOrder.putOverflow(overFlowCount);
       totalStored.release(overFlowCount);
     }
+    channelCounter.start();
     int totalCount = overFlowCount + memQueue.size();
     channelCounter.setChannelCapacity(memoryCapacity + getOverflowCapacity());
     channelCounter.setChannelSize(totalCount);

diff --git a/...ble-memory-channel/src/test/java/org/apache/flume/channel/TestSpillableMemoryChannel.java b/...ble-memory-channel/src/test/java/org/apache/flume/channel/TestSpillableMemoryChannel.java
@@ -682,6 +682,9 @@ public void testCounters() throws InterruptedException {
     params.put("overflowTimeout", "0");
     startChannel(params);
 
+    Assert.assertTrue("channel.channelCounter should have started",
+        channel.channelCounter.getStartTime() > 0);
+
     //1. fill up mem queue
     Thread sourceThd = makePutThread("src", 1, 5000, 2500, channel);
     sourceThd.start();