[quota] config fs quota when mount fs

Author: jackblack369

internal/configure/client.go

@@ -53,6 +53,9 @@ const (
 	KEY_CLIENT_S3_ADDRESS     = "s3.endpoint"
 	KEY_CLIENT_S3_BUCKET_NAME = "s3.bucket_name"
 
+	KEY_QUOTA_CAPACITY = "quota.capacity"
+	KEY_QUOTA_INODES   = "quota.inodes"
+
 	DEFAULT_CORE_LOCATE_DIR = "/core"
 )
 
@@ -194,6 +197,14 @@ func (cc *ClientConfig) getBool(key string) bool {
 	return v.(bool)
 }
 
+func (cc *ClientConfig) getDigital(key string) int {
+	v := cc.config[strings.ToLower(key)]
+	if v == nil {
+		return 0
+	}
+	return v.(int)
+}
+
 func (cc *ClientConfig) GetKind() string                     { return cc.getString(KEY_KIND) }
 func (cc *ClientConfig) GetDataDir() string                  { return cc.getString(KEY_DATA_DIR) }
 func (cc *ClientConfig) GetLogDir() string                   { return cc.getString(KEY_LOG_DIR) }
@@ -205,6 +216,8 @@ func (cc *ClientConfig) GetS3Address() string                { return cc.getStri
 func (cc *ClientConfig) GetS3BucketName() string             { return cc.getString(KEY_CLIENT_S3_BUCKET_NAME) }
 func (cc *ClientConfig) GetContainerPid() string             { return cc.getString(KEY_CONTAINER_PID) }
 func (cc *ClientConfig) GetEnvironments() string             { return cc.getString(KEY_ENVIRONMENT) }
+func (cc *ClientConfig) GetQuotaCapacity() int               { return cc.getDigital(KEY_QUOTA_CAPACITY) }
+func (cc *ClientConfig) GetQuotaInodes() int                 { return cc.getDigital(KEY_QUOTA_INODES) }
 func (cc *ClientConfig) GetCoreLocateDir() string            { return DEFAULT_CORE_LOCATE_DIR }
 func (cc *ClientConfig) GetData() string                     { return cc.data }
 func (cc *ClientConfig) GetServiceConfig() map[string]string { return cc.serviceConfig }

internal/task/scripts/shell/create_fs_v2.sh

@@ -8,22 +8,55 @@
 
 g_dingofs_tool="dingo"
 g_dingofs_tool_operator="create fs"
+g_dingofs_tool_config="config fs"
 g_fsname="--fsname="
 g_fstype="--fstype="
+g_quota_capacity="--capacity="
+g_quota_inodes="--inodes="
 g_entrypoint="/entrypoint.sh"
 
 function createfs() {
     g_fsname=$g_fsname$1
     g_fstype=$g_fstype$2
 
+    # create fs command: dingo create fs --fsname <fsname> --fstype s3 xxx
     $g_dingofs_tool $g_dingofs_tool_operator "$g_fsname" "$g_fstype"
 }
 
-createfs "$@"
+function configfs() {
+    # config fs quota: dingo config fs --fsname <fsname>  --capacity <capacity> --inodes <inodes>
+    echo "$g_dingofs_tool $g_dingofs_tool_config $g_fsname $g_quota_capacity$1 $g_quota_inodes$2"
+    $g_dingofs_tool $g_dingofs_tool_config "$g_fsname" "$g_quota_capacity$1" "$g_quota_inodes$2" 
+}
+
+# Parse command parameters
+capacity=""
+inodes=""
+args=()
+for arg in "$@"; do
+    case $arg in
+        --capacity=*)
+            capacity="${arg#*=}"
+            ;;
+        --inodes=*)
+            inodes="${arg#*=}"
+            ;;
+        *)
+            args+=("$arg")
+            ;;
+    esac
+done
+
+echo "create fs args: ${args[@]}"
+createfs "${args[@]}"
 
 ret=$?
 if [ $ret -eq 0 ]; then
-    $g_entrypoint "$@"
+    if [ -n "$capacity" ] || [ -n "$inodes" ]; then
+        echo "config fs quota: capacity=$capacity, inodes=$inodes"
+        configfs "$capacity" "$inodes"
+    fi
+    $g_entrypoint "${args[@]}"
     ret=$?
     exit $ret
 else

internal/task/task/fs/mount.go

@@ -89,7 +89,11 @@ func getMountCommand(cc *configure.ClientConfig, mountFSName string, mountFSType
 	format := strings.Join(FORMAT_FUSE_ARGS, " ")
 	fuseArgs := fmt.Sprintf(format, mountFSName, mountFSType,
 		configure.GetFSClientConfPath(), configure.GetFSClientMountPath(mountPoint))
-	return fmt.Sprintf("/client.sh %s %s --role=client --args='%s'", mountFSName, mountFSType, fuseArgs)
+
+	fmt.Printf("docker bootstrap command: /client.sh %s %s --role=client --args='%s' --capacity=%d --inodes=%d\n", mountFSName, mountFSType, fuseArgs, cc.GetQuotaCapacity(), cc.GetQuotaInodes())
+
+	return fmt.Sprintf("/client.sh %s %s --role=client --args='%s' --capacity=%d --inodes=%d", mountFSName, mountFSType, fuseArgs, cc.GetQuotaCapacity(), cc.GetQuotaInodes())
+
 }
 
 func getMountVolumes(cc *configure.ClientConfig) []step.Volume {