X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/2d44d88394aa1d612c8324ceaab7b8fb0fbe8357..54b9d43e43e2d6ab2212ba9abbac04290de925e0:/src/Utils.php

diff --git a/src/Utils.php b/src/Utils.php
index 579d53c..5658265 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -2,12 +2,56 @@
 require_once("Exception.php");
 require_once("openmediavault/util.inc");
 require_once("Dataset.php");
+require_once("Zvol.php");
+require_once("Vdev.php");
+require_once("Zpool.php");
 
 /**
  * Helper class for ZFS module
  */
 class OMVModuleZFSUtil {
 
+	/**
+	 * Clears all ZFS labels on specified devices.
+	 * Needed for blkid to display proper data.
+	 *
+	 */
+	public static function clearZFSLabel($disks) {
+		foreach ($disks as $disk) {
+			$cmd = "zpool labelclear /dev/" . $disk . "1";
+			OMVModuleZFSUtil::exec($cmd,$out,$res);
+		}
+	}
+
+	/**
+	 * Return all disks in /dev/sdXX used by the pool
+	 *
+	 * @return array An array with all the disks
+	 */
+	public static function getDevDisksByPool($name) {
+		$pool = new OMVModuleZFSZpool($name);
+		$disks = array();
+		$vdevs = $pool->getVdevs();
+		foreach ($vdevs as $vdev) {
+			$vdisks = $vdev->getDisks();
+			foreach ($vdisks as $vdisk) {
+				if (preg_match('/^[a-z0-9]+$/', $vdisk)) {
+					$disks[] = $vdisk;
+					continue;
+				}
+				$cmd = "ls -la /dev/disk/by-path/" . $vdisk;
+				unset($out);
+				OMVModuleZFSUtil::exec($cmd,$out,$res);
+				if (count($out) === 1) {
+					if (preg_match('/^.*\/([a-z0-9]+)$/', $out[0], $match)) {
+						$disks[] = $match[1];
+					}
+				}
+			}
+		}
+		return($disks);
+	}
+
 	/**
 	 * Deletes all shared folders pointing to the specifc path
 	 *
@@ -22,9 +66,10 @@ class OMVModuleZFSUtil {
 		$mountpoint = $xmlConfig->get($xpath);
 		$mntentuuid = $mountpoint['uuid'];
 		$xpath = "//system/shares/sharedfolder[mntentref='" . $mntentuuid . "' and reldirpath='" . $reldirpath . "']";
+		$object = $xmlConfig->get($xpath);
 		$xmlConfig->delete($xpath);
 		$dispatcher = &OMVNotifyDispatcher::getInstance();
-		$dispatcher->notify(OMV_NOTIFY_CREATE,"org.openmediavault.system.shares.sharedfolder");
+		$dispatcher->notify(OMV_NOTIFY_DELETE,"org.openmediavault.system.shares.sharedfolder",$object);
 	}
 
 	/**
@@ -153,6 +198,11 @@ class OMVModuleZFSUtil {
 						'icon'=>'images/raid.png',
 						'expanded'=>$expanded,
 						'path'=>$path);
+					$pool = new OMVModuleZFSZpool($path);
+					$tmp['size'] = $pool->getSize();
+					$tmp['used'] = "n/a";
+					$tmp['available'] = "n/a";
+					$tmp['mountpoint'] = $pool->getMountPoint();
 					array_push($objects,$tmp);
 				} else {
 					//This is a Filesystem
@@ -172,6 +222,12 @@ class OMVModuleZFSUtil {
 						//This is a standard Filesystem.
 						$tmp['type']= ucfirst($type);
 					}
+					$tmp['size'] = "n/a";
+					$used = $ds->getProperty("used");
+					$tmp['used'] = $used['value'];
+					$available = $ds->getProperty("available");
+					$tmp['available'] = $available['value'];
+					$tmp['mountpoint'] = $ds->getMountPoint();
 					array_push($objects,$tmp);
 				}
 				break;
@@ -185,6 +241,11 @@ class OMVModuleZFSUtil {
 					'icon'=>"images/save.png",
 					'path'=>$path,
 					'expanded'=>$expanded);
+				$vol = new OMVModuleZFSZvol();
+				$tmp['size'] = $vol->getSize();
+				$tmp['used'] = "n/a";
+				$tmp['available'] = "n/a";
+				$tmp['mountpoint'] = "n/a";
 				array_push($objects,$tmp);
 				break;
 
@@ -199,6 +260,10 @@ class OMVModuleZFSUtil {
 					'icon'=>'images/zfs_snap.png',
 					'path'=>$path,
 					'expanded'=>$expanded);
+				$tmp['size'] = "n/a";
+				$tmp['used'] = "n/a";
+				$tmp['available'] = "n/a";
+				$tmp['mountpoint'] = "n/a";
 				array_push($objects,$tmp);
 				break;