Skip to content

Commit 7b1f892

Browse files
neethuhaneeshaneethuhaneesha
committed
Changing histogram type.
1 parent d4b1ed0 commit 7b1f892

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

‎fdbclient/ServerKnobs.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi
420420
init( ROCKSDB_ENABLE_COMPACT_ON_DELETION, true );
421421
// CDCF: CompactOnDeletionCollectorFactory. The below 3 are parameters of the CompactOnDeletionCollectorFactory
422422
// which controls the compaction on deleted data.
423-
init( ROCKSDB_CDCF_SILIDING_WINDOW_SIZE, 128 );
423+
init( ROCKSDB_CDCF_SLIDING_WINDOW_SIZE, 128 );
424424
init( ROCKSDB_CDCF_DELETION_TRIGGER, 1 );
425425
init( ROCKSDB_CDCF_DELETION_RATIO, 0 );
426426
// Can commit will delay ROCKSDB_CAN_COMMIT_DELAY_ON_OVERLOAD seconds for

‎fdbclient/ServerKnobs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class ServerKnobs : public KnobsImpl<ServerKnobs> {
339339
int64_t ROCKSDB_SINGLEKEY_DELETES_BYTES_LIMIT;
340340
bool ROCKSDB_ENABLE_CLEAR_RANGE_EAGER_READS;
341341
bool ROCKSDB_ENABLE_COMPACT_ON_DELETION;
342-
int64_t ROCKSDB_CDCF_SILIDING_WINDOW_SIZE; // CDCF: CompactOnDeletionCollectorFactory
342+
int64_t ROCKSDB_CDCF_SLIDING_WINDOW_SIZE; // CDCF: CompactOnDeletionCollectorFactory
343343
int64_t ROCKSDB_CDCF_DELETION_TRIGGER; // CDCF: CompactOnDeletionCollectorFactory
344344
double ROCKSDB_CDCF_DELETION_RATIO; // CDCF: CompactOnDeletionCollectorFactory
345345
int ROCKSDB_STATS_LEVEL;

‎fdbserver/KeyValueStoreRocksDB.actor.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ rocksdb::ColumnFamilyOptions getCFOptions() {
328328
// @param deletion_ratio, if <= 0 or > 1, disable triggering compaction
329329
// based on deletion ratio. Disabled by default.
330330
options.table_properties_collector_factories = { rocksdb::NewCompactOnDeletionCollectorFactory(
331-
SERVER_KNOBS->ROCKSDB_CDCF_SILIDING_WINDOW_SIZE,
331+
SERVER_KNOBS->ROCKSDB_CDCF_SLIDING_WINDOW_SIZE,
332332
SERVER_KNOBS->ROCKSDB_CDCF_DELETION_TRIGGER,
333333
SERVER_KNOBS->ROCKSDB_CDCF_DELETION_RATIO) };
334334
}
@@ -1962,10 +1962,8 @@ struct RocksDBKeyValueStore : IKeyValueStore {
19621962
ROCKSDBSTORAGE_HISTOGRAM_GROUP, ROCKSDB_READPREFIX_GET_HISTOGRAM, Histogram::Unit::microseconds);
19631963
state Reference<Histogram> rocksdbReadRangeBytesReturnedHistogram = Histogram::getHistogram(
19641964
ROCKSDBSTORAGE_HISTOGRAM_GROUP, ROCKSDB_READ_RANGE_BYTES_RETURNED_HISTOGRAM, Histogram::Unit::bytes);
1965-
state Reference<Histogram> rocksdbReadRangeKVPairsReturnedHistogram =
1966-
Histogram::getHistogram(ROCKSDBSTORAGE_HISTOGRAM_GROUP,
1967-
ROCKSDB_READ_RANGE_KV_PAIRS_RETURNED_HISTOGRAM,
1968-
Histogram::Unit::countLinear);
1965+
state Reference<Histogram> rocksdbReadRangeKVPairsReturnedHistogram = Histogram::getHistogram(
1966+
ROCKSDBSTORAGE_HISTOGRAM_GROUP, ROCKSDB_READ_RANGE_KV_PAIRS_RETURNED_HISTOGRAM, Histogram::Unit::bytes);
19691967
loop {
19701968
choose {
19711969
when(std::tuple<int, std::string, double> measure = waitNext(metricFutureStream)) {
@@ -2008,7 +2006,7 @@ struct RocksDBKeyValueStore : IKeyValueStore {
20082006
} else if (metricName == ROCKSDB_READ_RANGE_BYTES_RETURNED_HISTOGRAM.toString()) {
20092007
rocksdbReadRangeBytesReturnedHistogram->sample(metricValue);
20102008
} else if (metricName == ROCKSDB_READ_RANGE_KV_PAIRS_RETURNED_HISTOGRAM.toString()) {
2011-
rocksdbReadRangeKVPairsReturnedHistogram->sampleRecordCounter(metricValue);
2009+
rocksdbReadRangeKVPairsReturnedHistogram->sample(metricValue);
20122010
} else {
20132011
UNREACHABLE();
20142012
}

‎fdbserver/storageserver.actor.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ struct StorageServer {
11031103
Histogram::Unit::bytes)),
11041104
readRangeKVPairsReturnedHistogram(Histogram::getHistogram(STORAGESERVER_HISTOGRAM_GROUP,
11051105
SS_READ_RANGE_KV_PAIRS_RETURNED_HISTOGRAM,
1106-
Histogram::Unit::countLinear)),
1106+
Histogram::Unit::bytes)),
11071107
tag(invalidTag), poppedAllAfter(std::numeric_limits<Version>::max()), cpuUsage(0.0), diskUsage(0.0),
11081108
storage(this, storage), shardChangeCounter(0), lastTLogVersion(0), lastVersionWithData(0), restoredVersion(0),
11091109
prevVersion(0), rebootAfterDurableVersion(std::numeric_limits<Version>::max()),
@@ -3195,7 +3195,7 @@ ACTOR Future<GetKeyValuesReply> readRange(StorageServer* data,
31953195
}
31963196
}
31973197
data->readRangeBytesReturnedHistogram->sample(resultLogicalSize);
3198-
data->readRangeKVPairsReturnedHistogram->sampleRecordCounter(result.data.size());
3198+
data->readRangeKVPairsReturnedHistogram->sample(result.data.size());
31993199

32003200
// all but the last item are less than *pLimitBytes
32013201
ASSERT(result.data.size() == 0 || *pLimitBytes + result.data.end()[-1].expectedSize() + sizeof(KeyValueRef) > 0);

0 commit comments

Comments
 (0)