Skip to content

Commit 360da12

Browse files
author
Konstantin Morozov
committed
Merge branch 'main' into restore-format
2 parents 8cd73c7 + ea9fe63 commit 360da12

File tree

126 files changed

+2227
-589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+2227
-589
lines changed

ydb/core/blobstorage/nodewarden/distconf.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ namespace NKikimr::NStorage {
173173
break;
174174
}
175175

176-
if (NodeListObtained && StorageConfigLoaded && change) {
176+
if (change && NodeListObtained && StorageConfigLoaded) {
177177
UpdateBound(SelfNode.NodeId(), SelfNode, *StorageConfig, nullptr);
178178
IssueNextBindRequest();
179179
processPendingEvents();
@@ -202,8 +202,11 @@ namespace NKikimr::NStorage {
202202
}
203203

204204
void TNodeWarden::StartDistributedConfigKeeper() {
205-
return;
206-
DistributedConfigKeeperId = Register(new TDistributedConfigKeeper(Cfg, StorageConfig));
205+
auto *appData = AppData();
206+
if (!appData->DynamicNameserviceConfig || SelfId().NodeId() <= appData->DynamicNameserviceConfig->MaxStaticNodeId) {
207+
// start distributed configuration machinery only on static nodes
208+
DistributedConfigKeeperId = Register(new TDistributedConfigKeeper(Cfg, StorageConfig));
209+
}
207210
}
208211

209212
void TNodeWarden::ForwardToDistributedConfigKeeper(STATEFN_SIG) {

ydb/core/blobstorage/nodewarden/distconf_binding.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ namespace NKikimr::NStorage {
5858
// issue updates
5959
NodeIds = std::move(nodeIds);
6060
BindQueue.Update(NodeIds);
61-
if (StorageConfig) {
61+
if (NodeListObtained && StorageConfigLoaded) {
6262
IssueNextBindRequest();
6363
}
6464
}

ydb/core/kafka_proxy/actors/actors.h

+1
Original file line numberDiff line numberDiff line change
@@ -163,5 +163,6 @@ NActors::IActor* CreateKafkaFindCoordinatorActor(const TContext::TPtr context, c
163163
NActors::IActor* CreateKafkaOffsetCommitActor(const TContext::TPtr context, const ui64 correlationId, const TMessagePtr<TOffsetCommitRequestData>& message);
164164
NActors::IActor* CreateKafkaOffsetFetchActor(const TContext::TPtr context, const ui64 correlationId, const TMessagePtr<TOffsetFetchRequestData>& message);
165165
NActors::IActor* CreateKafkaCreateTopicsActor(const TContext::TPtr context, const ui64 correlationId, const TMessagePtr<TCreateTopicsRequestData>& message);
166+
NActors::IActor* CreateKafkaCreatePartitionsActor(const TContext::TPtr context, const ui64 correlationId, const TMessagePtr<TCreatePartitionsRequestData>& message);
166167

167168
} // namespace NKafka

0 commit comments

Comments
 (0)