X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/9be18e883523d420d286694961f5713305ef4b2f..54b9d43e43e2d6ab2212ba9abbac04290de925e0:/src/Zpool.php?ds=sidebyside

diff --git a/src/Zpool.php b/src/Zpool.php
index fefd427..87e5f0c 100644
--- 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("VdevType.php");
+require_once("Utils.php");
 require_once("Exception.php");
 
 /**
@@ -14,8 +16,7 @@ require_once("Exception.php");
  * @version   0.1
  * @copyright Michael Rasmussen <mir@datanom.net>
  */
-class OMVModuleZFSZpool extends OMVModuleAbstract
-		implements OMVINotifyListener {
+class OMVModuleZFSZpool extends OMVModuleAbstract {
     // Attributes
     /**
      * Name of pool
@@ -121,7 +122,7 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
      * @throws OMVModuleZFSException
 	 */
 
-	public function __construct($vdev) {
+	public function __construct($vdev, $opts = "") {
 		$create_pool = true;
 
 		if (is_array($vdev)) {
@@ -143,11 +144,11 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
 		$this->cache = null;
 		$this->features = array();
 		if ($create_pool) {
-			$cmd = "zpool create $name $cmd";
+			$cmd = "zpool create $opts$name $cmd 2>&1";
 
 			OMVUtil::exec($cmd, $output, $result);
 			if ($result)
-				throw new OMVModuleZFSException($output);
+				throw new OMVModuleZFSException(implode("\n", $output));
 			else {
 				$this->name = $name;
 				$this->type = $type;
@@ -430,7 +431,7 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
      * @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*/
@@ -448,9 +449,16 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
 		);
 		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;
@@ -516,68 +524,71 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
 			throw new OMVModuleZFSException($output);
     }
 
-    public function bindListeners(OMVNotifyDispatcher $dispatcher) {
-		// Update service if configuration has been modified
-		$dispatcher->addListener(
-		  OMV_NOTIFY_MODIFY,
-		  "org.openmediavault.services.nfs",
-		  array($this, "onUpdateNFSService"));
-		$dispatcher->addListener(
-		  OMV_NOTIFY_CREATE,
-		  "org.openmediavault.services.nfs.shares.share",
-		  array($this, "onCreateNFSShare"));
-		$dispatcher->addListener(
-		  OMV_NOTIFY_DELETE,
-		  "org.openmediavault.services.nfs.shares.share",
-		  array($this, "onDeleteNFSShare"));
-		$dispatcher->addListener(
-		  OMV_NOTIFY_MODIFY,
-		  "org.openmediavault.services.nfs.shares.share",
-		  array($this, "onUpdateNFSShare"));
-    }
+	/**
+	 * 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"];
+	}
 
 	/**
-	 * XXX
-	 * org.openmediavault.services.nfs
+	 * Get an associative array of all properties associated with the Snapshot
 	 *
-	 * @param string event
+	 * @return array $properties Each entry is an associative array with two elements
+	 * <value> and <source>
 	 * @access public
 	 */
-	public function onUpdateNFSService($args) {
-        $this->debug(sprintf("onUpdateNFSService args=%s", var_export($args, true)));
+	public function getProperties() {
+		$attrs = $this->getFeatures(false);
+		return $attrs;
 	}
 
 	/**
-	 * XXX
-	 * org.openmediavault.services.nfs.shares.share
+	 * Sets a number of Dataset properties. If a property is already set it will be updated with the new value.
 	 *
-	 * @param string event
+	 * @param  array $properties An associative array with properties to set
+	 * @return void
 	 * @access public
 	 */
-	public function onCreateNFSShare($args) {
-        $this->debug(sprintf("onCreateNFSShare args=%s", var_export($args, true)));
+	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;
+		}
 	}
 
 	/**
-	 * XXX
-	 * org.openmediavault.services.nfs.shares.share
+	 * Destroy the Dataset.
 	 *
-	 * @param string event
+	 * @return void
 	 * @access public
 	 */
-	public function onDeleteNFSShare($args) {
-        $this->debug(sprintf("onDeleteNFSShare args=%s", var_export($args, true)));
+	public function destroy() {
+		$cmd = "zpool destroy " . $this->name . " 2>&1";
+		$this->exec($cmd,$out,$res);
 	}
 
 	/**
-	 * XXX
-	 * org.openmediavault.services.nfs.shares.share
+	 * Clears a previously set proporty and specifies that it should be
+	 * inherited from it's parent.
 	 *
-	 * @param string event
+	 * @param string $property Name of the property to inherit.
+	 * @return void
 	 * @access public
 	 */
-	public function onUpdateNFSShare($args) {
-        $this->debug(sprintf("onUpdateNFSShare args=%s", var_export($args, true)));
+	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;
 	}
 
 	/**
@@ -616,7 +627,7 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
 			array_push ($adds, $command . $diskStr);
 		}
 
-		return join(" ", $adds);
+		return implode(" ", $adds);
 	}
 
 	/**
@@ -625,7 +636,7 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
 	 * @param string $attribute
 	 * @return string value
 	 */
-	private function getAttribute($attribute) {
+	public function getAttribute($attribute) {
 		$cmd = "zpool list -H -o $attribute {$this->name}";
 		OMVUtil::exec($cmd, $output, $result);
 		if ($result) {
@@ -647,20 +658,32 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
 		$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);
-		$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) {
-			$attrs[$match[1]] = $match[2];
+			$attrs[$match[1]] = array('value' => $match[2], 'source' => $match[3]);
 		}
 
 		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
 	 *
@@ -730,7 +753,7 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
 									$dev = null;
 								}
 								$type = $match[1];
-							} else if (preg_match("/^\s*([\w\d-]+)\s+/", $line, $match)) {
+							} else if (preg_match("/^\s*([\w\d-a-z0-9\:\.\-]+)\s+/", $line, $match)) {
 								if ($dev)
 									$dev .= " $match[1]";
 								else
@@ -823,5 +846,4 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
 	}
 
 }
-
 ?>