diff options
author | abcdef <akotov@ydb.tech> | 2023-05-24 14:58:19 +0300 |
---|---|---|
committer | abcdef <akotov@ydb.tech> | 2023-05-24 14:58:19 +0300 |
commit | 678c671282bb8156eb907b816af60d56bf6df3a9 (patch) | |
tree | d60d5375436e8c97134fadf9953357ec567bb076 | |
parent | f9c5f901143b9663f0908303bd9a9390662bae1a (diff) | |
download | ydb-678c671282bb8156eb907b816af60d56bf6df3a9.tar.gz |
`TPqGroupTestReboots::*` tests are falling in the default-linux-x86_64-release-msan configuration
В коде инициализации есть ветка таблетки PQ есть ветка где не заполняется значение LocalDC. Неинициализированное значение передаётся в конструктор партиции. В исправлении партиция использует значение LocalDC из конфига.
-rw-r--r-- | ydb/core/persqueue/partition.cpp | 4 | ||||
-rw-r--r-- | ydb/core/persqueue/partition.h | 2 | ||||
-rw-r--r-- | ydb/core/persqueue/pq_impl.cpp | 1 | ||||
-rw-r--r-- | ydb/core/persqueue/ut/partition_ut.cpp | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/ydb/core/persqueue/partition.cpp b/ydb/core/persqueue/partition.cpp index 7b29a9c202..53e01a7a22 100644 --- a/ydb/core/persqueue/partition.cpp +++ b/ydb/core/persqueue/partition.cpp @@ -101,7 +101,7 @@ void AddCheckDiskRequest(TEvKeyValue::TEvRequest *request, ui32 numChannels) { } TPartition::TPartition(ui64 tabletId, ui32 partition, const TActorId& tablet, const TActorId& blobCache, - const NPersQueue::TTopicConverterPtr& topicConverter, bool isLocalDC, TString dcId, bool isServerless, + const NPersQueue::TTopicConverterPtr& topicConverter, TString dcId, bool isServerless, const NKikimrPQ::TPQTabletConfig& tabletConfig, const TTabletCountersBase& counters, bool subDomainOutOfSpace, bool newPartition, TVector<TTransaction> distrTxs) @@ -111,7 +111,7 @@ TPartition::TPartition(ui64 tabletId, ui32 partition, const TActorId& tablet, co , TabletConfig(tabletConfig) , Counters(counters) , TopicConverter(topicConverter) - , IsLocalDC(isLocalDC) + , IsLocalDC(TabletConfig.GetLocalDC()) , DCId(std::move(dcId)) , StartOffset(0) , EndOffset(0) diff --git a/ydb/core/persqueue/partition.h b/ydb/core/persqueue/partition.h index c954659227..bedc9c2c8e 100644 --- a/ydb/core/persqueue/partition.h +++ b/ydb/core/persqueue/partition.h @@ -326,7 +326,7 @@ public: } TPartition(ui64 tabletId, ui32 partition, const TActorId& tablet, const TActorId& blobCache, - const NPersQueue::TTopicConverterPtr& topicConverter, bool isLocalDC, TString dcId, bool isServerless, + const NPersQueue::TTopicConverterPtr& topicConverter, TString dcId, bool isServerless, const NKikimrPQ::TPQTabletConfig& config, const TTabletCountersBase& counters, bool SubDomainOutOfSpace, bool newPartition = false, TVector<TTransaction> distrTxs = {}); diff --git a/ydb/core/persqueue/pq_impl.cpp b/ydb/core/persqueue/pq_impl.cpp index 1c7611d320..5f0b9a2958 100644 --- a/ydb/core/persqueue/pq_impl.cpp +++ b/ydb/core/persqueue/pq_impl.cpp @@ -3275,7 +3275,6 @@ TPartition* TPersQueue::CreatePartitionActor(ui32 partitionId, ctx.SelfID, CacheActor, topicConverter, - IsLocalDC, DCId, IsServerless, config, diff --git a/ydb/core/persqueue/ut/partition_ut.cpp b/ydb/core/persqueue/ut/partition_ut.cpp index 870c70d8f2..d3cba84fd8 100644 --- a/ydb/core/persqueue/ut/partition_ut.cpp +++ b/ydb/core/persqueue/ut/partition_ut.cpp @@ -257,6 +257,7 @@ void TPartitionFixture::CreatePartitionActor(ui32 id, Config = MakeConfig(config.Version, config.Consumers); + Config.SetLocalDC(true); NPersQueue::TTopicNamesConverterFactory factory(true, "/Root/PQ", "dc1"); TopicConverter = factory.MakeTopicConverter(Config); @@ -266,7 +267,6 @@ void TPartitionFixture::CreatePartitionActor(ui32 id, Ctx->Edge, Ctx->Edge, TopicConverter, - true, "dcId", false, Config, |