From: Niclas Berglind <nb@kjam.se>
Date: Sat, 22 Mar 2014 13:14:34 +0000 (+0100)
Subject: Added methods to add/delete Snapshots to/from Datasets.
X-Git-Url: http://git.datanom.net/omvzfs.git/commitdiff_plain/ddcd45581e5728b126260ed27c6f52a43b2699e6

Added methods to add/delete Snapshots to/from Datasets.

Signed-off-by: Niclas Berglind <nb@kjam.se>
---

diff --git a/src/Dataset.php b/src/Dataset.php
index e161141..c766f4e 100644
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -72,7 +72,7 @@ class OMVModuleZFSDataset {
 		$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]);
 			}
 		}
 	}
@@ -190,7 +190,6 @@ class OMVModuleZFSDataset {
 		$this->mountPoint = $this->properties["mountpoint"]["value"];
 	}
 
-
 	/**
 	 * Destroy the Dataset.
 	 *
@@ -264,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
diff --git a/src/Snapshot.php b/src/Snapshot.php
index 23231fe..ef90283 100644
--- a/src/Snapshot.php
+++ b/src/Snapshot.php
@@ -124,8 +124,12 @@ class OMVModuleZFSSnapshot {
 		$this->exec($cmd,$out,$res);
 		unset($this->properties);
 		foreach ($out as $line) {
-			$tmpary = preg_split('/\t+/', $line);
-			$this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
+			$tmpary = preg_split('/\t/', $line);
+			if (strlen($tmpary[2] == 0)) {
+				$this->properties["$tmpary[1]"] = array("value" => "-", "source" => $tmpary[3]);
+			} else {
+				$this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
+			}
 		}
 	}
 
@@ -143,6 +147,17 @@ class OMVModuleZFSSnapshot {
 		$this->setProperties($properties);
 	}
 
+	/**
+	 * Destroy a Snapshot on commandline.
+	 *
+	 * @return void
+	 * @access public
+	 */
+	public function destroy() {
+		$cmd = "zfs destroy " . $this->name . " 2>&1";
+		$this->exec($cmd,$out,$res);
+	}
+
 	/**
 	 * Helper function to execute a command and throw an exception on error
 	 * (requires stderr redirected to stdout for proper exception message).