resolve conficts

tools-v2/pkg/config/bs.go

@@ -68,10 +68,13 @@ const (
 	VIPER_CURVEBS_OFFSET        = "curvebs.offset"
 	CURVEBS_SIZE                = "size"
 	VIPER_CURVEBS_SIZE          = "curvebs.size"
+<<<<<<< HEAD
 	CURVEBS_RECYCLE_PREFIX      = "recycleprefix"
 	VIPER_RECYCLE_PREFIX        = "curvebs.recycleprefix"
 	CURVE_EXPIRED_TIME          = "expiredtime"
 	VIPER_CURVE_EXPIRED_TIME    = "curvebs.expiredtime"
+=======
+>>>>>>> master
 )
 
 var (
@@ -92,6 +95,8 @@ var (
 		CURVEBS_COPYSET_ID:    VIPER_CURVEBS_COPYSET_ID,
 		CURVEBS_PEERS_ADDRESS: VIPER_CURVEBS_PEERS_ADDRESS,
 		CURVEBS_CLUSTERMAP:    VIPER_CURVEBS_CLUSTERMAP,
+		CURVEBS_OFFSET:        VIPER_CURVEBS_OFFSET,
+		CURVEBS_SIZE:          VIPER_CURVEBS_SIZE,
 	}
 
 	BSFLAG2DEFAULT = map[string]interface{}{
@@ -159,6 +164,24 @@ func AddBsBoolOptionFlag(cmd *cobra.Command, name string, usage string) {
 	}
 }
 
+func AddBsUint32RequiredFlag(cmd *cobra.Command, name string, usage string) {
+	cmd.Flags().Uint32(name, uint32(0), usage+color.Red.Sprint("[required]"))
+	cmd.MarkFlagRequired(name)
+	err := viper.BindPFlag(BSFLAG2VIPER[name], cmd.Flags().Lookup(name))
+	if err != nil {
+		cobra.CheckErr(err)
+	}
+}
+
+func AddBsUint64RequiredFlag(cmd *cobra.Command, name string, usage string) {
+	cmd.Flags().Uint64(name, uint64(0), usage+color.Red.Sprint("[required]"))
+	cmd.MarkFlagRequired(name)
+	err := viper.BindPFlag(BSFLAG2VIPER[name], cmd.Flags().Lookup(name))
+	if err != nil {
+		cobra.CheckErr(err)
+	}
+}
+
 // add flag option
 // bs mds[option]
 func AddBsMdsFlagOption(cmd *cobra.Command) {
@@ -202,12 +225,16 @@ func AddBsFilenameRequiredFlag(cmd *cobra.Command) {
 	AddBsStringRequiredFlag(cmd, CURVEBS_FILENAME, "the full path of file")
 }
 
-func AddBSLogicalPoolIdFlag(cmd *cobra.Command) {
-	AddBSUint32RequiredFlag(cmd, CURVEBS_LOGIC_POOL_ID, "logical pool id")
+func AddBSLogicalPoolIdRequiredFlag(cmd *cobra.Command) {
+	AddBsUint32RequiredFlag(cmd, CURVEBS_LOGIC_POOL_ID, "logical pool id")
 }
 
-func AddBSCopysetIdFlag(cmd *cobra.Command) {
-	AddBSUint32RequiredFlag(cmd, CURVEBS_COPYSET_ID, "copyset id")
+func AddBSCopysetIdRequiredFlag(cmd *cobra.Command) {
+	AddBsUint32RequiredFlag(cmd, CURVEBS_COPYSET_ID, "copyset id")
+}
+
+func AddBSCopysetIdSliceRequiredFlag(cmd *cobra.Command) {
+	AddBsStringSliceRequiredFlag(cmd, CURVEBS_COPYSET_ID, "copyset ids")
 }
 
 func AddBSPeersConfFlag(cmd *cobra.Command) {
@@ -218,13 +245,12 @@ func AddBsForceDeleteOptionFlag(cmd *cobra.Command) {
 	AddBsBoolOptionFlag(cmd, CURVEBS_FORCEDELETE, "whether to force delete the file")
 }
 
-func AddBSUint32RequiredFlag(cmd *cobra.Command, name string, usage string) {
-	cmd.Flags().Uint32(name, uint32(0), usage+color.Red.Sprint("[required]"))
-	cmd.MarkFlagRequired(name)
-	err := viper.BindPFlag(BSFLAG2VIPER[name], cmd.Flags().Lookup(name))
-	if err != nil {
-		cobra.CheckErr(err)
-	}
+func AddBsOffsetRequiredFlag(cmd *cobra.Command) {
+	AddBsUint64RequiredFlag(cmd, CURVEBS_OFFSET, "offset")
+}
+
+func AddBsSizeRequiredFlag(cmd *cobra.Command) {
+	AddBsStringRequiredFlag(cmd, CURVEBS_SIZE, "size, just like: 10GiB")
 }
 
 // get stingslice flag
@@ -250,7 +276,7 @@ func GetBsFlagString(cmd *cobra.Command, flagName string) string {
 }
 
 // GetBsFlagUint32 get uint32 flag
-func GetBsFlagUint32(cmd *cobra.Command, flagName string) (uint32, error) {
+func GetBsFlagUint32(cmd *cobra.Command, flagName string) uint32 {
 	var value string
 	if cmd.Flag(flagName).Changed {
 		value = cmd.Flag(flagName).Value.String()
@@ -259,10 +285,21 @@ func GetBsFlagUint32(cmd *cobra.Command, flagName string) (uint32, error) {
 	}
 	val, err := strconv.ParseUint(value, 10, 32)
 	if err != nil {
-		return 0, err
+		return 0
 	}
 
-	return uint32(val), nil
+	return uint32(val)
+}
+
+// get uint64 flag
+func GetBsFlagUint64(cmd *cobra.Command, flagName string) uint64 {
+	var value uint64
+	if cmd.Flag(flagName).Changed {
+		value, _ = cmd.Flags().GetUint64(flagName)
+	} else {
+		value = viper.GetUint64(FLAG2VIPER[flagName])
+	}
+	return value
 }
 
 // get mdsaddr