Minor fixes to Dataset and Zvol constructors.

[omvzfs.git] / src / Dataset.php

diff --git a/src/Dataset.php b/src/Dataset.php
index 2adc60c688902baa68c5d4f155701fe0aeb5465f..f61baa1c24235755a82c11e73359c8aa58aefa0a 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -56,24 +56,25 @@ class OMVModuleZFSDataset {
         * @access public
         */
        public function __construct($name) {
         * @access public
         */
        public function __construct($name) {

+               $ds_exists = true;

                $this->name = $name;
                $this->name = $name;

-               $qname = preg_quote($name, '/');
-               $cmd = "zfs list -H";
-               $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"];

                }
                }

-               $qname = preg_quote($name . "@", '/');
-               $cmd = "zfs list -H -t snapshot";
-               $this->exec($cmd, $out, $res);
-               foreach ($out as $line) {
-                       if (preg_match('/^(' . $qname . '[^\s]+)\t.*$/', $line, $res)) {
-                               $this->snapshots[$res[1]] = new OMVModuleZFSSnapshot($res[1]);
+               catch (OMVModuleZFSException $e) {
+                       $ds_exists = false;
+               }
+               if ($ds_exists) {
+                       $cmd = "zfs list -r -d 1 -o name -H -t snapshot " . $name . " 2>&1";
+                       $this->exec($cmd, $out2, $res2);
+                       foreach ($out2 as $line2) {
+                                       $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);

                        }
                        }

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

                }
        }
 
                }
        }
 


@@ -104,7 +105,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();
+               }

        }
 
        /**
        }
 
        /**


@@ -139,7 +144,7 @@ class OMVModuleZFSDataset {
         */
        public function setProperties($properties) {
                foreach ($properties as $newpropertyk => $newpropertyv) {
         */
        public function setProperties($properties) {
                foreach ($properties as $newpropertyk => $newpropertyv) {

-                       $cmd = "zfs set " . $newpropertyk . "=" . $newpropertyv . " " . $this->name;
+                       $cmd = "zfs set " . $newpropertyk . "=" . $newpropertyv . " " . $this->name . " 2>&1";

                        $this->exec($cmd,$out,$res);
                        $this->updateProperty($newpropertyk);
                }
                        $this->exec($cmd,$out,$res);
                        $this->updateProperty($newpropertyk);
                }


@@ -152,7 +157,7 @@ class OMVModuleZFSDataset {
         * @access private
         */ 
        private function updateAllProperties() {
         * @access private
         */ 
        private function updateAllProperties() {

-               $cmd = "zfs get -H all " . $this->name;
+               $cmd = "zfs get -H all " . $this->name . " 2>&1";

                $this->exec($cmd,$out,$res);
                unset($this->properties);
                foreach ($out as $line) {
                $this->exec($cmd,$out,$res);
                unset($this->properties);
                foreach ($out as $line) {


@@ -169,24 +174,22 @@ class OMVModuleZFSDataset {
         * @access private
         */
        private function updateProperty($property) {
         * @access private
         */
        private function updateProperty($property) {

-               $cmd = "zfs get -H " . $property . " " . $this->name;
+               $cmd = "zfs get -H " . $property . " " . $this->name . " 2>&1";

                $this->exec($cmd,$out,$res);
                $tmpary = preg_split('/\t+/', $out[0]);
                $this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
        }
 
        /**
                $this->exec($cmd,$out,$res);
                $tmpary = preg_split('/\t+/', $out[0]);
                $this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
        }
 
        /**

-        * 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"];
        }
 


@@ -197,7 +200,7 @@ class OMVModuleZFSDataset {
         * @access public
         */
        public function destroy() {
         * @access public
         */
        public function destroy() {

-               $cmd = "zfs destroy " . $this->name;
+               $cmd = "zfs destroy " . $this->name . " 2>&1";

                $this->exec($cmd,$out,$res);
        }
 
                $this->exec($cmd,$out,$res);
        }