Skip to content

Commit 81241f5

Browse files
authored
Merge 8dc6265 into 2624e3d
2 parents 2624e3d + 8dc6265 commit 81241f5

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

ydb/core/cms/api_adapters.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ class TListClusterNodes: public TAdapterActor<
163163
out.set_host(in.Host);
164164
out.set_port(in.IcPort);
165165
out.set_state(ConvertNodeState(in.State));
166+
*out.mutable_start_time() = TimeUtil::MicrosecondsToTimestamp(in.StartTime.GetValue());
166167

167168
auto& location = *out.mutable_location();
168169
location.set_data_center(in.Location.GetDataCenterId());
@@ -561,7 +562,7 @@ class TGetMaintenanceTask: public TAdapterActor<
561562
opts.set_description(request.GetReason());
562563
opts.set_availability_mode(ConvertAvailabilityMode(request.GetAvailabilityMode()));
563564
opts.set_priority(request.GetPriority());
564-
565+
565566
// pending actions
566567
for (const auto& action : request.GetActions()) {
567568
ConvertAction(action, *result.add_action_group_states()->add_action_states());

ydb/core/cms/cms.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ void TCms::ProcessInitQueue(const TActorContext &ctx)
239239

240240
void TCms::SubscribeForConfig(const TActorContext &ctx)
241241
{
242-
NConsole::SubscribeViaConfigDispatcher(ctx, {(ui32)NKikimrConsole::TConfigItem::CmsConfigItem,
242+
NConsole::SubscribeViaConfigDispatcher(ctx, {(ui32)NKikimrConsole::TConfigItem::CmsConfigItem,
243243
(ui32)NKikimrConsole::TConfigItem::FeatureFlagsItem}, ctx.SelfID);
244244
}
245245

@@ -1159,6 +1159,7 @@ void TCms::AddHostState(const TClusterInfoPtr &clusterInfo, const TNodeInfo &nod
11591159
host->SetNodeId(node.NodeId);
11601160
host->SetInterconnectPort(node.IcPort);
11611161
host->SetTimestamp(timestamp.GetValue());
1162+
host->SetStartTimeSeconds(node.StartTime.Seconds());
11621163
node.Location.Serialize(host->MutableLocation(), false);
11631164
for (auto marker : node.Markers) {
11641165
host->AddMarkers(marker);
@@ -1982,7 +1983,7 @@ void TCms::Handle(TEvCms::TEvCheckRequest::TPtr &ev, const TActorContext &ctx)
19821983
resp->Record.SetRequestId(scheduled.RequestId);
19831984

19841985
ClusterInfo->ScheduleActions(scheduled, &ctx);
1985-
1986+
19861987
copy = new TRequestInfo(scheduled);
19871988
State->ScheduledRequests.emplace(rec.GetRequestId(), std::move(scheduled));
19881989
} else {
@@ -2265,7 +2266,7 @@ void TCms::Handle(TEvCms::TEvGetSentinelStateRequest::TPtr &ev, const TActorCont
22652266

22662267
void TCms::Handle(TEvConsole::TEvConfigNotificationRequest::TPtr &ev,
22672268
const TActorContext &ctx)
2268-
{
2269+
{
22692270
const auto& appConfig = ev->Get()->Record.GetConfig();
22702271
if (appConfig.HasFeatureFlags()) {
22712272
EnableCMSRequestPriorities = appConfig.GetFeatureFlags().GetEnableCMSRequestPriorities();

ydb/core/protos/cms.proto

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ message THostState {
7777
optional uint32 InterconnectPort = 7;
7878
repeated EMarker Markers = 8;
7979
optional NActorsInterconnect.TNodeLocation Location = 9;
80+
optional uint32 StartTimeSeconds = 10;
8081
}
8182

8283
message TClusterState {

ydb/public/api/protos/draft/ydb_maintenance.proto

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ message Node {
4141
StorageNode storage = 6;
4242
DynamicNode dynamic = 7;
4343
}
44+
// start_time defines time when node was registered in cms.
45+
google.protobuf.Timestamp start_time = 8;
4446
}
4547

4648
message ListClusterNodesRequest {

0 commit comments

Comments
 (0)