Use mock time for histogram_test (#7799)
Summary: `histogram_test` uses real sleep, which depends on the test executing speed, it makes the test unstable. Switching to using a mock time env, it can also increase the test speed (from 10100ms -> 100ms). Pull Request resolved: https://github.com/facebook/rocksdb/pull/7799 Test Plan: run test 10 times, all passed. vs. without fix 3 out 10 test failed: no fix: https://app.circleci.com/pipelines/github/facebook/rocksdb?branch=pull%2F7797 with fix: https://app.circleci.com/pipelines/github/facebook/rocksdb?branch=pull%2F7799 Reviewed By: pdillinger Differential Revision: D25676948 Pulled By: jay-zhuang fbshipit-source-id: 64c273fc299c53283138dbb213386e4b45e8bdc2
This commit is contained in:
parent
225abffd8f
commit
58660bf21a
@ -3,11 +3,14 @@
|
|||||||
// COPYING file in the root directory) and Apache 2.0 License
|
// COPYING file in the root directory) and Apache 2.0 License
|
||||||
// (found in the LICENSE.Apache file in the root directory).
|
// (found in the LICENSE.Apache file in the root directory).
|
||||||
//
|
//
|
||||||
|
#include "monitoring/histogram.h"
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
#include "monitoring/histogram.h"
|
|
||||||
#include "monitoring/histogram_windowing.h"
|
#include "monitoring/histogram_windowing.h"
|
||||||
|
#include "test_util/mock_time_env.h"
|
||||||
#include "test_util/testharness.h"
|
#include "test_util/testharness.h"
|
||||||
|
#include "util/random.h"
|
||||||
|
|
||||||
namespace ROCKSDB_NAMESPACE {
|
namespace ROCKSDB_NAMESPACE {
|
||||||
|
|
||||||
@ -16,16 +19,21 @@ class HistogramTest : public testing::Test {};
|
|||||||
namespace {
|
namespace {
|
||||||
const double kIota = 0.1;
|
const double kIota = 0.1;
|
||||||
const HistogramBucketMapper bucketMapper;
|
const HistogramBucketMapper bucketMapper;
|
||||||
Env* env = Env::Default();
|
MockTimeEnv* env = new MockTimeEnv(Env::Default());
|
||||||
}
|
}
|
||||||
|
|
||||||
void PopulateHistogram(Histogram& histogram,
|
void PopulateHistogram(Histogram& histogram,
|
||||||
uint64_t low, uint64_t high, uint64_t loop = 1) {
|
uint64_t low, uint64_t high, uint64_t loop = 1) {
|
||||||
|
Random rnd(test::RandomSeed());
|
||||||
for (; loop > 0; loop--) {
|
for (; loop > 0; loop--) {
|
||||||
for (uint64_t i = low; i <= high; i++) {
|
for (uint64_t i = low; i <= high; i++) {
|
||||||
histogram.Add(i);
|
histogram.Add(i);
|
||||||
|
// sleep a random microseconds [0-10)
|
||||||
|
env->MockSleepForMicroseconds(rnd.Uniform(10));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// make sure each data population at least take some time
|
||||||
|
env->MockSleepForMicroseconds(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void BasicOperation(Histogram& histogram) {
|
void BasicOperation(Histogram& histogram) {
|
||||||
@ -131,23 +139,23 @@ TEST_F(HistogramTest, HistogramWindowingExpire) {
|
|||||||
|
|
||||||
HistogramWindowingImpl
|
HistogramWindowingImpl
|
||||||
histogramWindowing(num_windows, micros_per_window, min_num_per_window);
|
histogramWindowing(num_windows, micros_per_window, min_num_per_window);
|
||||||
|
histogramWindowing.TEST_UpdateEnv(env);
|
||||||
PopulateHistogram(histogramWindowing, 1, 1, 100);
|
PopulateHistogram(histogramWindowing, 1, 1, 100);
|
||||||
env->SleepForMicroseconds(micros_per_window);
|
env->MockSleepForMicroseconds(micros_per_window);
|
||||||
ASSERT_EQ(histogramWindowing.num(), 100);
|
ASSERT_EQ(histogramWindowing.num(), 100);
|
||||||
ASSERT_EQ(histogramWindowing.min(), 1);
|
ASSERT_EQ(histogramWindowing.min(), 1);
|
||||||
ASSERT_EQ(histogramWindowing.max(), 1);
|
ASSERT_EQ(histogramWindowing.max(), 1);
|
||||||
ASSERT_EQ(histogramWindowing.Average(), 1);
|
ASSERT_EQ(histogramWindowing.Average(), 1);
|
||||||
|
|
||||||
PopulateHistogram(histogramWindowing, 2, 2, 100);
|
PopulateHistogram(histogramWindowing, 2, 2, 100);
|
||||||
env->SleepForMicroseconds(micros_per_window);
|
env->MockSleepForMicroseconds(micros_per_window);
|
||||||
ASSERT_EQ(histogramWindowing.num(), 200);
|
ASSERT_EQ(histogramWindowing.num(), 200);
|
||||||
ASSERT_EQ(histogramWindowing.min(), 1);
|
ASSERT_EQ(histogramWindowing.min(), 1);
|
||||||
ASSERT_EQ(histogramWindowing.max(), 2);
|
ASSERT_EQ(histogramWindowing.max(), 2);
|
||||||
ASSERT_EQ(histogramWindowing.Average(), 1.5);
|
ASSERT_EQ(histogramWindowing.Average(), 1.5);
|
||||||
|
|
||||||
PopulateHistogram(histogramWindowing, 3, 3, 100);
|
PopulateHistogram(histogramWindowing, 3, 3, 100);
|
||||||
env->SleepForMicroseconds(micros_per_window);
|
env->MockSleepForMicroseconds(micros_per_window);
|
||||||
ASSERT_EQ(histogramWindowing.num(), 300);
|
ASSERT_EQ(histogramWindowing.num(), 300);
|
||||||
ASSERT_EQ(histogramWindowing.min(), 1);
|
ASSERT_EQ(histogramWindowing.min(), 1);
|
||||||
ASSERT_EQ(histogramWindowing.max(), 3);
|
ASSERT_EQ(histogramWindowing.max(), 3);
|
||||||
@ -155,7 +163,7 @@ TEST_F(HistogramTest, HistogramWindowingExpire) {
|
|||||||
|
|
||||||
// dropping oldest window with value 1, remaining 2 ~ 4
|
// dropping oldest window with value 1, remaining 2 ~ 4
|
||||||
PopulateHistogram(histogramWindowing, 4, 4, 100);
|
PopulateHistogram(histogramWindowing, 4, 4, 100);
|
||||||
env->SleepForMicroseconds(micros_per_window);
|
env->MockSleepForMicroseconds(micros_per_window);
|
||||||
ASSERT_EQ(histogramWindowing.num(), 300);
|
ASSERT_EQ(histogramWindowing.num(), 300);
|
||||||
ASSERT_EQ(histogramWindowing.min(), 2);
|
ASSERT_EQ(histogramWindowing.min(), 2);
|
||||||
ASSERT_EQ(histogramWindowing.max(), 4);
|
ASSERT_EQ(histogramWindowing.max(), 4);
|
||||||
@ -163,7 +171,7 @@ TEST_F(HistogramTest, HistogramWindowingExpire) {
|
|||||||
|
|
||||||
// dropping oldest window with value 2, remaining 3 ~ 5
|
// dropping oldest window with value 2, remaining 3 ~ 5
|
||||||
PopulateHistogram(histogramWindowing, 5, 5, 100);
|
PopulateHistogram(histogramWindowing, 5, 5, 100);
|
||||||
env->SleepForMicroseconds(micros_per_window);
|
env->MockSleepForMicroseconds(micros_per_window);
|
||||||
ASSERT_EQ(histogramWindowing.num(), 300);
|
ASSERT_EQ(histogramWindowing.num(), 300);
|
||||||
ASSERT_EQ(histogramWindowing.min(), 3);
|
ASSERT_EQ(histogramWindowing.min(), 3);
|
||||||
ASSERT_EQ(histogramWindowing.max(), 5);
|
ASSERT_EQ(histogramWindowing.max(), 5);
|
||||||
@ -179,18 +187,20 @@ TEST_F(HistogramTest, HistogramWindowingMerge) {
|
|||||||
histogramWindowing(num_windows, micros_per_window, min_num_per_window);
|
histogramWindowing(num_windows, micros_per_window, min_num_per_window);
|
||||||
HistogramWindowingImpl
|
HistogramWindowingImpl
|
||||||
otherWindowing(num_windows, micros_per_window, min_num_per_window);
|
otherWindowing(num_windows, micros_per_window, min_num_per_window);
|
||||||
|
histogramWindowing.TEST_UpdateEnv(env);
|
||||||
|
otherWindowing.TEST_UpdateEnv(env);
|
||||||
|
|
||||||
PopulateHistogram(histogramWindowing, 1, 1, 100);
|
PopulateHistogram(histogramWindowing, 1, 1, 100);
|
||||||
PopulateHistogram(otherWindowing, 1, 1, 100);
|
PopulateHistogram(otherWindowing, 1, 1, 100);
|
||||||
env->SleepForMicroseconds(micros_per_window);
|
env->MockSleepForMicroseconds(micros_per_window);
|
||||||
|
|
||||||
PopulateHistogram(histogramWindowing, 2, 2, 100);
|
PopulateHistogram(histogramWindowing, 2, 2, 100);
|
||||||
PopulateHistogram(otherWindowing, 2, 2, 100);
|
PopulateHistogram(otherWindowing, 2, 2, 100);
|
||||||
env->SleepForMicroseconds(micros_per_window);
|
env->MockSleepForMicroseconds(micros_per_window);
|
||||||
|
|
||||||
PopulateHistogram(histogramWindowing, 3, 3, 100);
|
PopulateHistogram(histogramWindowing, 3, 3, 100);
|
||||||
PopulateHistogram(otherWindowing, 3, 3, 100);
|
PopulateHistogram(otherWindowing, 3, 3, 100);
|
||||||
env->SleepForMicroseconds(micros_per_window);
|
env->MockSleepForMicroseconds(micros_per_window);
|
||||||
|
|
||||||
histogramWindowing.Merge(otherWindowing);
|
histogramWindowing.Merge(otherWindowing);
|
||||||
ASSERT_EQ(histogramWindowing.num(), 600);
|
ASSERT_EQ(histogramWindowing.num(), 600);
|
||||||
@ -200,14 +210,14 @@ TEST_F(HistogramTest, HistogramWindowingMerge) {
|
|||||||
|
|
||||||
// dropping oldest window with value 1, remaining 2 ~ 4
|
// dropping oldest window with value 1, remaining 2 ~ 4
|
||||||
PopulateHistogram(histogramWindowing, 4, 4, 100);
|
PopulateHistogram(histogramWindowing, 4, 4, 100);
|
||||||
env->SleepForMicroseconds(micros_per_window);
|
env->MockSleepForMicroseconds(micros_per_window);
|
||||||
ASSERT_EQ(histogramWindowing.num(), 500);
|
ASSERT_EQ(histogramWindowing.num(), 500);
|
||||||
ASSERT_EQ(histogramWindowing.min(), 2);
|
ASSERT_EQ(histogramWindowing.min(), 2);
|
||||||
ASSERT_EQ(histogramWindowing.max(), 4);
|
ASSERT_EQ(histogramWindowing.max(), 4);
|
||||||
|
|
||||||
// dropping oldest window with value 2, remaining 3 ~ 5
|
// dropping oldest window with value 2, remaining 3 ~ 5
|
||||||
PopulateHistogram(histogramWindowing, 5, 5, 100);
|
PopulateHistogram(histogramWindowing, 5, 5, 100);
|
||||||
env->SleepForMicroseconds(micros_per_window);
|
env->MockSleepForMicroseconds(micros_per_window);
|
||||||
ASSERT_EQ(histogramWindowing.num(), 400);
|
ASSERT_EQ(histogramWindowing.num(), 400);
|
||||||
ASSERT_EQ(histogramWindowing.min(), 3);
|
ASSERT_EQ(histogramWindowing.min(), 3);
|
||||||
ASSERT_EQ(histogramWindowing.max(), 5);
|
ASSERT_EQ(histogramWindowing.max(), 5);
|
||||||
|
@ -44,6 +44,10 @@ public:
|
|||||||
virtual double StandardDeviation() const override;
|
virtual double StandardDeviation() const override;
|
||||||
virtual void Data(HistogramData* const data) const override;
|
virtual void Data(HistogramData* const data) const override;
|
||||||
|
|
||||||
|
#ifndef NDEBUG
|
||||||
|
void TEST_UpdateEnv(Env* env) { env_ = env; }
|
||||||
|
#endif // NDEBUG
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void TimerTick();
|
void TimerTick();
|
||||||
void SwapHistoryBucket();
|
void SwapHistoryBucket();
|
||||||
|
Loading…
Reference in New Issue
Block a user