X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/6ed033a41e7a9d60352c818bc753ade3fc463fc9..f1fe98e64bb8c13b5321598e60b875bf0271913f:/src/Dataset.php

diff --git a/src/Dataset.php b/src/Dataset.php
index 8560f74..9ee6579 100644
--- 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
 
@@ -49,7 +58,7 @@ class OMVModuleZFSDataset {
 	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)) {
@@ -58,6 +67,14 @@ class OMVModuleZFSDataset {
 				continue;
 			}
 		}
+		$qname = preg_quote($name . "@", '/');
+		$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->snapshots[$res[1]] = new OMVModuleZFSSnapshot($res[1]);
+			}
+		}
 	}
 
 	/**
@@ -81,10 +98,21 @@ 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() {
+		return $this->snapshots;
+	}
+
+	/**
+	 * 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 +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() {
@@ -112,7 +139,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 +152,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,7 +169,7 @@ 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]);
@@ -163,7 +190,6 @@ class OMVModuleZFSDataset {
 		$this->mountPoint = $this->properties["mountpoint"]["value"];
 	}
 
-
 	/**
 	 * Destroy the Dataset.
 	 *
@@ -171,7 +197,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 +263,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