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
18 changes: 9 additions & 9 deletions ydb/core/cms/cms_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1810,7 +1810,7 @@ Y_UNIT_TEST_SUITE(TCmsTest) {

Y_UNIT_TEST(EmergencyDuringRollingRestart)
{
TCmsTestEnv env(TTestEnvOpts(8).WithEnableCMSRequestPriorities());
TCmsTestEnv env(8);

// Start rolling restart
auto rollingRestart = env.CheckPermissionRequest
Expand Down Expand Up @@ -1839,7 +1839,7 @@ Y_UNIT_TEST_SUITE(TCmsTest) {

Y_UNIT_TEST(ScheduledEmergencyDuringRollingRestart)
{
TCmsTestEnv env(TTestEnvOpts(8).WithEnableCMSRequestPriorities());
TCmsTestEnv env(8);

// Start rolling restart
auto rollingRestart = env.CheckPermissionRequest
Expand Down Expand Up @@ -1871,7 +1871,7 @@ Y_UNIT_TEST_SUITE(TCmsTest) {

Y_UNIT_TEST(WalleRequestDuringRollingRestart)
{
TCmsTestEnv env(TTestEnvOpts(8).WithEnableCMSRequestPriorities());
TCmsTestEnv env(8);

// Start rolling restart
auto rollingRestart = env.CheckPermissionRequest
Expand Down Expand Up @@ -1899,7 +1899,7 @@ Y_UNIT_TEST_SUITE(TCmsTest) {

Y_UNIT_TEST(ScheduledWalleRequestDuringRollingRestart)
{
TCmsTestEnv env(TTestEnvOpts(8).WithEnableCMSRequestPriorities());
TCmsTestEnv env(8);

// Start rolling restart
auto rollingRestart = env.CheckPermissionRequest
Expand Down Expand Up @@ -1930,7 +1930,7 @@ Y_UNIT_TEST_SUITE(TCmsTest) {

Y_UNIT_TEST(EnableCMSRequestPrioritiesFeatureFlag)
{
TCmsTestEnv env(8);
TCmsTestEnv env(TTestEnvOpts(8).WithoutEnableCMSRequestPriorities());
// Start rolling restart with specified priority
auto rollingRestart = env.CheckPermissionRequest
("user", true, false, true, true, -80, TStatus::WRONG_REQUEST,
Expand All @@ -1943,7 +1943,7 @@ Y_UNIT_TEST_SUITE(TCmsTest) {

Y_UNIT_TEST(SamePriorityRequest)
{
TCmsTestEnv env(TTestEnvOpts(8).WithEnableCMSRequestPriorities());
TCmsTestEnv env(8);

// Start rolling restart
auto rollingRestart = env.CheckPermissionRequest
Expand Down Expand Up @@ -1973,7 +1973,7 @@ Y_UNIT_TEST_SUITE(TCmsTest) {

Y_UNIT_TEST(SamePriorityRequest2)
{
TCmsTestEnv env(TTestEnvOpts(8).WithEnableCMSRequestPriorities());
TCmsTestEnv env(8);

// Start rolling restart
auto rollingRestart = env.CheckPermissionRequest
Expand Down Expand Up @@ -2003,7 +2003,7 @@ Y_UNIT_TEST_SUITE(TCmsTest) {

Y_UNIT_TEST(PriorityRange)
{
TCmsTestEnv env(TTestEnvOpts(8).WithEnableCMSRequestPriorities());
TCmsTestEnv env(8);

const TString expectedReason = "Priority value is out of range";

Expand All @@ -2024,7 +2024,7 @@ Y_UNIT_TEST_SUITE(TCmsTest) {

Y_UNIT_TEST(WalleTasksDifferentPriorities)
{
TCmsTestEnv env(TTestEnvOpts(8).WithEnableCMSRequestPriorities());
TCmsTestEnv env(8);

// Without node limits
NKikimrCms::TCmsConfig config;
Expand Down
6 changes: 3 additions & 3 deletions ydb/core/cms/cms_ut_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ struct TTestEnvOpts {
, UseMirror3dcErasure(false)
, AdvanceCurrentTime(false)
, EnableSentinel(false)
, EnableCMSRequestPriorities(false)
, EnableCMSRequestPriorities(true)
, EnableSingleCompositeActionGroup(true)
{
}
Expand All @@ -122,8 +122,8 @@ struct TTestEnvOpts {
return *this;
}

TTestEnvOpts& WithEnableCMSRequestPriorities() {
EnableCMSRequestPriorities = true;
TTestEnvOpts& WithoutEnableCMSRequestPriorities() {
EnableCMSRequestPriorities = false;
return *this;
}
};
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/protos/feature_flags.proto
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ message TFeatureFlags {
optional bool EnableAccessServiceBulkAuthorization = 114 [default = false];
optional bool EnableAddColumsWithDefaults = 115 [ default = false];
optional bool EnableReplaceIfExistsForExternalEntities = 116 [ default = false];
optional bool EnableCMSRequestPriorities = 117 [default = false];
optional bool EnableCMSRequestPriorities = 117 [default = true];
optional bool EnableKeyvalueLogBatching = 118 [default = false];
optional bool EnableLocalDBFlatIndex = 119 [default = true];
optional bool ExtendedVDiskCounters = 120 [default = true];
Expand Down