aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordon-dron <don-dron@yandex-team.com>2023-09-15 17:02:33 +0300
committerdon-dron <don-dron@yandex-team.com>2023-09-15 17:24:22 +0300
commit18bedc00703b589e12308adba0e23fe57a9f4d33 (patch)
tree8454d780b9720e07c62519e3dc509a04f13ccf57
parent8d552f0e863d044e95f4221da61efe52756beec5 (diff)
downloadydb-18bedc00703b589e12308adba0e23fe57a9f4d33.tar.gz
YT-20001: Rename request reboot to request restart
-rw-r--r--yt/yt/client/api/admin_client.h8
-rw-r--r--yt/yt/client/api/delegating_client.cpp6
-rw-r--r--yt/yt/client/api/delegating_client.h4
-rw-r--r--yt/yt/client/api/rpc_proxy/api_service_proxy.h2
-rw-r--r--yt/yt/client/api/rpc_proxy/client_impl.cpp10
-rw-r--r--yt/yt/client/api/rpc_proxy/client_impl.h4
-rw-r--r--yt/yt/client/driver/admin_commands.cpp6
-rw-r--r--yt/yt/client/driver/admin_commands.h6
-rw-r--r--yt/yt/client/driver/driver.cpp2
-rw-r--r--yt/yt/client/federated/client.cpp2
-rw-r--r--yt/yt/client/hedging/hedging.cpp2
-rw-r--r--yt/yt/client/security_client/access_control.h2
-rw-r--r--yt/yt/client/security_client/public.h2
-rw-r--r--yt/yt/client/unittests/mock/client.h4
-rw-r--r--yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto4
15 files changed, 32 insertions, 32 deletions
diff --git a/yt/yt/client/api/admin_client.h b/yt/yt/client/api/admin_client.h
index 5ef46001ed..22ee9efb88 100644
--- a/yt/yt/client/api/admin_client.h
+++ b/yt/yt/client/api/admin_client.h
@@ -177,11 +177,11 @@ struct TRemoveMaintenanceOptions
: public TTimeoutOptions
{ };
-struct TRequestRebootOptions
+struct TRequestRestartOptions
: public TTimeoutOptions
{ };
-struct TRequestRebootResult
+struct TRequestRestartResult
{ };
////////////////////////////////////////////////////////////////////////////////
@@ -289,9 +289,9 @@ struct IAdminClient
const std::vector<TGuid>& locationUuids,
const TResurrectChunkLocationsOptions& options = {}) = 0;
- virtual TFuture<TRequestRebootResult> RequestReboot(
+ virtual TFuture<TRequestRestartResult> RequestRestart(
const TString& nodeAddress,
- const TRequestRebootOptions& options = {}) = 0;
+ const TRequestRestartOptions& options = {}) = 0;
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/client/api/delegating_client.cpp b/yt/yt/client/api/delegating_client.cpp
index 9beddc5ead..ac82f15a53 100644
--- a/yt/yt/client/api/delegating_client.cpp
+++ b/yt/yt/client/api/delegating_client.cpp
@@ -892,11 +892,11 @@ TFuture<TResurrectChunkLocationsResult> TDelegatingClient::ResurrectChunkLocatio
return Underlying_->ResurrectChunkLocations(nodeAddress, locationUuids, options);
}
-TFuture<TRequestRebootResult> TDelegatingClient::RequestReboot(
+TFuture<TRequestRestartResult> TDelegatingClient::RequestRestart(
const TString& nodeAddress,
- const TRequestRebootOptions& options)
+ const TRequestRestartOptions& options)
{
- return Underlying_->RequestReboot(nodeAddress, options);
+ return Underlying_->RequestRestart(nodeAddress, options);
}
TFuture<void> TDelegatingClient::SetUserPassword(
diff --git a/yt/yt/client/api/delegating_client.h b/yt/yt/client/api/delegating_client.h
index dcd83805bd..3574d6ca9a 100644
--- a/yt/yt/client/api/delegating_client.h
+++ b/yt/yt/client/api/delegating_client.h
@@ -557,9 +557,9 @@ public:
const std::vector<TGuid>& locationUuids,
const TResurrectChunkLocationsOptions& options = {}) override;
- TFuture<TRequestRebootResult> RequestReboot(
+ TFuture<TRequestRestartResult> RequestRestart(
const TString& nodeAddress,
- const TRequestRebootOptions& options = {}) override;
+ const TRequestRestartOptions& options = {}) override;
TFuture<void> SetUserPassword(
const TString& user,
diff --git a/yt/yt/client/api/rpc_proxy/api_service_proxy.h b/yt/yt/client/api/rpc_proxy/api_service_proxy.h
index 134bf39d32..4d0dc4e09c 100644
--- a/yt/yt/client/api/rpc_proxy/api_service_proxy.h
+++ b/yt/yt/client/api/rpc_proxy/api_service_proxy.h
@@ -157,7 +157,7 @@ public:
DEFINE_RPC_PROXY_METHOD(NRpcProxy::NProto, DisableChunkLocations);
DEFINE_RPC_PROXY_METHOD(NRpcProxy::NProto, DestroyChunkLocations);
DEFINE_RPC_PROXY_METHOD(NRpcProxy::NProto, ResurrectChunkLocations);
- DEFINE_RPC_PROXY_METHOD(NRpcProxy::NProto, RequestReboot);
+ DEFINE_RPC_PROXY_METHOD(NRpcProxy::NProto, RequestRestart);
// Security
DEFINE_RPC_PROXY_METHOD(NRpcProxy::NProto, AddMember);
diff --git a/yt/yt/client/api/rpc_proxy/client_impl.cpp b/yt/yt/client/api/rpc_proxy/client_impl.cpp
index df5034c770..5c4831a1ea 100644
--- a/yt/yt/client/api/rpc_proxy/client_impl.cpp
+++ b/yt/yt/client/api/rpc_proxy/client_impl.cpp
@@ -1952,17 +1952,17 @@ TFuture<TResurrectChunkLocationsResult> TClient::ResurrectChunkLocations(
}));
}
-TFuture<TRequestRebootResult> TClient::RequestReboot(
+TFuture<TRequestRestartResult> TClient::RequestRestart(
const TString& nodeAddress,
- const TRequestRebootOptions& /*options*/)
+ const TRequestRestartOptions& /*options*/)
{
auto proxy = CreateApiServiceProxy();
- auto req = proxy.RequestReboot();
+ auto req = proxy.RequestRestart();
ToProto(req->mutable_node_address(), nodeAddress);
- return req->Invoke().Apply(BIND([] (const TApiServiceProxy::TRspRequestRebootPtr& /*rsp*/) {
- return TRequestRebootResult();
+ return req->Invoke().Apply(BIND([] (const TApiServiceProxy::TRspRequestRestartPtr& /*rsp*/) {
+ return TRequestRestartResult();
}));
}
diff --git a/yt/yt/client/api/rpc_proxy/client_impl.h b/yt/yt/client/api/rpc_proxy/client_impl.h
index af390f7a6f..459d917eaf 100644
--- a/yt/yt/client/api/rpc_proxy/client_impl.h
+++ b/yt/yt/client/api/rpc_proxy/client_impl.h
@@ -418,9 +418,9 @@ public:
const std::vector<TGuid>& locationUuids,
const TResurrectChunkLocationsOptions& options) override;
- TFuture<TRequestRebootResult> RequestReboot(
+ TFuture<TRequestRestartResult> RequestRestart(
const TString& nodeAddress,
- const TRequestRebootOptions& options) override;
+ const TRequestRestartOptions& options) override;
// Query tracker
diff --git a/yt/yt/client/driver/admin_commands.cpp b/yt/yt/client/driver/admin_commands.cpp
index 176c950adb..f4af9e029d 100644
--- a/yt/yt/client/driver/admin_commands.cpp
+++ b/yt/yt/client/driver/admin_commands.cpp
@@ -468,14 +468,14 @@ void TResurrectChunkLocationsCommand::DoExecute(ICommandContextPtr context)
////////////////////////////////////////////////////////////////////////////////
-TRequestRebootCommand::TRequestRebootCommand()
+TRequestRestartCommand::TRequestRestartCommand()
{
RegisterParameter("node_address", NodeAddress_);
}
-void TRequestRebootCommand::DoExecute(ICommandContextPtr context)
+void TRequestRestartCommand::DoExecute(ICommandContextPtr context)
{
- WaitFor(context->GetClient()->RequestReboot(NodeAddress_, Options))
+ WaitFor(context->GetClient()->RequestRestart(NodeAddress_, Options))
.ThrowOnError();
}
diff --git a/yt/yt/client/driver/admin_commands.h b/yt/yt/client/driver/admin_commands.h
index 1765f89997..957826eea8 100644
--- a/yt/yt/client/driver/admin_commands.h
+++ b/yt/yt/client/driver/admin_commands.h
@@ -282,11 +282,11 @@ private:
// Endpoint is necessary for manual configuration regeneration, disk partitioning and node restart.
// Important part of Hot Swap mechanic.
-class TRequestRebootCommand
- : public TTypedCommand<NApi::TRequestRebootOptions>
+class TRequestRestartCommand
+ : public TTypedCommand<NApi::TRequestRestartOptions>
{
public:
- TRequestRebootCommand();
+ TRequestRestartCommand();
private:
TString NodeAddress_;
diff --git a/yt/yt/client/driver/driver.cpp b/yt/yt/client/driver/driver.cpp
index 81c1886a40..15b6fd527f 100644
--- a/yt/yt/client/driver/driver.cpp
+++ b/yt/yt/client/driver/driver.cpp
@@ -334,7 +334,7 @@ public:
REGISTER_ALL(TDisableChunkLocationsCommand, "disable_chunk_locations", Null, Structured, false, false);
REGISTER_ALL(TDestroyChunkLocationsCommand, "destroy_chunk_locations", Null, Structured, false, false);
REGISTER_ALL(TResurrectChunkLocationsCommand, "resurrect_chunk_locations", Null, Structured, false, false);
- REGISTER_ALL(TRequestRebootCommand, "request_reboot", Null, Structured, false, false);
+ REGISTER_ALL(TRequestRestartCommand, "request_restart", Null, Structured, false, false);
REGISTER_ALL(TSetUserPasswordCommand, "set_user_password", Null, Structured, false, false);
REGISTER_ALL(TIssueTokenCommand, "issue_token", Null, Structured, false, false);
diff --git a/yt/yt/client/federated/client.cpp b/yt/yt/client/federated/client.cpp
index d541a0b57b..56a91722c1 100644
--- a/yt/yt/client/federated/client.cpp
+++ b/yt/yt/client/federated/client.cpp
@@ -395,7 +395,7 @@ public:
UNIMPLEMENTED_METHOD(TFuture<TDisableChunkLocationsResult>, DisableChunkLocations, (const TString&, const std::vector<TGuid>&, const TDisableChunkLocationsOptions&));
UNIMPLEMENTED_METHOD(TFuture<TDestroyChunkLocationsResult>, DestroyChunkLocations, (const TString&, const std::vector<TGuid>&, const TDestroyChunkLocationsOptions&));
UNIMPLEMENTED_METHOD(TFuture<TResurrectChunkLocationsResult>, ResurrectChunkLocations, (const TString&, const std::vector<TGuid>&, const TResurrectChunkLocationsOptions&));
- UNIMPLEMENTED_METHOD(TFuture<TRequestRebootResult>, RequestReboot, (const TString&, const TRequestRebootOptions&));
+ UNIMPLEMENTED_METHOD(TFuture<TRequestRestartResult>, RequestRestart, (const TString&, const TRequestRestartOptions&));
UNIMPLEMENTED_METHOD(TFuture<void>, SetUserPassword, (const TString&, const TString&, const TString&, const TSetUserPasswordOptions&));
UNIMPLEMENTED_METHOD(TFuture<TIssueTokenResult>, IssueToken, (const TString&, const TString&, const TIssueTokenOptions&));
UNIMPLEMENTED_METHOD(TFuture<void>, RevokeToken, (const TString&, const TString&, const TString&, const TRevokeTokenOptions&));
diff --git a/yt/yt/client/hedging/hedging.cpp b/yt/yt/client/hedging/hedging.cpp
index dfa5d47c42..8c7dcc0909 100644
--- a/yt/yt/client/hedging/hedging.cpp
+++ b/yt/yt/client/hedging/hedging.cpp
@@ -196,7 +196,7 @@ public:
UNSUPPORTED_METHOD(TFuture<TDisableChunkLocationsResult>, DisableChunkLocations, (const TString&, const std::vector<TGuid>&, const TDisableChunkLocationsOptions&));
UNSUPPORTED_METHOD(TFuture<TDestroyChunkLocationsResult>, DestroyChunkLocations, (const TString&, const std::vector<TGuid>&, const TDestroyChunkLocationsOptions&));
UNSUPPORTED_METHOD(TFuture<TResurrectChunkLocationsResult>, ResurrectChunkLocations, (const TString&, const std::vector<TGuid>&, const TResurrectChunkLocationsOptions&));
- UNSUPPORTED_METHOD(TFuture<TRequestRebootResult>, RequestReboot, (const TString&, const TRequestRebootOptions&));
+ UNSUPPORTED_METHOD(TFuture<TRequestRestartResult>, RequestRestart, (const TString&, const TRequestRestartOptions&));
UNSUPPORTED_METHOD(TFuture<TPullRowsResult>, PullRows, (const NYPath::TYPath&, const TPullRowsOptions&));
UNSUPPORTED_METHOD(TFuture<void>, SetUserPassword, (const TString&, const TString&, const TString&, const TSetUserPasswordOptions&));
UNSUPPORTED_METHOD(TFuture<TIssueTokenResult>, IssueToken, (const TString&, const TString&, const TIssueTokenOptions&));
diff --git a/yt/yt/client/security_client/access_control.h b/yt/yt/client/security_client/access_control.h
index a93fd57440..3d3583cd35 100644
--- a/yt/yt/client/security_client/access_control.h
+++ b/yt/yt/client/security_client/access_control.h
@@ -45,7 +45,7 @@ const THashMap<EAccessControlObject, TAccessControlObjectDescriptor> AccessContr
ACCESS_CONTROL_ENTRY(EAccessControlObjectNamespace::AdminCommands, EAccessControlObject::ExitReadOnly),
ACCESS_CONTROL_ENTRY(EAccessControlObjectNamespace::AdminCommands, EAccessControlObject::MasterExitReadOnly),
ACCESS_CONTROL_ENTRY(EAccessControlObjectNamespace::AdminCommands, EAccessControlObject::SwitchLeader),
- ACCESS_CONTROL_ENTRY(EAccessControlObjectNamespace::AdminCommands, EAccessControlObject::RequestReboot)
+ ACCESS_CONTROL_ENTRY(EAccessControlObjectNamespace::AdminCommands, EAccessControlObject::RequestRestart)
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/client/security_client/public.h b/yt/yt/client/security_client/public.h
index c3be865c3c..51a38ff8ed 100644
--- a/yt/yt/client/security_client/public.h
+++ b/yt/yt/client/security_client/public.h
@@ -93,7 +93,7 @@ DEFINE_ENUM(EAccessControlObject,
(ExitReadOnly)
(MasterExitReadOnly)
(SwitchLeader)
- (RequestReboot)
+ (RequestRestart)
);
////////////////////////////////////////////////////////////////////////////////
diff --git a/yt/yt/client/unittests/mock/client.h b/yt/yt/client/unittests/mock/client.h
index ea32073ffb..bc6bf72e0d 100644
--- a/yt/yt/client/unittests/mock/client.h
+++ b/yt/yt/client/unittests/mock/client.h
@@ -557,9 +557,9 @@ public:
const std::vector<TGuid>& locationUuids,
const TResurrectChunkLocationsOptions& options), (override));
- MOCK_METHOD(TFuture<TRequestRebootResult>, RequestReboot, (
+ MOCK_METHOD(TFuture<TRequestRestartResult>, RequestRestart, (
const TString& nodeAddress,
- const TRequestRebootOptions& options), (override));
+ const TRequestRestartOptions& options), (override));
MOCK_METHOD(TFuture<void>, SetUserPassword, (
const TString& user,
diff --git a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
index 430f00cea1..af2bc187cd 100644
--- a/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
+++ b/yt/yt_proto/yt/client/api/rpc_proxy/proto/api_service.proto
@@ -1858,12 +1858,12 @@ message TRspResurrectChunkLocations
repeated NYT.NProto.TGuid location_uuids = 1;
}
-message TReqRequestReboot
+message TReqRequestRestart
{
required string node_address = 1;
}
-message TRspRequestReboot
+message TRspRequestRestart
{ }
////////////////////////////////////////////////////////////////////////////////