diff --git a/common/protos/src/generated/proto_gen/node_service.rs b/common/protos/src/generated/proto_gen/node_service.rs index f7790549..4b441819 100644 --- a/common/protos/src/generated/proto_gen/node_service.rs +++ b/common/protos/src/generated/proto_gen/node_service.rs @@ -191,7 +191,7 @@ pub struct CheckPartsResponse { pub error: ::core::option::Option, } #[derive(Clone, PartialEq, ::prost::Message)] -pub struct RenamePartRequst { +pub struct RenamePartRequest { #[prost(string, tag = "1")] pub disk: ::prost::alloc::string::String, #[prost(string, tag = "2")] @@ -213,7 +213,7 @@ pub struct RenamePartResponse { pub error: ::core::option::Option, } #[derive(Clone, PartialEq, ::prost::Message)] -pub struct RenameFileRequst { +pub struct RenameFileRequest { #[prost(string, tag = "1")] pub disk: ::prost::alloc::string::String, #[prost(string, tag = "2")] @@ -1298,7 +1298,7 @@ pub mod node_service_client { } pub async fn rename_part( &mut self, - request: impl tonic::IntoRequest, + request: impl tonic::IntoRequest, ) -> std::result::Result, tonic::Status> { self.inner .ready() @@ -1313,7 +1313,7 @@ pub mod node_service_client { } pub async fn rename_file( &mut self, - request: impl tonic::IntoRequest, + request: impl tonic::IntoRequest, ) -> std::result::Result, tonic::Status> { self.inner .ready() @@ -2330,11 +2330,11 @@ pub mod node_service_server { ) -> std::result::Result, tonic::Status>; async fn rename_part( &self, - request: tonic::Request, + request: tonic::Request, ) -> std::result::Result, tonic::Status>; async fn rename_file( &self, - request: tonic::Request, + request: tonic::Request, ) -> std::result::Result, tonic::Status>; async fn write( &self, @@ -2989,10 +2989,10 @@ pub mod node_service_server { "/node_service.NodeService/RenamePart" => { #[allow(non_camel_case_types)] struct RenamePartSvc(pub Arc); - impl tonic::server::UnaryService for RenamePartSvc { + impl tonic::server::UnaryService for RenamePartSvc { type Response = super::RenamePartResponse; type Future = BoxFuture, tonic::Status>; - fn call(&mut self, request: tonic::Request) -> Self::Future { + fn call(&mut self, request: tonic::Request) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { ::rename_part(&inner, request).await }; Box::pin(fut) @@ -3017,10 +3017,10 @@ pub mod node_service_server { "/node_service.NodeService/RenameFile" => { #[allow(non_camel_case_types)] struct RenameFileSvc(pub Arc); - impl tonic::server::UnaryService for RenameFileSvc { + impl tonic::server::UnaryService for RenameFileSvc { type Response = super::RenameFileResponse; type Future = BoxFuture, tonic::Status>; - fn call(&mut self, request: tonic::Request) -> Self::Future { + fn call(&mut self, request: tonic::Request) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { ::rename_file(&inner, request).await }; Box::pin(fut) diff --git a/common/protos/src/node.proto b/common/protos/src/node.proto index 0fc1feb2..d77dd01a 100644 --- a/common/protos/src/node.proto +++ b/common/protos/src/node.proto @@ -129,7 +129,7 @@ message CheckPartsResponse { optional Error error = 3; } -message RenamePartRequst { +message RenamePartRequest { string disk = 1; string src_volume = 2; string src_path = 3; @@ -143,7 +143,7 @@ message RenamePartResponse { optional Error error = 2; } -message RenameFileRequst { +message RenameFileRequest { string disk = 1; string src_volume = 2; string src_path = 3; @@ -175,7 +175,7 @@ message WriteResponse { // string path = 3; // bytes data = 4; // } -// +// // message AppendResponse { // bool success = 1; // optional Error error = 2; @@ -755,8 +755,8 @@ service NodeService { rpc Delete(DeleteRequest) returns (DeleteResponse) {}; rpc VerifyFile(VerifyFileRequest) returns (VerifyFileResponse) {}; rpc CheckParts(CheckPartsRequest) returns (CheckPartsResponse) {}; - rpc RenamePart(RenamePartRequst) returns (RenamePartResponse) {}; - rpc RenameFile(RenameFileRequst) returns (RenameFileResponse) {}; + rpc RenamePart(RenamePartRequest) returns (RenamePartResponse) {}; + rpc RenameFile(RenameFileRequest) returns (RenameFileResponse) {}; rpc Write(WriteRequest) returns (WriteResponse) {}; rpc WriteStream(stream WriteRequest) returns (stream WriteResponse) {}; // rpc Append(AppendRequest) returns (AppendResponse) {}; diff --git a/ecstore/src/disk/remote.rs b/ecstore/src/disk/remote.rs index d5eaf1e5..511022cc 100644 --- a/ecstore/src/disk/remote.rs +++ b/ecstore/src/disk/remote.rs @@ -7,7 +7,7 @@ use protos::{ proto_gen::node_service::{ CheckPartsRequest, DeletePathsRequest, DeleteRequest, DeleteVersionRequest, DeleteVersionsRequest, DeleteVolumeRequest, DiskInfoRequest, ListDirRequest, ListVolumesRequest, MakeVolumeRequest, MakeVolumesRequest, NsScannerRequest, - ReadAllRequest, ReadMultipleRequest, ReadVersionRequest, ReadXlRequest, RenameDataRequest, RenameFileRequst, + ReadAllRequest, ReadMultipleRequest, ReadVersionRequest, ReadXlRequest, RenameDataRequest, RenameFileRequest, StatVolumeRequest, UpdateMetadataRequest, VerifyFileRequest, WalkDirRequest, WriteAllRequest, WriteMetadataRequest, }, }; @@ -40,7 +40,7 @@ use crate::{ }, }; -use protos::proto_gen::node_service::RenamePartRequst; +use protos::proto_gen::node_service::RenamePartRequest; #[derive(Debug)] pub struct RemoteDisk { @@ -631,7 +631,7 @@ impl DiskAPI for RemoteDisk { let mut client = node_service_time_out_client(&self.addr) .await .map_err(|err| Error::other(format!("can not get client, err: {}", err)))?; - let request = Request::new(RenameFileRequst { + let request = Request::new(RenameFileRequest { disk: self.endpoint.to_string(), src_volume: src_volume.to_string(), src_path: src_path.to_string(), @@ -654,7 +654,7 @@ impl DiskAPI for RemoteDisk { let mut client = node_service_time_out_client(&self.addr) .await .map_err(|err| Error::other(format!("can not get client, err: {}", err)))?; - let request = Request::new(RenamePartRequst { + let request = Request::new(RenamePartRequest { disk: self.endpoint.to_string(), src_volume: src_volume.to_string(), src_path: src_path.to_string(), diff --git a/rustfs/src/grpc.rs b/rustfs/src/grpc.rs index 8a94e046..6c155edc 100644 --- a/rustfs/src/grpc.rs +++ b/rustfs/src/grpc.rs @@ -437,7 +437,7 @@ impl Node for NodeService { } } - async fn rename_part(&self, request: Request) -> Result, Status> { + async fn rename_part(&self, request: Request) -> Result, Status> { let request = request.into_inner(); if let Some(disk) = self.find_disk(&request.disk).await { match disk @@ -467,7 +467,7 @@ impl Node for NodeService { } } - async fn rename_file(&self, request: Request) -> Result, Status> { + async fn rename_file(&self, request: Request) -> Result, Status> { let request = request.into_inner(); if let Some(disk) = self.find_disk(&request.disk).await { match disk @@ -2224,7 +2224,7 @@ mod tests { Mss, PingRequest, PingResponse, ReadAllRequest, ReadAllResponse, ReadMultipleRequest, ReadMultipleResponse, ReadVersionRequest, ReadVersionResponse, ReadXlRequest, ReadXlResponse, ReloadPoolMetaRequest, ReloadPoolMetaResponse, ReloadSiteReplicationConfigRequest, ReloadSiteReplicationConfigResponse, RenameDataRequest, RenameDataResponse, - RenameFileRequst, RenameFileResponse, RenamePartRequst, RenamePartResponse, ServerInfoRequest, ServerInfoResponse, + RenameFileRequest, RenameFileResponse, RenamePartRequest, RenamePartResponse, ServerInfoRequest, ServerInfoResponse, SignalServiceRequest, SignalServiceResponse, StatVolumeRequest, StatVolumeResponse, StopRebalanceRequest, StopRebalanceResponse, UpdateMetadataRequest, UpdateMetadataResponse, VerifyFileRequest, VerifyFileResponse, WriteAllRequest, WriteAllResponse, WriteMetadataRequest, WriteMetadataResponse, @@ -2508,7 +2508,7 @@ mod tests { async fn test_rename_part_invalid_disk() { let service = create_test_node_service(); - let request = Request::new(RenamePartRequst { + let request = Request::new(RenamePartRequest { disk: "invalid-disk-path".to_string(), src_volume: "src-volume".to_string(), src_path: "src-path".to_string(), @@ -2529,7 +2529,7 @@ mod tests { async fn test_rename_file_invalid_disk() { let service = create_test_node_service(); - let request = Request::new(RenameFileRequst { + let request = Request::new(RenameFileRequest { disk: "invalid-disk-path".to_string(), src_volume: "src-volume".to_string(), src_path: "src-path".to_string(),