Skip to content

Commit 3bd44ef

Browse files
alexvrualexvru
authored
Merge 1868b52 into f5cf28c 
2 parents f5cf28c + 1868b52 commit 3bd44ef

File tree

5 files changed

+11
-68
lines changed

5 files changed

+11
-68
lines changed

‎ydb/core/blobstorage/base/blobstorage_console_events.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,8 @@ namespace NKikimr {
3333
NKikimrBlobStorage::TEvControllerConsoleCommitRequest, EvControllerConsoleCommitRequest> {
3434
TEvControllerConsoleCommitRequest() = default;
3535

36-
TEvControllerConsoleCommitRequest(
37-
const TString& yamlConfig,
38-
bool allowUnknownFields = false,
39-
bool bypassMetadataChecks = false) {
40-
36+
TEvControllerConsoleCommitRequest(const TString& yamlConfig) {
4137
Record.SetYAML(yamlConfig);
42-
Record.SetAllowUnknownFields(allowUnknownFields);
43-
Record.SetBypassMetadataChecks(bypassMetadataChecks);
4438
}
4539

4640
TString ToString() const override {

‎ydb/core/cms/console/console_handshake.cpp

Lines changed: 7 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,44 +19,23 @@ class TConfigsManager::TConsoleCommitActor : public TActorBootstrapped<TConsoleC
1919
TConsoleCommitActor(
2020
TActorId senderId,
2121
const TString& mainYamlConfig,
22-
bool allowUnknownFields,
23-
bool bypassMetadataChecks,
2422
TActorId interconnectSession,
2523
ui64 cookie)
2624
: SenderId(senderId)
2725
, MainYamlConfig(mainYamlConfig)
28-
, AllowUnknownFields(allowUnknownFields)
29-
, BypassMetadataChecks(bypassMetadataChecks)
3026
, InterconnectSession(interconnectSession)
3127
, Cookie(cookie)
3228
{}
3329

3430
void Bootstrap(const TActorId& consoleId) {
35-
auto executeRequest = [&](auto& request) {
36-
request->Record.SetBypassAuth(true);
37-
request->Record.MutableRequest()->set_config(MainYamlConfig);
38-
request->Record.MutableRequest()->set_allow_unknown_fields(AllowUnknownFields);
39-
Send(consoleId, request.release());
40-
};
41-
42-
if (BypassMetadataChecks) {
43-
auto request = std::make_unique<TEvConsole::TEvSetYamlConfigRequest>();
44-
executeRequest(request);
45-
} else {
46-
auto request = std::make_unique<TEvConsole::TEvReplaceYamlConfigRequest>();
47-
executeRequest(request);
48-
}
49-
31+
auto request = std::make_unique<TEvConsole::TEvSetYamlConfigRequest>();
32+
request->Record.SetBypassAuth(true);
33+
request->Record.MutableRequest()->set_config(MainYamlConfig);
34+
request->Record.MutableRequest()->set_allow_unknown_fields(true);
35+
Send(consoleId, request.release());
5036
Become(&TThis::StateWork);
5137
}
5238

53-
void Handle(TEvConsole::TEvReplaceYamlConfigResponse::TPtr& /*ev*/) {
54-
auto response = std::make_unique<TEvBlobStorage::TEvControllerConsoleCommitResponse>();
55-
response->Record.SetStatus(NKikimrBlobStorage::TEvControllerConsoleCommitResponse::Committed);
56-
SendInReply(std::move(response));
57-
PassAway();
58-
}
59-
6039
void Handle(TEvConsole::TEvSetYamlConfigResponse::TPtr& /*ev*/) {
6140
auto response = std::make_unique<TEvBlobStorage::TEvControllerConsoleCommitResponse>();
6241
response->Record.SetStatus(NKikimrBlobStorage::TEvControllerConsoleCommitResponse::Committed);
@@ -73,7 +52,6 @@ class TConfigsManager::TConsoleCommitActor : public TActorBootstrapped<TConsoleC
7352
}
7453

7554
STRICT_STFUNC(StateWork,
76-
hFunc(TEvConsole::TEvReplaceYamlConfigResponse, Handle)
7755
hFunc(TEvConsole::TEvSetYamlConfigResponse, Handle)
7856
hFunc(TEvConsole::TEvGenericError, Handle)
7957
sFunc(TEvents::TEvPoisonPill, PassAway)
@@ -82,8 +60,6 @@ class TConfigsManager::TConsoleCommitActor : public TActorBootstrapped<TConsoleC
8260
private:
8361
TActorId SenderId;
8462
TString MainYamlConfig;
85-
bool AllowUnknownFields;
86-
bool BypassMetadataChecks;
8763
TActorId InterconnectSession;
8864
ui64 Cookie;
8965

@@ -135,15 +111,13 @@ void TConfigsManager::Handle(TEvBlobStorage::TEvControllerProposeConfigRequest::
135111
responseRecord.SetStatus(NKikimrBlobStorage::TEvControllerProposeConfigResponse::ReverseCommit);
136112
responseRecord.SetConsoleConfigVersion(YamlVersion);
137113
responseRecord.SetYAML(MainYamlConfig);
138-
} else if (YamlVersion == proposedConfigVersion) {
114+
} else if (YamlVersion <= proposedConfigVersion) {
139115
responseRecord.SetStatus(NKikimrBlobStorage::TEvControllerProposeConfigResponse::CommitIsNeeded);
140116
} else if (YamlVersion != proposedConfigVersion + 1) {
141117
responseRecord.SetStatus(NKikimrBlobStorage::TEvControllerProposeConfigResponse::UnexpectedConfig);
142118
responseRecord.SetProposedConfigVersion(proposedConfigVersion);
143119
responseRecord.SetConsoleConfigVersion(YamlVersion);
144-
if (proposedConfigVersion + 1 < YamlVersion) {
145-
responseRecord.SetYAML(MainYamlConfig);
146-
}
120+
responseRecord.SetYAML(MainYamlConfig);
147121
LOG_ALERT_S(ctx, NKikimrServices::CMS, "Unexpected proposed config.");
148122
} else if (proposedConfigHash != currentConfigHash) {
149123
responseRecord.SetStatus(NKikimrBlobStorage::TEvControllerProposeConfigResponse::HashMismatch);
@@ -160,17 +134,13 @@ void TConfigsManager::Handle(TEvBlobStorage::TEvControllerConsoleCommitRequest::
160134
auto response = std::make_unique<TEvBlobStorage::TEvControllerConsoleCommitResponse>();
161135
auto& record = ev->Get()->Record;
162136
const auto& mainYamlConfig = record.GetYAML();
163-
bool allowUnknownFields = record.GetAllowUnknownFields();
164-
bool bypassMetadataChecks = record.GetBypassMetadataChecks();
165137
if (!CheckSession(*ev, response, NKikimrBlobStorage::TEvControllerConsoleCommitResponse::SessionMismatch)) {
166138
return;
167139
}
168140

169141
IActor* actor = new TConsoleCommitActor(
170142
ev->Sender,
171143
mainYamlConfig,
172-
allowUnknownFields,
173-
bypassMetadataChecks,
174144
ev->InterconnectSession,
175145
ev->Cookie);
176146
CommitActor = Register(actor);

‎ydb/core/mind/bscontroller/console_interaction.cpp

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,7 @@ namespace NKikimr::NBsController {
140140
if (ConsolePipe) {
141141
Y_ABORT_UNLESS(Self.YamlConfig);
142142
if (const auto& [yaml, configVersion, yamlReturnedByFetch] = *Self.YamlConfig; yaml) {
143-
NTabletPipe::SendData(
144-
Self.SelfId(),
145-
ConsolePipe,
146-
new TEvBlobStorage::TEvControllerConsoleCommitRequest(
147-
yaml,
148-
AllowUnknownFields,
149-
BypassMetadataChecks));
143+
NTabletPipe::SendData(Self.SelfId(), ConsolePipe, new TEvBlobStorage::TEvControllerConsoleCommitRequest(yaml));
150144
}
151145
}
152146
break;
@@ -176,13 +170,7 @@ namespace NKikimr::NBsController {
176170
if (ConsolePipe) {
177171
Y_ABORT_UNLESS(Self.YamlConfig);
178172
if (const auto& [yaml, configVersion, yamlReturnedByFetch] = *Self.YamlConfig; yaml) {
179-
NTabletPipe::SendData(
180-
Self.SelfId(),
181-
ConsolePipe,
182-
new TEvBlobStorage::TEvControllerConsoleCommitRequest(
183-
yaml,
184-
AllowUnknownFields,
185-
BypassMetadataChecks));
173+
NTabletPipe::SendData(Self.SelfId(), ConsolePipe, new TEvBlobStorage::TEvControllerConsoleCommitRequest(yaml));
186174
}
187175
} else {
188176
Y_ABORT_UNLESS(!ClientId);
@@ -229,19 +217,14 @@ namespace NKikimr::NBsController {
229217

230218
auto& record = ev->Get()->Record;
231219

232-
if (!Working || CommitInProgress || (!record.GetOverwriteFlag() && ClientId)) {
220+
if (!Working || CommitInProgress || ClientId) {
233221
// reply to newly came query
234222
const TActorId temp = std::exchange(ClientId, ev->Sender);
235223
IssueGRpcResponse(NKikimrBlobStorage::TEvControllerReplaceConfigResponse::OngoingCommit, "ongoing commit");
236224
ClientId = temp;
237225
return;
238226
}
239227

240-
if (ClientId) {
241-
// abort previous query
242-
IssueGRpcResponse(NKikimrBlobStorage::TEvControllerReplaceConfigResponse::Aborted, "request aborted");
243-
}
244-
245228
ClientId = ev->Sender;
246229
++ExpectedValidationTimeoutCookie;
247230

@@ -302,7 +285,6 @@ namespace NKikimr::NBsController {
302285
// don't need to reset them explicitly
303286
// every time we get new request we just replace them
304287
AllowUnknownFields = record.GetAllowUnknownFields();
305-
BypassMetadataChecks = record.GetBypassMetadataChecks();
306288
} else {
307289
PendingYamlConfig.reset();
308290
}

‎ydb/core/mind/bscontroller/console_interaction.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ namespace NKikimr::NBsController {
5050

5151
std::optional<TString> PendingYamlConfig;
5252
bool AllowUnknownFields = false;
53-
bool BypassMetadataChecks = false;
5453

5554
std::optional<std::optional<TString>> PendingStorageYamlConfig;
5655

‎ydb/core/protos/blobstorage.proto

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,8 +1428,6 @@ message TEvControllerProposeConfigResponse {
14281428

14291429
message TEvControllerConsoleCommitRequest {
14301430
optional string YAML = 1;
1431-
optional bool AllowUnknownFields = 2;
1432-
optional bool BypassMetadataChecks = 3;
14331431
}
14341432

14351433
message TEvControllerConsoleCommitResponse {

0 commit comments

Comments
 (0)