fix: listdir rpc (#979)

Co-authored-by: houseme <housemecn@gmail.com>
Co-authored-by: loverustfs <hello@rustfs.com>

crates/ecstore/src/disk/mod.rs

@@ -271,10 +271,10 @@ impl DiskAPI for Disk {
     }
 
     #[tracing::instrument(skip(self))]
-    async fn list_dir(&self, _origvolume: &str, volume: &str, _dir_path: &str, _count: i32) -> Result<Vec<String>> {
+    async fn list_dir(&self, _origvolume: &str, volume: &str, dir_path: &str, count: i32) -> Result<Vec<String>> {
         match self {
-            Disk::Local(local_disk) => local_disk.list_dir(_origvolume, volume, _dir_path, _count).await,
-            Disk::Remote(remote_disk) => remote_disk.list_dir(_origvolume, volume, _dir_path, _count).await,
+            Disk::Local(local_disk) => local_disk.list_dir(_origvolume, volume, dir_path, count).await,
+            Disk::Remote(remote_disk) => remote_disk.list_dir(_origvolume, volume, dir_path, count).await,
         }
     }
 

crates/ecstore/src/rpc/remote_disk.rs

@@ -42,7 +42,7 @@ use rustfs_protos::proto_gen::node_service::RenamePartRequest;
 use rustfs_rio::{HttpReader, HttpWriter};
 use tokio::{io::AsyncWrite, net::TcpStream, time::timeout};
 use tonic::Request;
-use tracing::info;
+use tracing::{debug, info};
 use uuid::Uuid;
 
 #[derive(Debug)]
@@ -596,14 +596,16 @@ impl DiskAPI for RemoteDisk {
     }
 
     #[tracing::instrument(skip(self))]
-    async fn list_dir(&self, _origvolume: &str, volume: &str, _dir_path: &str, _count: i32) -> Result<Vec<String>> {
-        info!("list_dir {}/{}", volume, _dir_path);
+    async fn list_dir(&self, _origvolume: &str, volume: &str, dir_path: &str, count: i32) -> Result<Vec<String>> {
+        debug!("list_dir {}/{}", volume, dir_path);
         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(ListDirRequest {
             disk: self.endpoint.to_string(),
             volume: volume.to_string(),
+            dir_path: dir_path.to_string(),
+            count,
         });
 
         let response = client.list_dir(request).await?.into_inner();

crates/protos/src/generated/flatbuffers_generated/mod.rs

@@ -1 +1,15 @@
+// Copyright 2024 RustFS Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 pub mod models;

crates/protos/src/generated/proto_gen/node_service.rs

@@ -303,6 +303,10 @@ pub struct ListDirRequest {
     pub disk: ::prost::alloc::string::String,
     #[prost(string, tag = "2")]
     pub volume: ::prost::alloc::string::String,
+    #[prost(string, tag = "3")]
+    pub dir_path: ::prost::alloc::string::String,
+    #[prost(int32, tag = "4")]
+    pub count: i32,
 }
 #[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ListDirResponse {

crates/protos/src/main.rs

@@ -16,7 +16,9 @@ use std::{cmp, env, fs, io::Write, path::Path, process::Command};
 
 type AnyError = Box<dyn std::error::Error>;
 
+/// Expected version of `protoc` compiler.
 const VERSION_PROTOBUF: Version = Version(33, 1, 0); // 31.1.0
+/// Expected version of `flatc` compiler.
 const VERSION_FLATBUFFERS: Version = Version(25, 9, 23); // 25.9.23
 /// Build protos if the major version of `flatc` or `protoc` is greater
 /// or lesser than the expected version.
@@ -26,8 +28,10 @@ const ENV_FLATC_PATH: &str = "FLATC_PATH";
 
 fn main() -> Result<(), AnyError> {
     let version = protobuf_compiler_version()?;
+
     let need_compile = match version.compare_ext(&VERSION_PROTOBUF) {
         Ok(cmp::Ordering::Greater) => true,
+        Ok(cmp::Ordering::Equal) => true,
         Ok(_) => {
             if let Some(version_err) = Version::build_error_message(&version, &VERSION_PROTOBUF) {
                 println!("cargo:warning=Tool `protoc` {version_err}, skip compiling.");
@@ -42,6 +46,7 @@ fn main() -> Result<(), AnyError> {
     };
 
     if !need_compile {
+        println!("no need to compile protos.{}", need_compile);
         return Ok(());
     }
 
@@ -121,13 +126,20 @@ fn main() -> Result<(), AnyError> {
         Err(_) => "flatc".to_string(),
     };
 
-    compile_flatbuffers_models(
+    match compile_flatbuffers_models(
         &mut generated_mod_rs,
         &flatc_path,
         proto_dir.clone(),
         flatbuffer_out_dir.clone(),
         vec!["models"],
-    )?;
+    ) {
+        Ok(_) => {
+            println!("Successfully compiled flatbuffers models.");
+        }
+        Err(e) => {
+            return Err(format!("Failed to compile flatbuffers models: {e}").into());
+        }
+    }
 
     fmt();
     Ok(())
@@ -144,6 +156,7 @@ fn compile_flatbuffers_models<P: AsRef<Path>, S: AsRef<str>>(
     let version = flatbuffers_compiler_version(flatc_path)?;
     let need_compile = match version.compare_ext(&VERSION_FLATBUFFERS) {
         Ok(cmp::Ordering::Greater) => true,
+        Ok(cmp::Ordering::Equal) => true,
         Ok(_) => {
             if let Some(version_err) = Version::build_error_message(&version, &VERSION_FLATBUFFERS) {
                 println!("cargo:warning=Tool `{flatc_path}` {version_err}, skip compiling.");
@@ -161,6 +174,23 @@ fn compile_flatbuffers_models<P: AsRef<Path>, S: AsRef<str>>(
 
     // $rust_dir/mod.rs
     let mut sub_mod_rs = fs::File::create(rust_dir.join("mod.rs"))?;
+    writeln!(
+        &mut sub_mod_rs,
+        r#"// Copyright 2024 RustFS Team
+    //
+    // Licensed under the Apache License, Version 2.0 (the "License");
+    // you may not use this file except in compliance with the License.
+    // You may obtain a copy of the License at
+    //
+    //     http://www.apache.org/licenses/LICENSE-2.0
+    //
+    // Unless required by applicable law or agreed to in writing, software
+    // distributed under the License is distributed on an "AS IS" BASIS,
+    // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    // See the License for the specific language governing permissions and
+    // limitations under the License."#
+    )?;
+    writeln!(&mut sub_mod_rs, "\n")?;
     writeln!(generated_mod_rs)?;
     writeln!(generated_mod_rs, "mod flatbuffers_generated;")?;
     for mod_name in mod_names.iter() {

crates/protos/src/node.proto

@@ -225,6 +225,8 @@ message ReadAtResponse {
 message ListDirRequest {
   string disk = 1;  // indicate which one in the disks
   string volume = 2;
+  string dir_path = 3;
+  int32 count = 4;
 }
 
 message ListDirResponse {