Bugfix in Dataset constructor.

[omvzfs.git] / src / Dataset.php

diff --git a/src/Dataset.php b/src/Dataset.php
index 8560f7495b25b8445c0b2faa0218505b8d195508..19dbc676a061e44fed819351f6cb33729d8ee0fe 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -1,6 +1,7 @@
 <?php
 require_once("Exception.php");
 require_once("openmediavault/util.inc");
+require_once("Snapshot.php");
 
 /**
  * XXX detailed description
@@ -35,6 +36,14 @@ class OMVModuleZFSDataset {
      */
     private $properties;
 
+       /**
+        * Array with Snapshots associated to the Dataset
+        *
+        * @var         array $snapshots
+        * @access private
+        */
+       private $snapshots;
+
        // Associations
        // Operations
 
@@ -47,16 +56,27 @@ class OMVModuleZFSDataset {
         * @access public
         */
        public function __construct($name) {
+               $ds_exists = true;
                $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"];
+               }
+               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) {
+                               if (preg_match('/^' . preg_quote($name, '/') . '\@.*$/', $line2)) {
+                                       $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
+                               }
                        }
+               } else {
+                       $this->create();
                }
        }
 
@@ -81,10 +101,25 @@ class OMVModuleZFSDataset {
        }
 
        /**
-        * Get a single property value associated with the Dataset
+        * Get all Snapshots associated with the Dataset
         *
+        * @return array $snapshots
+        * @access public
+        */
+       public function getSnapshots() {
+               if (isset($this->snapshots)) {
+                       return $this->snapshots;
+               } else {
+                       return array();
+               }
+       }
+
+       /**
+        * Get a single property value associated with the Dataset
+        * 
         * @param string $property Name of the property to fetch
-        * @return array The returned array key 0=property value and key 1=property source.
+        * @return array The returned array with the property. The property is an associative array with
+        * two elements, <value> and <source>.
         * @access public
         */
        public function getProperty($property) {
@@ -92,11 +127,10 @@ class OMVModuleZFSDataset {
        }
 
        /**
-        * Get an associative array of all properties associated with the Dataset.
-        *
-        * @return array $properties Each entry is an array where key 0=property value and key
-        * 1=property source.
-        *
+        * Get an associative array of all properties associated with the Snapshot
+        * 
+        * @return array $properties Each entry is an associative array with two elements
+        * <value> and <source>
         * @access public
         */
        public function getProperties() {
@@ -112,7 +146,7 @@ class OMVModuleZFSDataset {
         */
        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);
                }
@@ -125,7 +159,7 @@ class OMVModuleZFSDataset {
         * @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) {
@@ -142,28 +176,25 @@ class OMVModuleZFSDataset {
         * @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]);
        }
 
        /**
-        * 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
-        * @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();
-               $this->setProperties($properties);
                $this->mountPoint = $this->properties["mountpoint"]["value"];
        }
 
-
        /**
         * Destroy the Dataset.
         *
@@ -171,7 +202,7 @@ class OMVModuleZFSDataset {
         * @access public
         */
        public function destroy() {
-               $cmd = "zfs destroy " . $this->name;
+               $cmd = "zfs destroy " . $this->name . " 2>&1";
                $this->exec($cmd,$out,$res);
        }
 
@@ -237,6 +268,32 @@ class OMVModuleZFSDataset {
                $this->updateProperty("mounted");
        }
 
+       /**
+        * Creates a Snapshot and adds it to the existing list of snapshots associated
+        * with the Dataset.
+        *
+        * @param string $snap_name Name of the Snapshot to create.
+        * @param array $properties Optional array of properties to set on Snapshot
+        * @return void
+        * @access public
+        */
+       public function addSnapshot($snap_name, array $properties = null) {
+               $snap = new OMVModuleZFSSnapshot($snap_name);
+               $snap->create($properties);
+               $this->snapshots[$snap_name] = $snap;
+       }
+
+       /**
+        * Destroys a Snapshot on commandline and removes it from the Dataset.
+        *
+        * @param string $snap_name Name of the Snapshot to delete.
+        * @return void
+        * @access public
+        */
+       public function deleteSnapshot($snap_name) {
+               $this->snapshots[$snap_name]->destroy();
+               unset($this->snapshots[$snap_name]);
+       }
 
        /**
         * Helper function to execute a command and throw an exception on error