Skip to content

Fix for empty slotname #3306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 29, 2024
Merged

Fix for empty slotname #3306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ydb/core/config/init/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ class TDefaultNodeBrokerClient
nodeInfo.SetAddress(node.Address);
nodeInfo.SetExpire(node.Expire);
NConfig::CopyNodeLocation(nodeInfo.MutableLocation(), node.Location);
nodeInfo.SetSlotName(result.GetSlotName());
if (result.HasSlotName()) {
nodeInfo.SetSlotName(result.GetSlotName());
}
} else {
auto &info = *nsConfig.AddNode();
info.SetNodeId(node.NodeId);
Expand Down
8 changes: 6 additions & 2 deletions ydb/public/sdk/cpp/client/ydb_discovery/discovery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ TNodeRegistrationResult::TNodeRegistrationResult(TStatus&& status, const Ydb::Di
, Expire_(proto.expire())
, ScopeTableId_(proto.has_scope_tablet_id() ? std::make_optional(proto.scope_tablet_id()) : std::nullopt)
, ScopePathId_(proto.has_scope_path_id() ? std::make_optional(proto.scope_path_id()) : std::nullopt)
, SlotName_(proto.slot_name())
, SlotName_(proto.has_slot_name() ? std::make_optional(proto.slot_name()) : std::nullopt)
{
const auto& nodes = proto.nodes();
Nodes_.reserve(nodes.size());
Expand Down Expand Up @@ -123,8 +123,12 @@ bool TNodeRegistrationResult::HasScopePathId() const {
return ScopePathId_.value();
}

bool TNodeRegistrationResult::HasSlotName() const {
return SlotName_.has_value();
}

const TString& TNodeRegistrationResult::GetSlotName() const {
return SlotName_;
return SlotName_.value();
}

const TVector<TNodeInfo>& TNodeRegistrationResult::GetNodes() const {
Expand Down
3 changes: 2 additions & 1 deletion ydb/public/sdk/cpp/client/ydb_discovery/discovery.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ class TNodeRegistrationResult : public TStatus {
const ui64& GetScopePathId() const;
bool HasScopePathId() const;
const TString& GetSlotName() const;
bool HasSlotName() const;
const TVector<TNodeInfo>& GetNodes() const;

private:
Expand All @@ -118,7 +119,7 @@ class TNodeRegistrationResult : public TStatus {
ui64 Expire_;
std::optional<ui64> ScopeTableId_;
std::optional<ui64> ScopePathId_;
TString SlotName_;
std::optional<TString> SlotName_;
TVector<TNodeInfo> Nodes_;
};

Expand Down