diff options
| author | Alexey Borzenkov <snaury@yandex-team.ru> | 2022-02-24 01:42:01 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-24 01:42:01 +0300 |
| commit | f32957859d3691dd4b046b821888a0fdf054a3f1 (patch) | |
| tree | c33efe0b69cad5bb66ae7459ffd1e397d1362fb3 | |
| parent | a12930f7aec252ac021f27c5ae48ea71f534ea58 (diff) | |
| download | ydb-f32957859d3691dd4b046b821888a0fdf054a3f1.tar.gz | |
22-2: Use separate activities for mediator-related actors, KIKIMR-14419
Merge from trunk: r9171732
REVIEW: 2347156
x-ydb-stable-ref: 6696eb87e09dae5a821d470244d1d15da051f2be
| -rw-r--r-- | ydb/core/protos/services.proto | 3 | ||||
| -rw-r--r-- | ydb/core/testlib/tablet_helpers.cpp | 2 | ||||
| -rw-r--r-- | ydb/core/tx/mediator/execute_queue.cpp | 2 | ||||
| -rw-r--r-- | ydb/core/tx/mediator/tablet_queue.cpp | 2 | ||||
| -rw-r--r-- | ydb/core/tx/time_cast/time_cast.cpp | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/ydb/core/protos/services.proto b/ydb/core/protos/services.proto index 9f53c965d2..019cd5ed67 100644 --- a/ydb/core/protos/services.proto +++ b/ydb/core/protos/services.proto @@ -813,6 +813,9 @@ message TActivity { KQP_NODE_SERVICE = 494; TX_DATASHARD_SOURCE_OFFSETS_CLIENT = 500; COORDINATOR_READ_STEP_SUBSCRIPTION_MANAGER = 501; + TX_MEDIATOR_TIMECAST_ACTOR = 502; + TX_MEDIATOR_EXECUTE_QUEUE_ACTOR = 503; + TX_MEDIATOR_TABLET_QUEUE_ACTOR = 504; YQL_PROXY_ACTOR = 510; TEST_SHARD_ACTOR = 511; FRONT_TEST_SHARD_REQUEST = 512; diff --git a/ydb/core/testlib/tablet_helpers.cpp b/ydb/core/testlib/tablet_helpers.cpp index a853040b93..ce5588e08d 100644 --- a/ydb/core/testlib/tablet_helpers.cpp +++ b/ydb/core/testlib/tablet_helpers.cpp @@ -69,7 +69,7 @@ namespace NKikimr { class TFakeMediatorTimecastProxy : public TActor<TFakeMediatorTimecastProxy> { public: static constexpr NKikimrServices::TActivity::EType ActorActivityType() { - return NKikimrServices::TActivity::TX_MEDIATOR_ACTOR; + return NKikimrServices::TActivity::TX_MEDIATOR_TIMECAST_ACTOR; } TFakeMediatorTimecastProxy() diff --git a/ydb/core/tx/mediator/execute_queue.cpp b/ydb/core/tx/mediator/execute_queue.cpp index 07740e9f82..25ccba52fb 100644 --- a/ydb/core/tx/mediator/execute_queue.cpp +++ b/ydb/core/tx/mediator/execute_queue.cpp @@ -173,7 +173,7 @@ namespace NTxMediator { public: static constexpr NKikimrServices::TActivity::EType ActorActivityType() { - return NKikimrServices::TActivity::TX_MEDIATOR_ACTOR; + return NKikimrServices::TActivity::TX_MEDIATOR_EXECUTE_QUEUE_ACTOR; } TTxMediatorExecQueue(const TActorId &owner, ui64 mediator, ui64 hashRange, ui32 timecastBuckets) diff --git a/ydb/core/tx/mediator/tablet_queue.cpp b/ydb/core/tx/mediator/tablet_queue.cpp index b28179517c..111518714a 100644 --- a/ydb/core/tx/mediator/tablet_queue.cpp +++ b/ydb/core/tx/mediator/tablet_queue.cpp @@ -337,7 +337,7 @@ class TTxMediatorTabletQueue : public TActor<TTxMediatorTabletQueue> { public: static constexpr NKikimrServices::TActivity::EType ActorActivityType() { - return NKikimrServices::TActivity::TX_MEDIATOR_ACTOR; + return NKikimrServices::TActivity::TX_MEDIATOR_TABLET_QUEUE_ACTOR; } TTxMediatorTabletQueue(const TActorId &owner, ui64 mediator, ui64 hashRange, ui64 hashBucket) diff --git a/ydb/core/tx/time_cast/time_cast.cpp b/ydb/core/tx/time_cast/time_cast.cpp index 08042194fc..851ff5424b 100644 --- a/ydb/core/tx/time_cast/time_cast.cpp +++ b/ydb/core/tx/time_cast/time_cast.cpp @@ -140,7 +140,7 @@ class TMediatorTimecastProxy : public TActor<TMediatorTimecastProxy> { public: static constexpr NKikimrServices::TActivity::EType ActorActivityType() { - return NKikimrServices::TActivity::TX_MEDIATOR_ACTOR; + return NKikimrServices::TActivity::TX_MEDIATOR_TIMECAST_ACTOR; } TMediatorTimecastProxy() |