Merge 8b418a4 into 2c80f5e

Author: pixcc

ydb/core/config/init/init.cpp

@@ -166,6 +166,9 @@ class TDefaultNodeBrokerClient
                 if (node.NodeId == result.GetNodeId()) {
                     auto &nodeInfo = *dnConfig.MutableNodeInfo();
                     nodeInfo.SetNodeId(node.NodeId);
+                    if (node.SlotId.has_value()) {
+                        nodeInfo.SetSlotId(node.SlotId.value());
+                    }
                     nodeInfo.SetHost(node.Host);
                     nodeInfo.SetPort(node.Port);
                     nodeInfo.SetResolveHost(node.ResolveHost);

ydb/core/config/init/init_impl.h

@@ -593,8 +593,20 @@ struct TCommonAppOptions {
             ConfigUpdateTracer.AddUpdate(NKikimrConsole::TConfigItem::TenantPoolConfigItem, TConfigItemInfo::EUpdateKind::UpdateExplicitly);
         }
 
-        if (TenantName && InterconnectPort != DefaultInterconnectPort) {
-            appConfig.MutableMonitoringConfig()->SetHostLabelOverride(HostAndICPort(env));
+        if (TenantName) {
+            if (appConfig.GetDynamicNodeConfig().GetNodeInfo().HasSlotId()) {
+                const ui32 slotId = appConfig.GetDynamicNodeConfig().GetNodeInfo().GetSlotId();
+                const TString slotLabel = TStringBuilder() << "slot-" << slotId;
+                appConfig.MutableMonitoringConfig()->SetHostLabelOverride(slotLabel);
+                ConfigUpdateTracer.AddUpdate(NKikimrConsole::TConfigItem::MonitoringConfigItem, TConfigItemInfo::EUpdateKind::UpdateExplicitly);
+            } else if (InterconnectPort != DefaultInterconnectPort) {
+                appConfig.MutableMonitoringConfig()->SetHostLabelOverride(HostAndICPort(env));
+                ConfigUpdateTracer.AddUpdate(NKikimrConsole::TConfigItem::MonitoringConfigItem, TConfigItemInfo::EUpdateKind::UpdateExplicitly);
+            }
+        }
+
+        if (TenantName) {
+            appConfig.MutableMonitoringConfig()->SetProcessLocation(HostAndICPort(env));
             ConfigUpdateTracer.AddUpdate(NKikimrConsole::TConfigItem::MonitoringConfigItem, TConfigItemInfo::EUpdateKind::UpdateExplicitly);
         }
 

ydb/core/driver_lib/run/kikimr_services_initializers.cpp

@@ -2103,7 +2103,7 @@ void TKqpServiceInitializer::InitializeServices(NActors::TActorSystemSetup* setu
 
         auto kqpProxySharedResources = std::make_shared<NKqp::TKqpProxySharedResources>();
 
-        // Crate resource manager
+        // Create resource manager
         auto rm = NKqp::CreateKqpResourceManagerActor(Config.GetTableServiceConfig().GetResourceManager(), nullptr,
             {}, kqpProxySharedResources);
         setup->LocalServices.push_back(std::make_pair(

ydb/core/protos/node_broker.proto

@@ -20,6 +20,7 @@ message TNodeInfo {
     optional string Address = 5;
     optional NActorsInterconnect.TNodeLocation Location = 6;
     optional uint64 Expire = 7;
+    optional uint32 SlotId = 8;
 }
 
 message TEpoch {

ydb/public/api/protos/ydb_discovery.proto

@@ -83,6 +83,7 @@ message NodeInfo {
     optional string address = 5;
     optional NodeLocation location = 6;
     optional uint64 expire = 7;
+    optional uint32 slot_id = 8;
 }
 
 message NodeRegistrationRequest {
@@ -103,6 +104,7 @@ message NodeRegistrationResult {
     repeated NodeInfo nodes = 4;
     optional uint64 scope_tablet_id = 5;
     optional uint64 scope_path_id = 6;
+    optional uint32 slot_id = 7;
 }
 
 message NodeRegistrationResponse {

ydb/public/sdk/cpp/client/ydb_discovery/discovery.cpp

@@ -77,6 +77,7 @@ TNodeInfo::TNodeInfo(const Ydb::Discovery::NodeInfo& info)
     , Address(info.address())
     , Location(info.location())
     , Expire(info.expire())
+    , SlotId(info.has_slot_id() ? std::make_optional(info.slot_id()) : std::nullopt)
     {}
 
 TNodeRegistrationResult::TNodeRegistrationResult(TStatus&& status, const Ydb::Discovery::NodeRegistrationResult& proto)
@@ -86,6 +87,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)
+    , SlotId_(proto.has_slot_id() ? std::make_optional(proto.slot_id()) : std::nullopt)
 {
     const auto& nodes = proto.nodes();
     Nodes_.reserve(nodes.size());
@@ -122,6 +124,14 @@ bool TNodeRegistrationResult::HasScopePathId() const {
     return ScopePathId_.value();
 }
 
+const ui32& TNodeRegistrationResult::GetSlotId() const {
+    return SlotId_.value();
+}
+
+bool TNodeRegistrationResult::HasSlotId() const {
+    return SlotId_.has_value();
+}
+
 const TVector<TNodeInfo>& TNodeRegistrationResult::GetNodes() const {
     return Nodes_;
 }

ydb/public/sdk/cpp/client/ydb_discovery/discovery.h

@@ -96,6 +96,7 @@ struct TNodeInfo {
     TString Address;
     TNodeLocation Location;
     ui64 Expire;
+    std::optional<ui32> SlotId;
 };
 
 class TNodeRegistrationResult : public TStatus {
@@ -109,6 +110,8 @@ class TNodeRegistrationResult : public TStatus {
     bool HasScopeTabletId() const;
     const ui64& GetScopePathId() const;
     bool HasScopePathId() const;
+    const ui32& GetSlotId() const;
+    bool HasSlotId() const;
     const TVector<TNodeInfo>& GetNodes() const;
 
 private:
@@ -117,6 +120,7 @@ class TNodeRegistrationResult : public TStatus {
     ui64 Expire_;
     std::optional<ui64> ScopeTableId_;
     std::optional<ui64> ScopePathId_;
+    std::optional<ui32> SlotId_;
     TVector<TNodeInfo> Nodes_;
 };