X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/f1fe98e64bb8c13b5321598e60b875bf0271913f..HEAD:/src/Zvol.php?ds=sidebyside

diff --git a/src/Zvol.php b/src/Zvol.php
index f2d3cd2..8b65ac0 100644
--- a/src/Zvol.php
+++ b/src/Zvol.php
@@ -57,25 +57,25 @@ class OMVModuleZFSZvol {
 	 * @access public
 	 */
 	public function __construct($name) {
+		$zvol_exists = true;
 		$this->name = $name;
-		$qname = preg_quote($name, '/');
-		$cmd = "zfs list -H -t volume 2>&1";
-		$this->exec($cmd, $out, $res);
-		foreach ($out as $line) {
-			if (preg_match('/^' . $qname . '\t.*$/', $line)) {
-				$this->updateAllProperties();
-				$this->size = $this->properties["volsize"]["value"];
-				continue;
-			}
+		$cmd = "zfs list -H -t volume " . $name . " 2>&1";
+		try {
+			$this->exec($cmd, $out, $res);
+			$this->updateAllProperties();
+			$this->size = $this->properties["volsize"]["value"];
 		}
-		$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]);
+		catch (OMVModuleZFSException $e) {
+			$zvol_exists = false;
+		}
+		if ($zvol_exists) {
+			$cmd = "zfs list -r -d 1 -o name -H -t snapshot " . $name . " 2>&1";
+			$this->exec($cmd, $out2, $res2);
+			foreach ($out2 as $line2) {
+				$this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
 			}
 		}
+
 	}
 
 	/**
@@ -121,6 +121,20 @@ class OMVModuleZFSZvol {
 		return $this->size;
 	}
 
+	/**
+	 * Get all Snapshots associated with the Zvol
+	 * 
+	 * @return array $snapshots
+	 * @access public
+	 */
+	public function getSnapshots() {
+		if (isset($this->snapshots)) {
+			return $this->snapshots;
+		} else {
+			return array();
+		}
+	}
+
 	/**
 	 * Sets a number of Zvol properties. If a property is already set it will be updated with the new value.
 	 * 
@@ -251,6 +265,49 @@ class OMVModuleZFSZvol {
 		$this->snapshots[$snap_name]->destroy();
 		unset($this->snapshots[$snap_name]);
 	}
+	
+	/**
+	* Check if the Volume is a clone or not.
+	*
+	* @return bool
+	* @access public
+	*/
+	public function isClone() {
+		$origin = $this->getProperty("origin");
+		if (strlen($origin["value"]) > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	* Get the origin of the Volume if it's a clone.
+	*
+	* @return string The name of the origin if it exists. Otherwise an empty string.
+	* @access public
+	*/
+	public function getOrigin() {
+		if ($this->isClone()) {
+			$origin = $this->getProperty("origin");
+			return $origin['value'];
+		} else {
+			return "";
+		}
+	}
+
+	/**
+	* Promotes the Volume if it's a clone.
+	*
+	* @return void
+	* @access public
+	*/
+	public function promote() {
+		if ($this->isClone()) {
+			$cmd = "zfs promote " . $this->name . " 2>&1";
+			$this->exec($cmd,$out,$res);
+		}
+	}
 
 	/**
 	 * Helper function to execute a command and throw an exception on error