Skip to content

[cms] add start_time in public cms maintenance api #2452

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 5, 2024
Merged

[cms] add start_time in public cms maintenance api #2452

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
3 changes: 2 additions & 1 deletion ydb/core/cms/api_adapters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ class TListClusterNodes: public TAdapterActor<
out.set_host(in.Host);
out.set_port(in.IcPort);
out.set_state(ConvertNodeState(in.State));
*out.mutable_start_time() = TimeUtil::MicrosecondsToTimestamp(in.StartTime.GetValue());

auto& location = *out.mutable_location();
location.set_data_center(in.Location.GetDataCenterId());
Expand Down Expand Up @@ -561,7 +562,7 @@ class TGetMaintenanceTask: public TAdapterActor<
opts.set_description(request.GetReason());
opts.set_availability_mode(ConvertAvailabilityMode(request.GetAvailabilityMode()));
opts.set_priority(request.GetPriority());

// pending actions
for (const auto& action : request.GetActions()) {
ConvertAction(action, *result.add_action_group_states()->add_action_states());
Expand Down
7 changes: 4 additions & 3 deletions ydb/core/cms/cms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ void TCms::ProcessInitQueue(const TActorContext &ctx)

void TCms::SubscribeForConfig(const TActorContext &ctx)
{
NConsole::SubscribeViaConfigDispatcher(ctx, {(ui32)NKikimrConsole::TConfigItem::CmsConfigItem,
NConsole::SubscribeViaConfigDispatcher(ctx, {(ui32)NKikimrConsole::TConfigItem::CmsConfigItem,
(ui32)NKikimrConsole::TConfigItem::FeatureFlagsItem}, ctx.SelfID);
}

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

ClusterInfo->ScheduleActions(scheduled, &ctx);

copy = new TRequestInfo(scheduled);
State->ScheduledRequests.emplace(rec.GetRequestId(), std::move(scheduled));
} else {
Expand Down Expand Up @@ -2265,7 +2266,7 @@ void TCms::Handle(TEvCms::TEvGetSentinelStateRequest::TPtr &ev, const TActorCont

void TCms::Handle(TEvConsole::TEvConfigNotificationRequest::TPtr &ev,
const TActorContext &ctx)
{
{
const auto& appConfig = ev->Get()->Record.GetConfig();
if (appConfig.HasFeatureFlags()) {
EnableCMSRequestPriorities = appConfig.GetFeatureFlags().GetEnableCMSRequestPriorities();
Expand Down
1 change: 1 addition & 0 deletions ydb/core/protos/cms.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ message THostState {
optional uint32 InterconnectPort = 7;
repeated EMarker Markers = 8;
optional NActorsInterconnect.TNodeLocation Location = 9;
optional uint32 StartTimeSeconds = 10;
}

message TClusterState {
Expand Down
2 changes: 2 additions & 0 deletions ydb/public/api/protos/draft/ydb_maintenance.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ message Node {
StorageNode storage = 6;
DynamicNode dynamic = 7;
}
// start_time defines time when node was registered in cms.
google.protobuf.Timestamp start_time = 8;
}

message ListClusterNodesRequest {
Expand Down