cadonna commented on code in PR #12459:
URL: https://github.com/apache/kafka/pull/12459#discussion_r958391930
##########
streams/src/test/java/org/apache/kafka/streams/state/internals/metrics/RocksDBMetricsRecorderTest.java:
##########
@@ -381,157 +395,115 @@ public void
shouldThrowIfValueProvidersToRemoveNotFound() {
public void shouldRecordStatisticsBasedMetrics() {
recorder.addValueProviders(SEGMENT_STORE_NAME_1, dbToAdd1,
cacheToAdd1, statisticsToAdd1);
recorder.addValueProviders(SEGMENT_STORE_NAME_2, dbToAdd2,
cacheToAdd2, statisticsToAdd2);
- reset(statisticsToAdd1);
- reset(statisticsToAdd2);
-
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).andReturn(1L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).andReturn(2L);
- bytesWrittenToDatabaseSensor.record(1 + 2, 0L);
- replay(bytesWrittenToDatabaseSensor);
-
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_READ)).andReturn(2L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_READ)).andReturn(3L);
- bytesReadFromDatabaseSensor.record(2 + 3, 0L);
- replay(bytesReadFromDatabaseSensor);
-
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).andReturn(3L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).andReturn(4L);
- memtableBytesFlushedSensor.record(3 + 4, 0L);
- replay(memtableBytesFlushedSensor);
-
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).andReturn(1L);
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).andReturn(2L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).andReturn(3L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).andReturn(4L);
- memtableHitRatioSensor.record((double) 4 / (4 + 6), 0L);
- replay(memtableHitRatioSensor);
+ final long now = 0L;
+
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).thenReturn(1L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_WRITTEN)).thenReturn(2L);
+ final double expectedBytesWrittenToDatabaseSensor = 1 + 2;
+
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.BYTES_READ)).thenReturn(2L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.BYTES_READ)).thenReturn(3L);
+ final double expectedBytesReadFromDatabaseSensor = 2 + 3;
+
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).thenReturn(3L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.FLUSH_WRITE_BYTES)).thenReturn(4L);
+ final double expectedMemtableBytesFlushedSensor = 3 + 4;
+
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).thenReturn(1L);
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).thenReturn(2L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_HIT)).thenReturn(3L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.MEMTABLE_MISS)).thenReturn(4L);
+ final double expectedMemtableHitRatioSensorRecord = (double) 4 / (4 +
6);
final HistogramData memtableFlushTimeData1 = new HistogramData(0.0,
0.0, 0.0, 0.0, 0.0, 16.0, 2L, 10L, 3.0);
final HistogramData memtableFlushTimeData2 = new HistogramData(0.0,
0.0, 0.0, 0.0, 0.0, 20.0, 4L, 8L, 10.0);
-
expect(statisticsToAdd1.getHistogramData(HistogramType.FLUSH_TIME)).andReturn(memtableFlushTimeData1);
-
expect(statisticsToAdd2.getHistogramData(HistogramType.FLUSH_TIME)).andReturn(memtableFlushTimeData2);
- memtableAvgFlushTimeSensor.record((double) (10 + 8) / (2 + 4), 0L);
- replay(memtableAvgFlushTimeSensor);
- memtableMinFlushTimeSensor.record(3.0, 0L);
- replay(memtableMinFlushTimeSensor);
- memtableMaxFlushTimeSensor.record(20.0, 0L);
- replay(memtableMaxFlushTimeSensor);
-
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.STALL_MICROS)).andReturn(4L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.STALL_MICROS)).andReturn(5L);
- writeStallDurationSensor.record(4 + 5, 0L);
- replay(writeStallDurationSensor);
-
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).andReturn(5L);
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).andReturn(4L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).andReturn(3L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).andReturn(2L);
- blockCacheDataHitRatioSensor.record((double) 8 / (8 + 6), 0L);
- replay(blockCacheDataHitRatioSensor);
-
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).andReturn(4L);
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).andReturn(2L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).andReturn(2L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).andReturn(4L);
- blockCacheIndexHitRatioSensor.record((double) 6 / (6 + 6), 0L);
- replay(blockCacheIndexHitRatioSensor);
-
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).andReturn(2L);
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).andReturn(4L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).andReturn(3L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).andReturn(5L);
- blockCacheFilterHitRatioSensor.record((double) 5 / (5 + 9), 0L);
- replay(blockCacheFilterHitRatioSensor);
-
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).andReturn(2L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).andReturn(4L);
- bytesWrittenDuringCompactionSensor.record(2 + 4, 0L);
- replay(bytesWrittenDuringCompactionSensor);
-
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).andReturn(5L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).andReturn(6L);
- bytesReadDuringCompactionSensor.record(5 + 6, 0L);
- replay(bytesReadDuringCompactionSensor);
+
when(statisticsToAdd1.getHistogramData(HistogramType.FLUSH_TIME)).thenReturn(memtableFlushTimeData1);
+
when(statisticsToAdd2.getHistogramData(HistogramType.FLUSH_TIME)).thenReturn(memtableFlushTimeData2);
+ final double expectedMemtableAvgFlushTimeSensor = (double) (10 + 8) /
(2 + 4);
+ final double expectedMemtableMinFlushTimeSensor = 3.0d;
+ final double expectedMemtableMaxFlushTimeSensor = 20.0d;
+
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.STALL_MICROS)).thenReturn(4L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.STALL_MICROS)).thenReturn(5L);
+ final double expectedWriteStallDurationSensor = 4 + 5;
+
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).thenReturn(5L);
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).thenReturn(4L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_HIT)).thenReturn(3L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_DATA_MISS)).thenReturn(2L);
+ final double expectedBlockCacheDataHitRatioSensor = (double) 8 / (8 +
6);
+
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).thenReturn(4L);
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).thenReturn(2L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_HIT)).thenReturn(2L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_INDEX_MISS)).thenReturn(4L);
+ final double expectedBlockCacheIndexHitRatioSensor = (double) 6 / (6 +
6);
+
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).thenReturn(2L);
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).thenReturn(4L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_HIT)).thenReturn(3L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.BLOCK_CACHE_FILTER_MISS)).thenReturn(5L);
+ final double expectedBlockCacheFilterHitRatioSensor = (double) 5 / (5
+ 9);
+
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).thenReturn(2L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_WRITE_BYTES)).thenReturn(4L);
+ final double expectedBytesWrittenDuringCompactionSensor = 2 + 4;
+
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).thenReturn(5L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.COMPACT_READ_BYTES)).thenReturn(6L);
+ final double expectedBytesReadDuringCompactionSensor = 5 + 6;
final HistogramData compactionTimeData1 = new HistogramData(0.0, 0.0,
0.0, 0.0, 0.0, 16.0, 2L, 8L, 6.0);
final HistogramData compactionTimeData2 = new HistogramData(0.0, 0.0,
0.0, 0.0, 0.0, 24.0, 2L, 8L, 4.0);
-
expect(statisticsToAdd1.getHistogramData(HistogramType.COMPACTION_TIME)).andReturn(compactionTimeData1);
-
expect(statisticsToAdd2.getHistogramData(HistogramType.COMPACTION_TIME)).andReturn(compactionTimeData2);
- compactionTimeAvgSensor.record((double) (8 + 8) / (2 + 2), 0L);
- replay(compactionTimeAvgSensor);
- compactionTimeMinSensor.record(4.0, 0L);
- replay(compactionTimeMinSensor);
- compactionTimeMaxSensor.record(24.0, 0L);
- replay(compactionTimeMaxSensor);
-
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).andReturn(5L);
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).andReturn(3L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).andReturn(7L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).andReturn(4L);
- numberOfOpenFilesSensor.record((5 + 7) - (3 + 4), 0L);
- replay(numberOfOpenFilesSensor);
-
-
expect(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).andReturn(34L);
-
expect(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).andReturn(11L);
- numberOfFileErrorsSensor.record(11 + 34, 0L);
- replay(numberOfFileErrorsSensor);
-
- replay(statisticsToAdd1);
- replay(statisticsToAdd2);
-
- recorder.record(0L);
-
- verify(statisticsToAdd1);
- verify(statisticsToAdd2);
- verify(
- bytesWrittenToDatabaseSensor,
- bytesReadFromDatabaseSensor,
- memtableBytesFlushedSensor,
- memtableHitRatioSensor,
- memtableAvgFlushTimeSensor,
- memtableMinFlushTimeSensor,
- memtableMaxFlushTimeSensor,
- writeStallDurationSensor,
- blockCacheDataHitRatioSensor,
- blockCacheIndexHitRatioSensor,
- blockCacheFilterHitRatioSensor,
- bytesWrittenDuringCompactionSensor,
- bytesReadDuringCompactionSensor,
- compactionTimeAvgSensor,
- compactionTimeMinSensor,
- compactionTimeMaxSensor,
- numberOfOpenFilesSensor,
- numberOfFileErrorsSensor
- );
+
when(statisticsToAdd1.getHistogramData(HistogramType.COMPACTION_TIME)).thenReturn(compactionTimeData1);
+
when(statisticsToAdd2.getHistogramData(HistogramType.COMPACTION_TIME)).thenReturn(compactionTimeData2);
+ final double expectedCompactionTimeAvgSensor = (double) (8 + 8) / (2 +
2);
+ final double expectedCompactionTimeMinSensor = 4.0;
+ final double expectedCompactionTimeMaxSensor = 24.0;
+
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).thenReturn(5L);
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).thenReturn(3L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_OPENS)).thenReturn(7L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_CLOSES)).thenReturn(4L);
+ final double expectedNumberOfOpenFilesSensor = (5 + 7) - (3 + 4);
+
+
when(statisticsToAdd1.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).thenReturn(34L);
+
when(statisticsToAdd2.getAndResetTickerCount(TickerType.NO_FILE_ERRORS)).thenReturn(11L);
+ final double expectedNumberOfFileErrorsSensor = 11 + 34;
+
+ recorder.record(now);
+
+ verify(statisticsToAdd1,
times(17)).getAndResetTickerCount(isA(TickerType.class));
+ verify(statisticsToAdd2,
times(17)).getAndResetTickerCount(isA(TickerType.class));
+ verify(statisticsToAdd2,
times(2)).getHistogramData(isA(HistogramType.class));
Review Comment:
I think this should be `statisticsToAdd1` instead of `statisticsToAdd2`.
Otherwise we would verify twice the same calls - here and in the next line.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
