Modified constructors in Zvol, Dataset and Snapshot classes.

Signed-off-by: Niclas Berglind <nb@kjam.se>

diff --git a/src/Dataset.php b/src/Dataset.php
index 28bd4d1fd864ec40a3322d6b239b12ac2b933604..9abdb82cde2f50379a9fc83c1b8abfde710cf83f 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -56,21 +56,23 @@ class OMVModuleZFSDataset {
         * @access public
         */
        public function __construct($name) {
+               $ds_exists = true;
                $this->name = $name;
-               $qname = preg_quote($name, '/');
-               $cmd = "zfs list -H 2>&1";
-               $this->exec($cmd, $out, $res);
-               foreach ($out as $line) {
-                       if (preg_match('/^' . $qname . '\t.*$/', $line)) {
-                               $this->updateAllProperties();
-                               $this->mountPoint = $this->properties["mountpoint"]["value"];
-                               continue;
-                       }
+               $cmd = "zfs list -H -t filesystem " . $name . " 2>&1";
+               try {
+                       $this->exec($cmd, $out, $res);
+                       $this->updateAllProperties();
+                       $this->mountPoint = $this->properties["mountpoint"]["value"];
                }
-               $cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1";
-               $this->exec($cmd, $out2, $res2);
-               foreach ($out2 as $line2) {
-                       $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
+               catch (OMVModuleZFSException $e) {
+                       $ds_exists = false;
+               }
+               if ($ds_exists) {
+                       $cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1";
+                       $this->exec($cmd, $out2, $res2);
+                       foreach ($out2 as $line2) {
+                               $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
+                       }
                }
        }
 

diff --git a/src/Snapshot.php b/src/Snapshot.php
index ef90283de51c343696835a45cbab573e1c2c0ce4..afd189c2f082055ddfd31fa72b473d304494c1ed 100644 (file)
--- a/src/Snapshot.php
+++ b/src/Snapshot.php
@@ -40,14 +40,12 @@ class OMVModuleZFSSnapshot {
         */
        public function __construct($name) {
                $this->name = $name;
-               $qname = preg_quote($name, '/');
-               $cmd = "zfs list -H -t snapshot 2>&1";
-               $this->exec($cmd, $out, $res);
-               foreach ($out as $line) {
-                       if (preg_match('/^' . $qname . '\t.*$/', $line)) {
-                               $this->updateAllProperties();
-                               continue;
-                       }
+               $cmd = "zfs list -H -t snapshot " .$name . " 2>&1";
+               try {
+                       $this->exec($cmd, $out, $res);
+                       $this->updateAllProperties();
+               }
+               catch (OMVModuleZFSException $e) {
                }
        }
 

diff --git a/src/Zvol.php b/src/Zvol.php
index 603188aa6c49af16888294b847b8d137ba103948..aea0ca2afca0f046fafa1be464f4fc61f5d2034e 100644 (file)
--- a/src/Zvol.php
+++ b/src/Zvol.php
@@ -57,21 +57,23 @@ class OMVModuleZFSZvol {
         * @access public
         */
        public function __construct($name) {
+               $zvol_exists = true;
                $this->name = $name;
-               $qname = preg_quote($name, '/');
-               $cmd = "zfs list -H -t volume 2>&1";
-               $this->exec($cmd, $out, $res);
-               foreach ($out as $line) {
-                       if (preg_match('/^' . $qname . '\t.*$/', $line)) {
-                               $this->updateAllProperties();
-                               $this->size = $this->properties["volsize"]["value"];
-                               continue;
-                       }
+               $cmd = "zfs list -H -t volume " . $name . " 2>&1";
+               try {
+                       $this->exec($cmd, $out, $res);
+                       $this->updateAllProperties();
+                       $this->size = $this->properties["volsize"]["value"];
                }
-               $cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1";
-               $this->exec($cmd, $out2, $res2);
-               foreach ($out2 as $line2) {
-                       $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
+               catch (OMVModuleZFSException $e) {
+                       $zvol_exists = false;
+               }
+               if ($zvol_exists) {
+                       $cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1";
+                       $this->exec($cmd, $out2, $res2);
+                       foreach ($out2 as $line2) {
+                               $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
+                       }
                }
 
        }