Skip to content

Commit 88bdd6d

Browse files
authored
Set default MaxNumOfSlowDisks for HDD to 1 (#11807)
1 parent 7bf1812 commit 88bdd6d

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

ydb/core/blobstorage/common/immediate_control_defaults.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,7 @@ TControlWrapper PredictedDelayMultiplierDefaultControl =
1111
TControlWrapper MaxNumOfSlowDisksDefaultControl =
1212
TControlWrapper(DefaultMaxNumOfSlowDisks, 1, 2);
1313

14+
TControlWrapper MaxNumOfSlowDisksHDDDefaultControl =
15+
TControlWrapper(DefaultMaxNumOfSlowDisksHDD, 1, 2);
16+
1417
} // namespace NKikimr

ydb/core/blobstorage/common/immediate_control_defaults.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ constexpr bool DefaultEnableVPatch = false;
1111
constexpr float DefaultSlowDiskThreshold = 2;
1212
constexpr float DefaultPredictedDelayMultiplier = 1;
1313
constexpr ui32 DefaultMaxNumOfSlowDisks = 2;
14+
constexpr ui32 DefaultMaxNumOfSlowDisksHDD = 1;
1415

1516
extern TControlWrapper SlowDiskThresholdDefaultControl;
1617
extern TControlWrapper PredictedDelayMultiplierDefaultControl;
1718
extern TControlWrapper MaxNumOfSlowDisksDefaultControl;
19+
extern TControlWrapper MaxNumOfSlowDisksHDDDefaultControl;
1820
}

ydb/core/blobstorage/dsproxy/dsproxy.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,10 @@ struct TBlobStorageProxyControlWrappers {
842842
// Acceleration parameters
843843
DEVICE_TYPE_SEPECIFIC_MEMORIZABLE_CONTROLS(SlowDiskThreshold);
844844
DEVICE_TYPE_SEPECIFIC_MEMORIZABLE_CONTROLS(PredictedDelayMultiplier);
845-
DEVICE_TYPE_SEPECIFIC_MEMORIZABLE_CONTROLS(MaxNumOfSlowDisks);
845+
846+
TMemorizableControlWrapper MaxNumOfSlowDisks = MaxNumOfSlowDisksDefaultControl;
847+
TMemorizableControlWrapper MaxNumOfSlowDisksHDD = MaxNumOfSlowDisksHDDDefaultControl;
848+
TMemorizableControlWrapper MaxNumOfSlowDisksSSD = MaxNumOfSlowDisksDefaultControl;
846849

847850
#undef DEVICE_TYPE_SEPECIFIC_MEMORIZABLE_CONTROLS
848851

ydb/core/blobstorage/nodewarden/node_warden_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ namespace NKikimr::NStorage {
188188
, PredictedDelayMultiplierHDD(std::round(DefaultPredictedDelayMultiplier * 1000), 0, 1'000'000)
189189
, PredictedDelayMultiplierSSD(std::round(DefaultPredictedDelayMultiplier * 1000), 0, 1'000'000)
190190
, MaxNumOfSlowDisks(DefaultMaxNumOfSlowDisks, 1, 2)
191-
, MaxNumOfSlowDisksHDD(DefaultMaxNumOfSlowDisks, 1, 2)
191+
, MaxNumOfSlowDisksHDD(DefaultMaxNumOfSlowDisksHDD, 1, 2)
192192
, MaxNumOfSlowDisksSSD(DefaultMaxNumOfSlowDisks, 1, 2)
193193
{
194194
Y_ABORT_UNLESS(Cfg->BlobStorageConfig.GetServiceSet().AvailabilityDomainsSize() <= 1);

ydb/core/protos/config.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,7 @@ message TImmediateControlsConfig {
13491349
Description: "Maximum number of slow disks, which DSProxy can skip with Accelerations, option for HDD",
13501350
MinValue: 1,
13511351
MaxValue: 2,
1352-
DefaultValue: 2 }];
1352+
DefaultValue: 1 }];
13531353

13541354
optional uint64 SlowDiskThresholdSSD = 9 [(ControlOptions) = {
13551355
Description: "The minimum ratio of slowest and second slowest disks, required to accelerate, promille, option for SSD",

0 commit comments

Comments
 (0)