Add node name to labels (#8237)

ydb-platform · Aug 26, 2024 · 6b0e4a4 · 6b0e4a4
1 parent 727613b
commit 6b0e4a4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/ydb/core/config/init/init.cpp b/ydb/core/config/init/init.cpp
@@ -142,7 +142,8 @@ class TDefaultNodeBrokerClient
             const NYdb::NDiscovery::TNodeRegistrationResult& result,
             NKikimrConfig::TAppConfig& appConfig,
             ui32& nodeId,
-            TKikimrScopeId& outScopeId)
+            TKikimrScopeId& outScopeId,
+            TString& outNodeName)
         {
             nodeId = result.GetNodeId();
             NActors::TScopeId scopeId;
@@ -168,6 +169,7 @@ class TDefaultNodeBrokerClient
                     NConfig::CopyNodeLocation(nodeInfo.MutableLocation(), node.Location);
                     if (result.HasNodeName()) {
                         nodeInfo.SetName(result.GetNodeName());
+                        outNodeName = result.GetNodeName();
                     }
                 } else {
                     auto &info = *nsConfig.AddNode();
@@ -187,8 +189,13 @@ class TDefaultNodeBrokerClient
             : Result(std::move(result))
         {}
 
-        void Apply(NKikimrConfig::TAppConfig& appConfig, ui32& nodeId, TKikimrScopeId& scopeId) const override {
-            ProcessRegistrationDynamicNodeResult(Result, appConfig, nodeId, scopeId);
+        void Apply(
+            NKikimrConfig::TAppConfig& appConfig,
+            ui32& nodeId,
+            TKikimrScopeId& scopeId,
+            TString& nodeName) const override
+        {
+            ProcessRegistrationDynamicNodeResult(Result, appConfig, nodeId, scopeId, nodeName);
         }
     };
 

diff --git a/ydb/core/config/init/init.h b/ydb/core/config/init/init.h
@@ -124,7 +124,11 @@ struct TNodeRegistrationSettings {
 class INodeRegistrationResult {
 public:
     virtual ~INodeRegistrationResult() {}
-    virtual void Apply(NKikimrConfig::TAppConfig& appConfig, ui32& nodeId, TKikimrScopeId& scopeId) const = 0;
+    virtual void Apply(
+        NKikimrConfig::TAppConfig& appConfig,
+        ui32& nodeId,
+        TKikimrScopeId& scopeId,
+        TString& nodeName) const = 0;
 };
 
 class INodeBrokerClient {

diff --git a/ydb/core/config/init/init_impl.h b/ydb/core/config/init/init_impl.h
@@ -1019,6 +1019,7 @@ class TInitialConfiguratorImpl
     TKikimrScopeId ScopeId;
     TString TenantName;
     TString ClusterName;
+    TString NodeName;
 
     TMap<TString, TString> Labels;
 
@@ -1262,7 +1263,7 @@ class TInitialConfiguratorImpl
 
         auto result = NodeBrokerClient.RegisterDynamicNode(cf.GrpcSslSettings, addrs, settings, Env, Logger);
 
-        result->Apply(AppConfig, NodeId, ScopeId);
+        result->Apply(AppConfig, NodeId, ScopeId, NodeName);
     }
 
     void ApplyConfigForNode(NKikimrConfig::TAppConfig &appConfig) {
@@ -1292,6 +1293,11 @@ class TInitialConfiguratorImpl
         Labels["node_id"] = ToString(NodeId);
         AddLabelToAppConfig("node_id", Labels["node_id"]);
 
+        if (!NodeName.Empty()) {
+            Labels["node_name"] = NodeName;
+            AddLabelToAppConfig("node_name", Labels["node_name"]);
+        }
+
         if (CommonAppOptions.IgnoreCmsConfigs) {
             return;
         }