From 9119199f6ed0ad7c8059132b5b9c506df1f8d0b7 Mon Sep 17 00:00:00 2001 From: Dmitrii Stepanov Date: Fri, 26 May 2023 11:26:54 +0300 Subject: [PATCH] [#397] cli: Fix evacuation method names Signed-off-by: Dmitrii Stepanov --- cmd/frostfs-cli/modules/control/evacuation.go | 8 ++-- pkg/services/control/rpc.go | 42 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cmd/frostfs-cli/modules/control/evacuation.go b/cmd/frostfs-cli/modules/control/evacuation.go index 665bcf85f0..45152fa0a1 100644 --- a/cmd/frostfs-cli/modules/control/evacuation.go +++ b/cmd/frostfs-cli/modules/control/evacuation.go @@ -67,7 +67,7 @@ func startEvacuateShard(cmd *cobra.Command, _ []string) { var resp *control.StartShardEvacuationResponse var err error err = cli.ExecRaw(func(client *client.Client) error { - resp, err = control.StartEvacuateShard(client, req) + resp, err = control.StartShardEvacuation(client, req) return err }) commonCmd.ExitOnErr(cmd, "Start evacuate shards failed, rpc error: %w", err) @@ -95,7 +95,7 @@ func getEvacuateShardStatus(cmd *cobra.Command, _ []string) { var resp *control.GetShardEvacuationStatusResponse var err error err = cli.ExecRaw(func(client *client.Client) error { - resp, err = control.GetEvacuateShardStatus(client, req) + resp, err = control.GetShardEvacuationStatus(client, req) return err }) commonCmd.ExitOnErr(cmd, "Get evacuate shards status failed, rpc error: %w", err) @@ -118,7 +118,7 @@ func stopEvacuateShardStatus(cmd *cobra.Command, _ []string) { var resp *control.StopShardEvacuationResponse var err error err = cli.ExecRaw(func(client *client.Client) error { - resp, err = control.StopEvacuateShard(client, req) + resp, err = control.StopShardEvacuation(client, req) return err }) commonCmd.ExitOnErr(cmd, "Stop evacuate shards failed, rpc error: %w", err) @@ -166,7 +166,7 @@ func waitEvacuateCompletion(cmd *cobra.Command, pk *ecdsa.PrivateKey, cli *clien var err error err = cli.ExecRaw(func(client *client.Client) error { - resp, err = control.GetEvacuateShardStatus(client, req) + resp, err = control.GetShardEvacuationStatus(client, req) return err }) diff --git a/pkg/services/control/rpc.go b/pkg/services/control/rpc.go index 3822c9f70e..a2e7c411a6 100644 --- a/pkg/services/control/rpc.go +++ b/pkg/services/control/rpc.go @@ -8,18 +8,18 @@ import ( const serviceName = "control.ControlService" const ( - rpcHealthCheck = "HealthCheck" - rpcSetNetmapStatus = "SetNetmapStatus" - rpcDropObjects = "DropObjects" - rpcListShards = "ListShards" - rpcSetShardMode = "SetShardMode" - rpcSynchronizeTree = "SynchronizeTree" - rpcEvacuateShard = "EvacuateShard" - rpcStartEvacuateShard = "StartEvacuateShard" - rpcGetEvacuateShardStatus = "GetEvacuateShardStatus" - rpcStopEvacuateShardStatus = "StopEvacuateShard" - rpcFlushCache = "FlushCache" - rpcDoctor = "Doctor" + rpcHealthCheck = "HealthCheck" + rpcSetNetmapStatus = "SetNetmapStatus" + rpcDropObjects = "DropObjects" + rpcListShards = "ListShards" + rpcSetShardMode = "SetShardMode" + rpcSynchronizeTree = "SynchronizeTree" + rpcEvacuateShard = "EvacuateShard" + rpcStartShardEvacuation = "StartShardEvacuation" + rpcGetShardEvacuationStatus = "GetShardEvacuationStatus" + rpcStopShardEvacuation = "StopShardEvacuation" + rpcFlushCache = "FlushCache" + rpcDoctor = "Doctor" ) // HealthCheck executes ControlService.HealthCheck RPC. @@ -144,12 +144,12 @@ func EvacuateShard(cli *client.Client, req *EvacuateShardRequest, opts ...client return wResp.message, nil } -// StartEvacuateShard executes ControlService.StartEvacuateShard RPC. -func StartEvacuateShard(cli *client.Client, req *StartShardEvacuationRequest, opts ...client.CallOption) (*StartShardEvacuationResponse, error) { +// StartShardEvacuation executes ControlService.StartShardEvacuation RPC. +func StartShardEvacuation(cli *client.Client, req *StartShardEvacuationRequest, opts ...client.CallOption) (*StartShardEvacuationResponse, error) { wResp := newResponseWrapper[StartShardEvacuationResponse]() wReq := &requestWrapper{m: req} - err := client.SendUnary(cli, common.CallMethodInfoUnary(serviceName, rpcStartEvacuateShard), wReq, wResp, opts...) + err := client.SendUnary(cli, common.CallMethodInfoUnary(serviceName, rpcStartShardEvacuation), wReq, wResp, opts...) if err != nil { return nil, err } @@ -157,12 +157,12 @@ func StartEvacuateShard(cli *client.Client, req *StartShardEvacuationRequest, op return wResp.message, nil } -// GetEvacuateShardStatus executes ControlService.GetEvacuateShardStatus RPC. -func GetEvacuateShardStatus(cli *client.Client, req *GetShardEvacuationStatusRequest, opts ...client.CallOption) (*GetShardEvacuationStatusResponse, error) { +// GetShardEvacuationStatus executes ControlService.GetShardEvacuationStatus RPC. +func GetShardEvacuationStatus(cli *client.Client, req *GetShardEvacuationStatusRequest, opts ...client.CallOption) (*GetShardEvacuationStatusResponse, error) { wResp := newResponseWrapper[GetShardEvacuationStatusResponse]() wReq := &requestWrapper{m: req} - err := client.SendUnary(cli, common.CallMethodInfoUnary(serviceName, rpcGetEvacuateShardStatus), wReq, wResp, opts...) + err := client.SendUnary(cli, common.CallMethodInfoUnary(serviceName, rpcGetShardEvacuationStatus), wReq, wResp, opts...) if err != nil { return nil, err } @@ -170,12 +170,12 @@ func GetEvacuateShardStatus(cli *client.Client, req *GetShardEvacuationStatusReq return wResp.message, nil } -// StopEvacuateShard executes ControlService.StopEvacuateShard RPC. -func StopEvacuateShard(cli *client.Client, req *StopShardEvacuationRequest, opts ...client.CallOption) (*StopShardEvacuationResponse, error) { +// StopShardEvacuation executes ControlService.StopShardEvacuation RPC. +func StopShardEvacuation(cli *client.Client, req *StopShardEvacuationRequest, opts ...client.CallOption) (*StopShardEvacuationResponse, error) { wResp := newResponseWrapper[StopShardEvacuationResponse]() wReq := &requestWrapper{m: req} - err := client.SendUnary(cli, common.CallMethodInfoUnary(serviceName, rpcStopEvacuateShardStatus), wReq, wResp, opts...) + err := client.SendUnary(cli, common.CallMethodInfoUnary(serviceName, rpcStopShardEvacuation), wReq, wResp, opts...) if err != nil { return nil, err }