diff --git a/fdbclient/ServerKnobs.cpp b/fdbclient/ServerKnobs.cpp index 7d10216364..815f1468c8 100644 --- a/fdbclient/ServerKnobs.cpp +++ b/fdbclient/ServerKnobs.cpp @@ -181,7 +181,7 @@ void ServerKnobs::initialize(Randomize randomize, ClientKnobs* clientKnobs, IsSi /* The bytesRead/byteSize radio. Will be declared as read hot when larger than this. 8.0 was chosen to avoid reporting table scan as read hot. */ - init ( SHARD_READ_HOT_BANDWITH_MIN_PER_KSECONDS, 1666667 * 1000); + init ( SHARD_READ_HOT_BANDWIDTH_MIN_PER_KSECONDS, 1666667 * 1000); /* The read bandwidth of a given shard needs to be larger than this value in order to be evaluated if it's read hot. The roughly 1.67MB per second is calculated as following: - Heuristic data suggests that each storage process can do max 500K read operations per second diff --git a/fdbclient/ServerKnobs.h b/fdbclient/ServerKnobs.h index db0525899b..4b66bed6cb 100644 --- a/fdbclient/ServerKnobs.h +++ b/fdbclient/ServerKnobs.h @@ -177,7 +177,7 @@ public: SHARD_MIN_BYTES_PER_KSEC, // Shards with more than this bandwidth will not be merged SHARD_SPLIT_BYTES_PER_KSEC; // When splitting a shard, it is split into pieces with less than this bandwidth double SHARD_MAX_READ_DENSITY_RATIO; - int64_t SHARD_READ_HOT_BANDWITH_MIN_PER_KSECONDS; + int64_t SHARD_READ_HOT_BANDWIDTH_MIN_PER_KSECONDS; double SHARD_MAX_BYTES_READ_PER_KSEC_JITTER; double STORAGE_METRIC_TIMEOUT; double METRIC_DELAY; diff --git a/fdbserver/DataDistributionTracker.actor.cpp b/fdbserver/DataDistributionTracker.actor.cpp index 140ededf82..3e0a9e52af 100644 --- a/fdbserver/DataDistributionTracker.actor.cpp +++ b/fdbserver/DataDistributionTracker.actor.cpp @@ -43,7 +43,7 @@ BandwidthStatus getBandwidthStatus(StorageMetrics const& metrics) { } ReadBandwidthStatus getReadBandwidthStatus(StorageMetrics const& metrics) { - if (metrics.bytesReadPerKSecond <= SERVER_KNOBS->SHARD_READ_HOT_BANDWITH_MIN_PER_KSECONDS || + if (metrics.bytesReadPerKSecond <= SERVER_KNOBS->SHARD_READ_HOT_BANDWIDTH_MIN_PER_KSECONDS || metrics.bytesReadPerKSecond <= SERVER_KNOBS->SHARD_MAX_READ_DENSITY_RATIO * metrics.bytes * SERVER_KNOBS->STORAGE_METRICS_AVERAGE_INTERVAL_PER_KSECONDS) { return ReadBandwidthStatusNormal; @@ -238,7 +238,7 @@ ACTOR Future trackShardMetrics(DataDistributionTracker::SafeAccessor self, std::max((int64_t)(SERVER_KNOBS->SHARD_MAX_READ_DENSITY_RATIO * bytes * SERVER_KNOBS->STORAGE_METRICS_AVERAGE_INTERVAL_PER_KSECONDS * (1.0 + SERVER_KNOBS->SHARD_MAX_BYTES_READ_PER_KSEC_JITTER)), - SERVER_KNOBS->SHARD_READ_HOT_BANDWITH_MIN_PER_KSECONDS); + SERVER_KNOBS->SHARD_READ_HOT_BANDWIDTH_MIN_PER_KSECONDS); bounds.min.bytesReadPerKSecond = 0; bounds.permittedError.bytesReadPerKSecond = bounds.min.bytesReadPerKSecond / 4; } else if (readBandwidthStatus == ReadBandwidthStatusHigh) { @@ -291,7 +291,7 @@ ACTOR Future trackShardMetrics(DataDistributionTracker::SafeAccessor self, .detail("Keys", keys) .detail("UpdatedSize", metrics.metrics.bytes) .detail("Bandwidth", metrics.metrics.bytesPerKSecond) - .detail("BandwithStatus", getBandwidthStatus(metrics)) + .detail("BandwidthStatus", getBandwidthStatus(metrics)) .detail("BytesLower", bounds.min.bytes) .detail("BytesUpper", bounds.max.bytes) .detail("BandwidthLower", bounds.min.bytesPerKSecond) diff --git a/fdbserver/StorageMetrics.h b/fdbserver/StorageMetrics.h index 35da5e14f5..23b495eb1c 100644 --- a/fdbserver/StorageMetrics.h +++ b/fdbserver/StorageMetrics.h @@ -532,7 +532,7 @@ struct StorageServerMetrics { auto _ranges = getReadHotRanges(req.keys, SERVER_KNOBS->SHARD_MAX_READ_DENSITY_RATIO, SERVER_KNOBS->READ_HOT_SUB_RANGE_CHUNK_SIZE, - SERVER_KNOBS->SHARD_READ_HOT_BANDWITH_MIN_PER_KSECONDS); + SERVER_KNOBS->SHARD_READ_HOT_BANDWIDTH_MIN_PER_KSECONDS); reply.readHotRanges = VectorRef(_ranges.data(), _ranges.size()); req.reply.send(reply); } diff --git a/fdbserver/workloads/ReadHotDetection.actor.cpp b/fdbserver/workloads/ReadHotDetection.actor.cpp index e5b15ef04d..251c1f90f4 100644 --- a/fdbserver/workloads/ReadHotDetection.actor.cpp +++ b/fdbserver/workloads/ReadHotDetection.actor.cpp @@ -101,7 +101,7 @@ struct ReadHotDetectionWorkload : TestWorkload { StorageMetrics sm = wait(cx->getStorageMetrics(self->wholeRange, 100)); // TraceEvent("RHDCheckPhaseLog") // .detail("KeyRangeSize", sm.bytes) - // .detail("KeyRangeReadBandwith", sm.bytesReadPerKSecond); + // .detail("KeyRangeReadBandwidth", sm.bytesReadPerKSecond); Standalone> keyRanges = wait(cx->getReadHotRanges(self->wholeRange)); // TraceEvent("RHDCheckPhaseLog") // .detail("KeyRangesSize", keyRanges.size())