X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/2777aa0105ab8da8c267156a076349651205c1cd..9b2acb8e1c4e91bf2d855b1f96efa0464e212eb9:/src/Zvol.php?ds=sidebyside diff --git a/src/Zvol.php b/src/Zvol.php index 47701dc..e35af5a 100644 --- a/src/Zvol.php +++ b/src/Zvol.php @@ -1,6 +1,7 @@ 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"]; + } + 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); } } + } /** @@ -104,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. * @@ -208,6 +239,33 @@ class OMVModuleZFSZvol { $this->updateProperty($property); } + /** + * Creates a Snapshot and adds it to the existing list of snapshots associated + * with the Zvol. + * + * @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 Zvol. + * + * @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 * (requires stderr redirected to stdout for proper exception message).