Initial implementation of GUI for adding ZFS pools plus minor bugfixes.

[omvzfs.git] / src / Zpool.php

diff --git a/src/Zpool.php b/src/Zpool.php
index fefd4274ace711689a491379d6582806e2069327..c8d4ae97fe73d09f39719fb61280e2c27f484f4d 100644 (file)
--- a/src/Zpool.php
+++ b/src/Zpool.php
@@ -5,6 +5,8 @@ require_once("Vdev.php");
 require_once("Snapshot.php");
 require_once("Dataset.php");
 require_once("Zvol.php");
 require_once("Snapshot.php");
 require_once("Dataset.php");
 require_once("Zvol.php");

+require_once("VdevType.php");
+require_once("Utils.php");

 require_once("Exception.php");
 
 /**
 require_once("Exception.php");
 
 /**


@@ -143,11 +145,11 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
                $this->cache = null;
                $this->features = array();
                if ($create_pool) {
                $this->cache = null;
                $this->features = array();
                if ($create_pool) {

-                       $cmd = "zpool create $name $cmd";
+                       $cmd = "zpool create $name $cmd 2>&1";

 
                        OMVUtil::exec($cmd, $output, $result);
                        if ($result)
 
                        OMVUtil::exec($cmd, $output, $result);
                        if ($result)

-                               throw new OMVModuleZFSException($output);
+                               throw new OMVModuleZFSException(implode("\n", $output));

                        else {
                                $this->name = $name;
                                $this->type = $type;
                        else {
                                $this->name = $name;
                                $this->type = $type;


@@ -430,7 +432,7 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
      * @return array of features
      * @access public
      */
      * @return array of features
      * @access public
      */

-    public function getFeatures() {
+    public function getFeatures($internal = true) {

                $attrs = array();
                $featureSet = array(
                        'recordsize', /* default 131072. 512 <= n^2 <=  131072*/
                $attrs = array();
                $featureSet = array(
                        'recordsize', /* default 131072. 512 <= n^2 <=  131072*/


@@ -448,9 +450,16 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
                );
                if (count($this->features) < 1)
                        $this->features = $this->getAllAttributes();
                );
                if (count($this->features) < 1)
                        $this->features = $this->getAllAttributes();

-        foreach ($this->features as $attr => $val) {
-                       if (in_array($attr, $featureSet))
-                               $attrs[$attr] = $val;
+               if ($internal) {
+                       foreach ($this->features as $attr => $val) {
+                               if (in_array($attr, $featureSet))
+                                       $attrs[$attr] = $val['value'];
+                       }
+               } else {
+                       foreach ($this->features as $attr => $val) {
+                               if (in_array($attr, $featureSet))
+                                       $attrs[$attr] = $val;
+                       }

                }
 
                return $attrs;
                }
 
                return $attrs;


@@ -580,6 +589,73 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
         $this->debug(sprintf("onUpdateNFSShare args=%s", var_export($args, true)));
        }
 
         $this->debug(sprintf("onUpdateNFSShare args=%s", var_export($args, true)));
        }
 

+       /**
+        * Get a single property value associated with the Dataset
+        *
+        * @param string $property Name of the property to fetch
+        * @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) {
+               $attrs = $this->getFeatures(false);
+               return $attrs["$property"];
+       }
+
+       /**
+        * 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() {
+               $attrs = $this->getFeatures(false);
+               return $attrs;
+       }
+
+       /**
+        * Sets a number of Dataset properties. If a property is already set it will be updated with the new value.
+        *
+        * @param  array $properties An associative array with properties to set
+        * @return void
+        * @access public
+        */
+       public function setProperties($properties) {
+               foreach ($properties as $newpropertyk => $newpropertyv) {
+                       $cmd = "zfs set " . $newpropertyk . "=" . $newpropertyv . " " . $this->name . " 2>&1";
+                       OMVModuleZFSUtil::exec($cmd,$out,$res);
+                       $attr = $this->getAttribute($newpropertyk);
+                       $this->features[$newpropertyk] = $attr;
+               }
+       }
+
+       /**
+        * Destroy the Dataset.
+        *
+        * @return void
+        * @access public
+        */
+       public function destroy() {
+               $cmd = "zpool destroy " . $this->name . " 2>&1";
+               $this->exec($cmd,$out,$res);
+       }
+
+       /**
+        * Clears a previously set proporty and specifies that it should be
+        * inherited from it's parent.
+        *
+        * @param string $property Name of the property to inherit.
+        * @return void
+        * @access public
+        */
+       public function inherit($property) {
+               $cmd = "zfs inherit " . $property . " " . $this->name . " 2>&1";
+               $this->exec($cmd,$out,$res);
+               $attr = $this->getAttribute($newpropertyk);
+               $this->features[$newpropertyk] = $attr;
+       }
+

        /**
         * Convert array of Vdev to command string
         *
        /**
         * Convert array of Vdev to command string
         *


@@ -616,7 +692,7 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
                        array_push ($adds, $command . $diskStr);
                }
 
                        array_push ($adds, $command . $diskStr);
                }
 

-               return join(" ", $adds);
+               return implode(" ", $adds);

        }
 
        /**
        }
 
        /**


@@ -647,20 +723,32 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
                $attrs = array();
                $cmd = "zfs get -H all {$this->name}";
 
                $attrs = array();
                $cmd = "zfs get -H all {$this->name}";
 

-               OMVUtil::exec($cmd, $output, $result);
+               try {
+                       OMVUtil::exec($cmd, $output, $result);
+               } catch (OMVModuleZFSException $e) {}

                if ($result)
                        throw new OMVModuleZFSException($output);
                $output = implode("\n", $output);
                if ($result)
                        throw new OMVModuleZFSException($output);
                $output = implode("\n", $output);

-               $res = preg_match_all("/{$this->name}\s+(\w+)\s+([\w\d\.]+).*/", $output, $matches, PREG_SET_ORDER);
+               $res = preg_match_all("/{$this->name}\s+(\w+)\s+([\w\d\.]+)\s+(\w+).*/", $output, $matches, PREG_SET_ORDER);

                if ($res == false || $res == 0)
                        throw new OMVModuleZFSException("Error return by zpool get all: $output");
                foreach ($matches as $match) {
                if ($res == false || $res == 0)
                        throw new OMVModuleZFSException("Error return by zpool get all: $output");
                foreach ($matches as $match) {

-                       $attrs[$match[1]] = $match[2];
+                       $attrs[$match[1]] = array('value' => $match[2], 'source' => $match[3]);

                }
 
                return $attrs;
        }
 
                }
 
                return $attrs;
        }
 

+       /**
+        * Get all Dataset properties from commandline and update object properties attribute
+        *
+        * @return void
+        * @access private
+        */
+       private function updateAllProperties() {
+               $this->features = $this->getAllAttributes();
+       }
+

        /**
         * Remove a disk from array
         *
        /**
         * Remove a disk from array
         *