Skip to content

Commit 94dafc7

Browse files
committed
Remove obsolete controllers (ydb-platform#1577)
* Removed obsolete controls * Fix of json_proxy_proto.h * Reserved deleted field id
1 parent 50c0981 commit 94dafc7

File tree

10 files changed

+1
-267
lines changed

10 files changed

+1
-267
lines changed

ydb/core/cms/json_proxy_proto.h

-10
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,6 @@ class TJsonProxyProto : public TActorBootstrapped<TJsonProxyProto> {
7676
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TSchemeShardControls::descriptor(), ctx);
7777
else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTCMallocControls")
7878
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTCMallocControls::descriptor(), ctx);
79-
else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls")
80-
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::descriptor(), ctx);
81-
else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls.TSamplingThrottlingOptions")
82-
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::TSamplingThrottlingOptions::descriptor(), ctx);
83-
else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls.TSamplingThrottlingOptions.TThrottlingOptions")
84-
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::TSamplingThrottlingOptions::TThrottlingOptions::descriptor(), ctx);
85-
else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls.TSamplingThrottlingOptions.TSamplingOptions")
86-
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::TSamplingThrottlingOptions::TSamplingOptions::descriptor(), ctx);
87-
else if (name == ".NKikimrConfig.TImmediateControlsConfig.TTracingControls.TKeyValue")
88-
return ReplyWithTypeDescription(*NKikimrConfig::TImmediateControlsConfig::TTracingControls::TKeyValue::descriptor(), ctx);
8979
}
9080

9181
ctx.Send(RequestEvent->Sender,

ydb/core/control/common_controls/tracing_control.cpp

-62
This file was deleted.

ydb/core/control/common_controls/tracing_control.h

-33
This file was deleted.

ydb/core/control/common_controls/ya.make

-13
This file was deleted.

ydb/core/control/immediate_control_board_sampler.h

-25
This file was deleted.

ydb/core/control/immediate_control_board_throttler.h

-66
This file was deleted.

ydb/core/control/ya.make

-6
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,10 @@ SRCS(
1919
immediate_control_board_impl.cpp
2020
immediate_control_board_impl.h
2121
immediate_control_board_wrapper.h
22-
immediate_control_board_throttler.h
23-
immediate_control_board_sampler.h
2422
)
2523

2624
END()
2725

28-
RECURSE(
29-
common_controls
30-
)
31-
3226
RECURSE_FOR_TESTS(
3327
ut
3428
)

ydb/core/grpc_services/grpc_request_proxy.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <ydb/core/base/nameservice.h>
99
#include <ydb/core/cms/console/configs_dispatcher.h>
1010
#include <ydb/core/cms/console/console.h>
11-
#include <ydb/core/control/common_controls/tracing_control.h>
1211
#include <ydb/core/grpc_services/counters/proxy_counters.h>
1312
#include <ydb/core/jaeger_tracing/sampling_throttling_control.h>
1413
#include <ydb/core/tx/tx_proxy/proxy.h>

ydb/core/keyvalue/ya.make

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ PEERDIR(
4545
ydb/library/actors/protos
4646
ydb/core/base
4747
ydb/core/blobstorage/base
48-
ydb/core/control/common_controls
4948
ydb/core/engine/minikql
5049
ydb/core/keyvalue/protos
5150
ydb/core/protos

ydb/core/protos/config.proto

+1-50
Original file line numberDiff line numberDiff line change
@@ -1245,61 +1245,12 @@ message TImmediateControlsConfig {
12451245
DefaultValue: 8388608 }];
12461246
}
12471247

1248-
message TTracingControls {
1249-
message TSamplingThrottlingOptions {
1250-
message TThrottlingOptions {
1251-
optional uint64 MaxRatePerMinute = 1 [(ControlOptions) = {
1252-
Description: "Maximum amount of traced requests per minute",
1253-
MinValue: 0,
1254-
MaxValue: 300,
1255-
DefaultValue: 0,
1256-
}];
1257-
optional uint64 MaxBurst = 2 [(ControlOptions) = {
1258-
Description: "Maximum burst of traced events",
1259-
MinValue: 0,
1260-
MaxValue: 300,
1261-
DefaultValue: 0,
1262-
}];
1263-
}
1264-
1265-
message TSamplingOptions {
1266-
optional uint64 PPM = 1 [(ControlOptions) = {
1267-
Description: "Average amount of sampled requests per one million",
1268-
MinValue: 0,
1269-
MaxValue: 1000000,
1270-
DefaultValue: 0,
1271-
}];
1272-
optional uint64 Level = 2 [(ControlOptions) = {
1273-
Description: "Tracing level of sampled requests",
1274-
MinValue: 1,
1275-
MaxValue: 15,
1276-
DefaultValue: 15,
1277-
}];
1278-
}
1279-
1280-
optional TSamplingOptions Sampling = 1;
1281-
optional TThrottlingOptions SampledThrottling = 2;
1282-
optional TThrottlingOptions ExternalThrottling = 3;
1283-
}
1284-
1285-
message TKeyValue {
1286-
optional TSamplingThrottlingOptions AcquireLock = 1;
1287-
optional TSamplingThrottlingOptions ExecuteTransaction = 2;
1288-
optional TSamplingThrottlingOptions Read = 3;
1289-
optional TSamplingThrottlingOptions ReadRange = 4;
1290-
optional TSamplingThrottlingOptions ListRange = 5;
1291-
optional TSamplingThrottlingOptions GetStorageChannelStatus = 6;
1292-
}
1293-
1294-
optional TKeyValue KeyValue = 1;
1295-
}
1296-
12971248
optional TDataShardControls DataShardControls = 1;
12981249
optional TTxLimitControls TxLimitControls = 2;
12991250
optional TCoordinatorControls CoordinatorControls = 3;
13001251
optional TSchemeShardControls SchemeShardControls = 4;
13011252
optional TTCMallocControls TCMallocControls = 5;
1302-
optional TTracingControls TracingControls = 6;
1253+
reserved 6;
13031254
};
13041255

13051256
message TMeteringConfig {

0 commit comments

Comments
 (0)