feat: support setting the quota_size parameter in mount point #317

Author: jlon

curvine-cli/src/cmds/mount.rs

@@ -63,6 +63,10 @@ pub struct MountCommand {
 
     #[arg(short, long)]
     storage_type: Option<String>,
+
+    /// Set quota size limit for the mount point (e.g., 10GB, 100MB, 1TB)
+    #[arg(long = "quota-size")]
+    quota_size: Option<String>,
 }
 
 impl MountCommand {
@@ -176,6 +180,13 @@ impl MountCommand {
         if let Some(storage_type) = self.storage_type.as_ref() {
             opts = opts.storage_type(StorageType::try_from(storage_type.as_str())?);
         }
+        if let Some(quota_size) = self.quota_size.as_ref() {
+            let quota_bytes = ByteUnit::from_str(quota_size.as_str())?.as_byte();
+            if quota_bytes > i64::MAX as u64 {
+                return err_box!("quota size {} exceeds i64 limit", quota_size);
+            }
+            opts = opts.quota_size(quota_bytes as i64);
+        }
 
         Ok(opts.build())
     }

curvine-common/proto/mount.proto

@@ -24,6 +24,7 @@ message MountInfoProto {
     optional int64 block_size = 9;
     optional int32 replicas = 10;
     required MountTypeProto mount_type = 11;
+    optional int64 quota_size = 12;
 }
 
 message MountOptionsProto {
@@ -37,6 +38,7 @@ message MountOptionsProto {
     optional int32 replicas = 8;
     required MountTypeProto mount_type = 9;
     repeated string remove_properties = 10;
+    optional int64 quota_size = 11;
 }
 
 enum ConsistencyStrategyProto {

curvine-common/src/state/mount.rs

@@ -102,6 +102,7 @@ pub struct MountInfo {
     pub block_size: Option<i64>,
     pub replicas: Option<i32>,
     pub mount_type: MountType,
+    pub quota_size: Option<i64>,
 }
 
 impl MountInfo {
@@ -156,6 +157,7 @@ pub struct MountOptions {
     pub replicas: Option<i32>,
     pub mount_type: MountType,
     pub remove_properties: Vec<String>,
+    pub quota_size: Option<i64>,
 }
 
 impl MountOptions {
@@ -179,6 +181,7 @@ impl MountOptions {
             block_size: self.block_size,
             replicas: self.replicas,
             mount_type: self.mount_type,
+            quota_size: self.quota_size,
         }
     }
 }
@@ -195,6 +198,7 @@ pub struct MountOptionsBuilder {
     replicas: Option<i32>,
     mount_type: MountType,
     remove_properties: Vec<String>,
+    quota_size: Option<i64>,
 }
 
 impl MountOptionsBuilder {
@@ -266,6 +270,11 @@ impl MountOptionsBuilder {
         self
     }
 
+    pub fn quota_size(mut self, quota_size: i64) -> Self {
+        self.quota_size = Some(quota_size);
+        self
+    }
+
     pub fn build(self) -> MountOptions {
         MountOptions {
             update: self.update,
@@ -278,6 +287,7 @@ impl MountOptionsBuilder {
             replicas: self.replicas,
             mount_type: self.mount_type,
             remove_properties: self.remove_properties,
+            quota_size: self.quota_size,
         }
     }
 }

curvine-common/src/utils/proto_utils.rs

@@ -511,6 +511,7 @@ impl ProtoUtils {
             block_size: info.block_size,
             replicas: info.replicas,
             mount_type: info.mount_type.into(),
+            quota_size: info.quota_size,
         }
     }
 
@@ -527,6 +528,7 @@ impl ProtoUtils {
             block_size: info.block_size,
             replicas: info.replicas,
             mount_type: info.mount_type.into(),
+            quota_size: info.quota_size,
         }
     }
 
@@ -542,6 +544,7 @@ impl ProtoUtils {
             replicas: opts.replicas,
             mount_type: opts.mount_type.into(),
             remove_properties: opts.remove_properties,
+            quota_size: opts.quota_size,
         }
     }
 
@@ -557,6 +560,7 @@ impl ProtoUtils {
             replicas: opts.replicas,
             mount_type: MountType::from(opts.mount_type),
             remove_properties: opts.remove_properties,
+            quota_size: opts.quota_size,
         }
     }
 

curvine-server/src/master/master_handler.rs

@@ -444,6 +444,7 @@ impl MessageHandler for MasterHandler {
             RpcCode::GetMountTable => self.get_mount_table(ctx),
             RpcCode::GetMountInfo => self.get_mount_info(ctx),
 
+            // Quota management
             RpcCode::MetricsReport => self.metrics_report(ctx),
 
             // Worker related requests

curvine-server/src/master/meta/fs_dir.rs

@@ -521,6 +521,7 @@ impl FsDir {
             inode.as_file_ref()?,
             commit_block,
         )?;
+
         Ok(true)
     }
 

curvine-server/src/master/meta/fs_stats.rs

@@ -53,7 +53,7 @@ impl FileSystemStats {
 
     pub fn set_counts(&self, file_count: i64, dir_count: i64) {
         self.metrics.inode_file_num.set(file_count);
-        self.metrics.inode_file_num.set(dir_count);
+        self.metrics.inode_dir_num.set(dir_count);
     }
 }
 

curvine-server/src/master/mount/mount_manager.rs

@@ -83,8 +83,8 @@ impl MountManager {
         ufs_path: &str,
         mnt_opt: &MountOptions,
     ) -> FsResult<()> {
-        if !self.mount_table.exists(cv_path) {
-            return err_box!("update mode: mount point {} does not exist", ufs_path);
+        if !self.mount_table.cv_path_exists(cv_path) {
+            return err_box!("update mode: mount point {} does not exist", cv_path);
         }
 
         self.mount_table.umount(cv_path)?;

curvine-server/src/master/mount/mount_table.rs

@@ -68,6 +68,11 @@ impl MountTable {
         false
     }
 
+    pub fn cv_path_exists(&self, cv_path: &str) -> bool {
+        let inner = self.inner.read().unwrap();
+        inner.mountpath2id.contains_key(cv_path)
+    }
+
     pub fn check_conflict(&self, cv_path: &str, _ufs_path: &str) -> FsResult<()> {
         let inner = self.inner.read().unwrap();
         for info in inner.mountid2entry.values() {