Merge pull request opensvc#670 from cvaroqui/b2.1

Fix the zvol create options order
cgalibern · Oct 21, 2024 · 53a5054 · 53a5054
2 parents 17db875 + d6fe39e
commit 53a5054
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/opensvc/daemon/monitor.py b/opensvc/daemon/monitor.py
@@ -2646,6 +2646,7 @@ def leader_first(self, svc, provisioned=False, deleted=None, silent=False):
             candidates = self.placement_candidates(
                 svc, discard_frozen=False,
                 discard_unprovisioned=False,
+                discard_overloaded=False,
             )
         try:
             top = self.placement_ranks(svc, candidates=candidates)[0]

diff --git a/opensvc/drivers/resource/disk/zvol/__init__.py b/opensvc/drivers/resource/disk/zvol/__init__.py
@@ -178,9 +178,9 @@ def provisioner(self):
         if self.has_it():
             self.log.info("zvol %s already exists", self.name)
             return
-        cmd = [Env.syspaths.zfs, "create", "-V"]
+        cmd = [Env.syspaths.zfs, "create"]
         cmd += self.create_options
-        cmd += [str(convert_size(self.size, _to="m"))+'M', self.name]
+        cmd += ["-V", str(convert_size(self.size, _to="m"))+'M', self.name]
         ret, out, err = self.vcall(cmd)
         if ret != 0:
             raise ex.Error