Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove obsolete controllers #1577

Merged
merged 3 commits into from
Feb 6, 2024
Merged

Remove obsolete controllers #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f832758
Removed obsolete controls
domwst Feb 5, 2024
2af0347
Fix of json_proxy_proto.h
domwst Feb 5, 2024
271682c
Reserved deleted field id
domwst Feb 6, 2024
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
10 changes: 0 additions & 10 deletions ydb/core/cms/json_proxy_proto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,6 @@ class TJsonProxyProto : public TActorBootstrapped<TJsonProxyProto> {
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TSchemeShardControls::descriptor(), ctx);
else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTCMallocControls")
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTCMallocControls::descriptor(), ctx);
else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls")
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::descriptor(), ctx);
else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls.TSamplingThrottlingOptions")
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::TSamplingThrottlingOptions::descriptor(), ctx);
else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls.TSamplingThrottlingOptions.TThrottlingOptions")
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::TSamplingThrottlingOptions::TThrottlingOptions::descriptor(), ctx);
else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls.TSamplingThrottlingOptions.TSamplingOptions")
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::TSamplingThrottlingOptions::TSamplingOptions::descriptor(), ctx);
else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls.TKeyValue")
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::TKeyValue::descriptor(), ctx);
}

ctx.Send(RequestEvent->Sender,
Expand Down
62 changes: 0 additions & 62 deletions ydb/core/control/common_controls/tracing_control.cpp
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions ydb/core/control/common_controls/tracing_control.h
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ydb/core/control/common_controls/ya.make
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions ydb/core/control/immediate_control_board_sampler.h
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions ydb/core/control/immediate_control_board_throttler.h
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions ydb/core/control/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,10 @@ SRCS(
immediate_control_board_impl.cpp
immediate_control_board_impl.h
immediate_control_board_wrapper.h
immediate_control_board_throttler.h
immediate_control_board_sampler.h
)

END()

RECURSE(
common_controls
)

RECURSE_FOR_TESTS(
ut
)
1 change: 0 additions & 1 deletion ydb/core/grpc_services/grpc_request_proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <ydb/core/base/nameservice.h>
#include <ydb/core/cms/console/configs_dispatcher.h>
#include <ydb/core/cms/console/console.h>
#include <ydb/core/control/common_controls/tracing_control.h>
#include <ydb/core/grpc_services/counters/proxy_counters.h>
#include <ydb/core/jaeger_tracing/sampling_throttling_control.h>
#include <ydb/core/tx/tx_proxy/proxy.h>
Expand Down
1 change: 0 additions & 1 deletion ydb/core/keyvalue/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ PEERDIR(
ydb/library/actors/protos
ydb/core/base
ydb/core/blobstorage/base
ydb/core/control/common_controls
ydb/core/engine/minikql
ydb/core/keyvalue/protos
ydb/core/protos
Expand Down
51 changes: 1 addition & 50 deletions ydb/core/protos/config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,61 +1245,12 @@ message TImmediateControlsConfig {
DefaultValue: 8388608 }];
}

message TTracingControls {
message TSamplingThrottlingOptions {
message TThrottlingOptions {
optional uint64 MaxRatePerMinute = 1 [(ControlOptions) = {
Description: "Maximum amount of traced requests per minute",
MinValue: 0,
MaxValue: 300,
DefaultValue: 0,
}];
optional uint64 MaxBurst = 2 [(ControlOptions) = {
Description: "Maximum burst of traced events",
MinValue: 0,
MaxValue: 300,
DefaultValue: 0,
}];
}

message TSamplingOptions {
optional uint64 PPM = 1 [(ControlOptions) = {
Description: "Average amount of sampled requests per one million",
MinValue: 0,
MaxValue: 1000000,
DefaultValue: 0,
}];
optional uint64 Level = 2 [(ControlOptions) = {
Description: "Tracing level of sampled requests",
MinValue: 1,
MaxValue: 15,
DefaultValue: 15,
}];
}

optional TSamplingOptions Sampling = 1;
optional TThrottlingOptions SampledThrottling = 2;
optional TThrottlingOptions ExternalThrottling = 3;
}

message TKeyValue {
optional TSamplingThrottlingOptions AcquireLock = 1;
optional TSamplingThrottlingOptions ExecuteTransaction = 2;
optional TSamplingThrottlingOptions Read = 3;
optional TSamplingThrottlingOptions ReadRange = 4;
optional TSamplingThrottlingOptions ListRange = 5;
optional TSamplingThrottlingOptions GetStorageChannelStatus = 6;
}

optional TKeyValue KeyValue = 1;
}

optional TDataShardControls DataShardControls = 1;
optional TTxLimitControls TxLimitControls = 2;
optional TCoordinatorControls CoordinatorControls = 3;
optional TSchemeShardControls SchemeShardControls = 4;
optional TTCMallocControls TCMallocControls = 5;
optional TTracingControls TracingControls = 6;
reserved 6;
};

message TMeteringConfig {
Expand Down
Loading