Skip to content

Commit 53023f1

Browse files
domwstSammyVimes
authored andcommitted
Remove obsolete controllers (#1577)
* Removed obsolete controls * Fix of json_proxy_proto.h * Reserved deleted field id
1 parent c677356 commit 53023f1

File tree

10 files changed

+1
-218
lines changed

10 files changed

+1
-218
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-1
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,7 @@ message TImmediateControlsConfig {
12991299
optional TCoordinatorControls CoordinatorControls = 3;
13001300
optional TSchemeShardControls SchemeShardControls = 4;
13011301
optional TTCMallocControls TCMallocControls = 5;
1302-
optional TTracingControls TracingControls = 6;
1302+
reserved 6;
13031303
};
13041304

13051305
message TMeteringConfig {

0 commit comments

Comments
 (0)