Bugfix in Dataset constructor.

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

diff --git a/src/Dataset.php b/src/Dataset.php
index 9abdb82cde2f50379a9fc83c1b8abfde710cf83f..19dbc676a061e44fed819351f6cb33729d8ee0fe 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -71,8 +71,12 @@ class OMVModuleZFSDataset {
                        $cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1";
                        $this->exec($cmd, $out2, $res2);
                        foreach ($out2 as $line2) {
                        $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);
+                               if (preg_match('/^' . preg_quote($name, '/') . '\@.*$/', $line2)) {
+                                       $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
+                               }

                        }
                        }

+               } else {
+                       $this->create();

                }
        }
 
                }
        }
 


@@ -103,7 +107,11 @@ class OMVModuleZFSDataset {
         * @access public
         */
        public function getSnapshots() {
         * @access public
         */
        public function getSnapshots() {

-               return $this->snapshots;
+               if (isset($this->snapshots)) {
+                       return $this->snapshots;
+               } else {
+                       return array();
+               }

        }
 
        /**
        }
 
        /**


@@ -175,17 +183,15 @@ class OMVModuleZFSDataset {
        }
 
        /**
        }
 
        /**

-        * Craete a Dataset on commandline. Optionally provide a number of properties to set.
+        * Craete a Dataset on commandline.

         *
         *

-        * @param array $properties Properties to set when creating the dataset.

         * @return void
         * @return void

-        * @access public
+        * @access private

         */
         */

-       public function create(array $properties = null) {
+       private function create() {

                $cmd = "zfs create -p " . $this->name . " 2>&1";
                $this->exec($cmd,$out,$res);
                $this->updateAllProperties();
                $cmd = "zfs create -p " . $this->name . " 2>&1";
                $this->exec($cmd,$out,$res);
                $this->updateAllProperties();

-               $this->setProperties($properties);

                $this->mountPoint = $this->properties["mountpoint"]["value"];
        }
 
                $this->mountPoint = $this->properties["mountpoint"]["value"];
        }
 

diff --git a/src/Snapshot.php b/src/Snapshot.php
index afd189c2f082055ddfd31fa72b473d304494c1ed..b30def21c05864a622e5ddb6aa6031c1ee3e68c6 100644 (file)
--- a/src/Snapshot.php
+++ b/src/Snapshot.php
@@ -39,6 +39,7 @@ class OMVModuleZFSSnapshot {
         * @access public
         */
        public function __construct($name) {
         * @access public
         */
        public function __construct($name) {

+               $snap_exists = true;

                $this->name = $name;
                $cmd = "zfs list -H -t snapshot " .$name . " 2>&1";
                try {
                $this->name = $name;
                $cmd = "zfs list -H -t snapshot " .$name . " 2>&1";
                try {


@@ -46,6 +47,10 @@ class OMVModuleZFSSnapshot {
                        $this->updateAllProperties();
                }
                catch (OMVModuleZFSException $e) {
                        $this->updateAllProperties();
                }
                catch (OMVModuleZFSException $e) {

+                       $snap_exists = false;
+               }
+               if (!$snap_exists) {
+                       $this->create();

                }
        }
 
                }
        }
 


@@ -132,17 +137,15 @@ class OMVModuleZFSSnapshot {
        }
 
        /**
        }
 
        /**

-        * Craete a Snapshot on commandline. Optionally provide a number of properties to set.
+        * Create a Snapshot on commandline.

         * 
         * 

-        * @param array $properties Properties to set when creating the dataset.

         * @return void
         * @return void

-        * @access public
+        * @access private

         */
         */

-       public function create(array $properties = null) {
+       private function create() {

                $cmd = "zfs snapshot " . $this->name . " 2>&1";
                $this->exec($cmd,$out,$res);
                $this->updateAllProperties();
                $cmd = "zfs snapshot " . $this->name . " 2>&1";
                $this->exec($cmd,$out,$res);
                $this->updateAllProperties();

-               $this->setProperties($properties);

        }
 
        /**
        }
 
        /**