Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ydb/core/blobstorage/common/immediate_control_defaults.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,7 @@ TControlWrapper PredictedDelayMultiplierDefaultControl =
TControlWrapper MaxNumOfSlowDisksDefaultControl =
TControlWrapper(DefaultMaxNumOfSlowDisks, 1, 2);

TControlWrapper MaxNumOfSlowDisksHDDDefaultControl =
TControlWrapper(DefaultMaxNumOfSlowDisksHDD, 1, 2);

} // namespace NKikimr
2 changes: 2 additions & 0 deletions ydb/core/blobstorage/common/immediate_control_defaults.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ constexpr bool DefaultEnableVPatch = false;
constexpr float DefaultSlowDiskThreshold = 2;
constexpr float DefaultPredictedDelayMultiplier = 1;
constexpr ui32 DefaultMaxNumOfSlowDisks = 2;
constexpr ui32 DefaultMaxNumOfSlowDisksHDD = 1;

extern TControlWrapper SlowDiskThresholdDefaultControl;
extern TControlWrapper PredictedDelayMultiplierDefaultControl;
extern TControlWrapper MaxNumOfSlowDisksDefaultControl;
extern TControlWrapper MaxNumOfSlowDisksHDDDefaultControl;
}
5 changes: 4 additions & 1 deletion ydb/core/blobstorage/dsproxy/dsproxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,10 @@ struct TBlobStorageProxyControlWrappers {
// Acceleration parameters
DEVICE_TYPE_SEPECIFIC_MEMORIZABLE_CONTROLS(SlowDiskThreshold);
DEVICE_TYPE_SEPECIFIC_MEMORIZABLE_CONTROLS(PredictedDelayMultiplier);
DEVICE_TYPE_SEPECIFIC_MEMORIZABLE_CONTROLS(MaxNumOfSlowDisks);

TMemorizableControlWrapper MaxNumOfSlowDisks = MaxNumOfSlowDisksDefaultControl;
TMemorizableControlWrapper MaxNumOfSlowDisksHDD = MaxNumOfSlowDisksHDDDefaultControl;
TMemorizableControlWrapper MaxNumOfSlowDisksSSD = MaxNumOfSlowDisksDefaultControl;

#undef DEVICE_TYPE_SEPECIFIC_MEMORIZABLE_CONTROLS

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/blobstorage/nodewarden/node_warden_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ namespace NKikimr::NStorage {
, PredictedDelayMultiplierHDD(std::round(DefaultPredictedDelayMultiplier * 1000), 0, 1'000'000)
, PredictedDelayMultiplierSSD(std::round(DefaultPredictedDelayMultiplier * 1000), 0, 1'000'000)
, MaxNumOfSlowDisks(DefaultMaxNumOfSlowDisks, 1, 2)
, MaxNumOfSlowDisksHDD(DefaultMaxNumOfSlowDisks, 1, 2)
, MaxNumOfSlowDisksHDD(DefaultMaxNumOfSlowDisksHDD, 1, 2)
, MaxNumOfSlowDisksSSD(DefaultMaxNumOfSlowDisks, 1, 2)
{
Y_ABORT_UNLESS(Cfg->BlobStorageConfig.GetServiceSet().AvailabilityDomainsSize() <= 1);
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/protos/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -1349,7 +1349,7 @@ message TImmediateControlsConfig {
Description: "Maximum number of slow disks, which DSProxy can skip with Accelerations, option for HDD",
MinValue: 1,
MaxValue: 2,
DefaultValue: 2 }];
DefaultValue: 1 }];

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