aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralexbogo <alexbogo@ydb.tech>2022-08-25 11:58:35 +0300
committeralexbogo <alexbogo@ydb.tech>2022-08-25 11:58:35 +0300
commit33493b7a5a2f2292e59064c7e60445719e409a96 (patch)
tree594e8a6874688a7aeac87f087b270f86f55231f3
parent8621bf39f200b2c2d907bbef072c5a6e765b6273 (diff)
downloadydb-33493b7a5a2f2292e59064c7e60445719e409a96.tar.gz
[mirrorer] process correct event with changed config
-rw-r--r--ydb/core/persqueue/events/internal.h11
-rw-r--r--ydb/core/persqueue/mirrorer.cpp2
-rw-r--r--ydb/core/persqueue/mirrorer.h6
3 files changed, 4 insertions, 15 deletions
diff --git a/ydb/core/persqueue/events/internal.h b/ydb/core/persqueue/events/internal.h
index acdb7ba0d68..33a0c10a3fd 100644
--- a/ydb/core/persqueue/events/internal.h
+++ b/ydb/core/persqueue/events/internal.h
@@ -85,7 +85,6 @@ struct TEvPQ {
EvBlobResponse,
EvInitComplete,
EvChangeOwner,
- EvChangeConfig,
EvChangePartitionConfig,
EvChangeCacheConfig,
EvPartitionCounters,
@@ -441,16 +440,6 @@ struct TEvPQ {
bool LastRequest;
};
-
- struct TEvChangeConfig : public TEventLocal<TEvChangeConfig, EvChangeConfig> {
- TEvChangeConfig(const TString& topicName, const NKikimrPQ::TPQTabletConfig& config)
- : TopicName(topicName)
- , Config(config)
- {}
-
- TString TopicName;
- NKikimrPQ::TPQTabletConfig Config;
- };
struct TEvChangePartitionConfig : public TEventLocal<TEvChangePartitionConfig, EvChangePartitionConfig> {
TEvChangePartitionConfig(const NPersQueue::TTopicConverterPtr& topicConverter, const NKikimrPQ::TPQTabletConfig& config)
: TopicConverter(topicConverter)
diff --git a/ydb/core/persqueue/mirrorer.cpp b/ydb/core/persqueue/mirrorer.cpp
index bfa925fa2f9..021a48a5df9 100644
--- a/ydb/core/persqueue/mirrorer.cpp
+++ b/ydb/core/persqueue/mirrorer.cpp
@@ -307,7 +307,7 @@ void TMirrorer::Handle(TEvPQ::TEvUpdateCounters::TPtr& /*ev*/, const TActorConte
DoProcessNextReaderEvent(ctx, true); // LOGBROKER-7430
}
-void TMirrorer::HandleChangeConfig(TEvPQ::TEvChangeConfig::TPtr& ev, const TActorContext& ctx) {
+void TMirrorer::HandleChangeConfig(TEvPQ::TEvChangePartitionConfig::TPtr& ev, const TActorContext& ctx) {
bool equalConfigs = google::protobuf::util::MessageDifferencer::Equals(
Config,
ev->Get()->Config.GetPartitionConfig().GetMirrorFrom()
diff --git a/ydb/core/persqueue/mirrorer.h b/ydb/core/persqueue/mirrorer.h
index 8dabe460e49..dae06d6d708 100644
--- a/ydb/core/persqueue/mirrorer.h
+++ b/ydb/core/persqueue/mirrorer.h
@@ -56,7 +56,7 @@ private:
TRACE_EVENT(NKikimrServices::PQ_MIRRORER);
switch (ev->GetTypeRewrite()) {
HFuncTraced(TEvPQ::TEvInitCredentials, HandleInitCredentials);
- HFuncTraced(TEvPQ::TEvChangeConfig, HandleChangeConfig);
+ HFuncTraced(TEvPQ::TEvChangePartitionConfig, HandleChangeConfig);
HFuncTraced(TEvPQ::TEvCreateConsumer, CreateConsumer);
HFuncTraced(TEvPQ::TEvRetryWrite, HandleRetryWrite);
HFuncTraced(TEvPersQueue::TEvResponse, Handle);
@@ -73,7 +73,7 @@ private:
TRACE_EVENT(NKikimrServices::PQ_MIRRORER);
switch (ev->GetTypeRewrite()) {
- HFuncTraced(TEvPQ::TEvChangeConfig, HandleChangeConfig);
+ HFuncTraced(TEvPQ::TEvChangePartitionConfig, HandleChangeConfig);
CFunc(TEvents::TSystem::Wakeup, HandleWakeup);
HFuncTraced(TEvPQ::TEvRequestPartitionStatus, RequestSourcePartitionStatus);
HFuncTraced(TEvPQ::TEvRetryWrite, HandleRetryWrite);
@@ -133,7 +133,7 @@ public:
void Handle(TEvents::TEvPoisonPill::TPtr& ev, const TActorContext& ctx);
void Handle(TEvPersQueue::TEvResponse::TPtr& ev, const TActorContext& ctx);
void Handle(TEvPQ::TEvUpdateCounters::TPtr& ev, const TActorContext& ctx);
- void HandleChangeConfig(TEvPQ::TEvChangeConfig::TPtr& ev, const TActorContext& ctx);
+ void HandleChangeConfig(TEvPQ::TEvChangePartitionConfig::TPtr& ev, const TActorContext& ctx);
void TryToRead(const TActorContext& ctx);
void TryToWrite(const TActorContext& ctx);
void HandleInitCredentials(TEvPQ::TEvInitCredentials::TPtr& ev, const TActorContext& ctx);