feat(zfs-localpv): add option for choosing between refquota and quota

Signed-off-by: cina_pm <[email protected]> feat(zfs-localpv): add comments for quota types Signed-off-by: cina_pm <[email protected]> fix(zfs-localpv): run goimports on main.go Signed-off-by: cina_pm <[email protected]>
openebs · Jun 23, 2024 · ab2b941 · ab2b941
1 parent 1b0b77e
commit ab2b941
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -22,7 +22,8 @@ import (
 	"log"
 	"os"
 
-	config "github.com/openebs/zfs-localpv/pkg/config"
+	configs "github.com/openebs/zfs-localpv/pkg/config"
+
 	"github.com/openebs/zfs-localpv/pkg/driver"
 	"github.com/openebs/zfs-localpv/pkg/version"
 	zfs "github.com/openebs/zfs-localpv/pkg/zfs"
@@ -40,7 +41,7 @@ import (
  */
 func main() {
 	_ = flag.CommandLine.Parse([]string{})
-	var config = config.Default()
+	var config = configs.Default()
 
 	cmd := &cobra.Command{
 		Use:   "zfs-driver",
@@ -74,18 +75,26 @@ func main() {
 		&config.PluginType, "plugin", "csi-plugin", "Type of this driver i.e. controller or node",
 	)
 
+	cmd.PersistentFlags().StringVar(
+		&configs.QuotaType, "quota-type", "quota", "quota type: refquota or quota",
+	)
+
 	err := cmd.Execute()
 	if err != nil {
 		_, _ = fmt.Fprintf(os.Stderr, "%s", err.Error())
 		os.Exit(1)
 	}
 }
 
-func run(config *config.Config) {
+func run(config *configs.Config) {
 	if config.Version == "" {
 		config.Version = version.Current()
 	}
 
+	if configs.QuotaType != configs.Quota && configs.QuotaType != configs.RefQuota {
+		log.Fatalln(fmt.Errorf("quota-type should be quota or refquota"))
+	}
+
 	klog.Infof("ZFS Driver Version :- %s - commit :- %s", version.Current(), version.GetGitCommit())
 	klog.Infof(
 		"DriverName: %s Plugin: %s EndPoint: %s Node Name: %s",

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -43,6 +43,13 @@ type Config struct {
 	Nodename string
 }
 
+const (
+	Quota    = "quota"    // This option sets a limit on the amount of disk space a dataset can use
+	RefQuota = "refquota" // This option sets a limit on the amount of disk space a dataset and all its snapshots can use
+)
+
+var QuotaType string
+
 // Default returns a new instance of config
 // required to initialize a driver instance
 func Default() *Config {

diff --git a/pkg/zfs/zfs_util.go b/pkg/zfs/zfs_util.go
@@ -18,6 +18,7 @@ package zfs
 
 import (
 	"bufio"
+	configs "github.com/openebs/zfs-localpv/pkg/config"
 	"os/exec"
 	"path/filepath"
 	"strconv"
@@ -143,7 +144,7 @@ func buildCloneCreateArgs(vol *apis.ZFSVolume) []string {
 
 	if vol.Spec.VolumeType == VolTypeDataset {
 		if len(vol.Spec.Capacity) != 0 {
-			quotaProperty := "quota=" + vol.Spec.Capacity
+			quotaProperty := configs.QuotaType + "=" + vol.Spec.Capacity
 			ZFSVolArg = append(ZFSVolArg, "-o", quotaProperty)
 		}
 		if len(vol.Spec.RecordSize) != 0 {
@@ -216,7 +217,7 @@ func buildDatasetCreateArgs(vol *apis.ZFSVolume) []string {
 	ZFSVolArg = append(ZFSVolArg, ZFSCreateArg)
 
 	if len(vol.Spec.Capacity) != 0 {
-		quotaProperty := "quota=" + vol.Spec.Capacity
+		quotaProperty := configs.QuotaType + "=" + vol.Spec.Capacity
 		ZFSVolArg = append(ZFSVolArg, "-o", quotaProperty)
 	}
 	if len(vol.Spec.RecordSize) != 0 {
@@ -292,7 +293,7 @@ func buildVolumeResizeArgs(vol *apis.ZFSVolume) []string {
 	ZFSVolArg = append(ZFSVolArg, ZFSSetArg)
 
 	if vol.Spec.VolumeType == VolTypeDataset {
-		quotaProperty := "quota=" + vol.Spec.Capacity
+		quotaProperty := configs.QuotaType + "=" + vol.Spec.Capacity
 		ZFSVolArg = append(ZFSVolArg, quotaProperty)
 	} else {
 		volsizeProperty := "volsize=" + vol.Spec.Capacity
@@ -350,7 +351,7 @@ func buildVolumeRestoreArgs(rstr *apis.ZFSRestore) ([]string, error) {
 
 	if rstr.VolSpec.VolumeType == VolTypeDataset {
 		if len(rstr.VolSpec.Capacity) != 0 {
-			ZFSRecvParam += " -o quota=" + rstr.VolSpec.Capacity
+			ZFSRecvParam += " -o " + configs.QuotaType + "=" + rstr.VolSpec.Capacity
 		}
 		if len(rstr.VolSpec.RecordSize) != 0 {
 			ZFSRecvParam += " -o recordsize=" + rstr.VolSpec.RecordSize