Added Snapshot to Zvol class.

[omvzfs.git] / src / Dataset.php

diff --git a/src/Dataset.php b/src/Dataset.php
index e1611416a73d8fd00102d3f958881eeae2878118..9ee6579c78c0322c3037e7fc234dbec136104fc2 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -58,7 +58,7 @@ class OMVModuleZFSDataset {
        public function __construct($name) {
                $this->name = $name;
                $qname = preg_quote($name, '/');
        public function __construct($name) {
                $this->name = $name;
                $qname = preg_quote($name, '/');

-               $cmd = "zfs list -H";
+               $cmd = "zfs list -H 2>&1";

                $this->exec($cmd, $out, $res);
                foreach ($out as $line) {
                        if (preg_match('/^' . $qname . '\t.*$/', $line)) {
                $this->exec($cmd, $out, $res);
                foreach ($out as $line) {
                        if (preg_match('/^' . $qname . '\t.*$/', $line)) {


@@ -68,11 +68,11 @@ class OMVModuleZFSDataset {
                        }
                }
                $qname = preg_quote($name . "@", '/');
                        }
                }
                $qname = preg_quote($name . "@", '/');

-               $cmd = "zfs list -H -t snapshot";
+               $cmd = "zfs list -H -t snapshot 2>&1";

                $this->exec($cmd, $out, $res);
                foreach ($out as $line) {
                        if (preg_match('/^(' . $qname . '[^\s]+)\t.*$/', $line, $res)) {
                $this->exec($cmd, $out, $res);
                foreach ($out as $line) {
                        if (preg_match('/^(' . $qname . '[^\s]+)\t.*$/', $line, $res)) {

-                               $this->snapshots[] = new OMVModuleZFSSnapshot($res[1]);
+                               $this->snapshots[$res[1]] = new OMVModuleZFSSnapshot($res[1]);

                        }
                }
        }
                        }
                }
        }


@@ -109,9 +109,10 @@ class OMVModuleZFSDataset {
 
        /**
         * Get a single property value associated with the Dataset
 
        /**
         * Get a single property value associated with the Dataset

-        *
+        * 

         * @param string $property Name of the property to fetch
         * @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) {
         * @access public
         */
        public function getProperty($property) {


@@ -119,11 +120,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() {
         * @access public
         */
        public function getProperties() {


@@ -139,7 +139,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 +152,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,7 +169,7 @@ 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]);


@@ -190,7 +190,6 @@ class OMVModuleZFSDataset {
                $this->mountPoint = $this->properties["mountpoint"]["value"];
        }
 
                $this->mountPoint = $this->properties["mountpoint"]["value"];
        }
 

-

        /**
         * Destroy the Dataset.
         *
        /**
         * Destroy the Dataset.
         *


@@ -198,7 +197,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);
        }
 


@@ -264,6 +263,32 @@ class OMVModuleZFSDataset {
                $this->updateProperty("mounted");
        }
 
                $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
 
        /**
         * Helper function to execute a command and throw an exception on error