X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/5ff626ba7c8db2bd124cc64d49a8f31117d1f26c..16c5355de303f315d12eb3568f1f86a2df8fe192:/gui/rpc/zfs.inc

diff --git a/gui/rpc/zfs.inc b/gui/rpc/zfs.inc
index 48c7ef4..af69ec4 100644
--- a/gui/rpc/zfs.inc
+++ b/gui/rpc/zfs.inc
@@ -10,23 +10,76 @@ require_once("zfs/Utils.php");
 require_once("zfs/Dataset.php");
 require_once("zfs/Snapshot.php");
 require_once("zfs/Zvol.php");
+require_once("zfs/Zpool.php");
+require_once("zfs/NotifyListener.php");
 
 class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
-	public function getName() { return "ZFS";} // RPC Service name. Same as in .js files
+	public function getName() {
+		return "ZFS";  // RPC Service name. Same as in .js files
+	}
+
+	/* Initialize the RPC service. Different methods of the RPC service are declared here*/
+	public function initialize() {
+		$this->registerMethod("addPool");
+		$this->registerMethod("getObjectTree");
+		$this->registermethod("passParam");
+		$this->registermethod("addObject");
+		$this->registermethod("deleteObject");
+		$this->registermethod("getProperties");
+		$this->registermethod("setProperties");
+		$this->registermethod("inherit");
+		$this->registermethod("getSharedParams");
+		$this->registermethod("createShare");
+	}
 
-		/* Initialize the RPC service. Different methods of the RPC service are declared here*/
-		public function initialize() {
-			$this->registerMethod("getObjectTree");
-			$this->registermethod("passParam");
-			$this->registermethod("addObject");
-			$this->registermethod("deleteObject");
-			$this->registermethod("getProperties");
-			$this->registermethod("setProperties");
-			$this->registermethod("inherit");
-			$this->registermethod("getSharedParams");
-			$this->registermethod("createShare");
+	public function addPool($params, $context) {
+		$this->validateMethodContext($context, array("role" => OMV_ROLE_ADMINISTRATOR));
+		switch ($params['pooltype']) {
+		case "basic":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSPLAIN;
+			break;
+		case "mirror":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSMIRROR;
+			break;
+		case "raidz1":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSRAIDZ1;
+			break;
+		case "raidz2":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSRAIDZ2;
+			break;
+		case "raidz3":
+			$pooltype = OMVModuleZFSVdevType::OMVMODULEZFSRAIDZ3;
+			break;
+		default:
+			throw new OMVModuleZFSException("Incorrect pool type specified");
+			break;
+		}
+		//Check for user supplied options
+		$opts = "";
+		if ($params['force']) {
+			$opts .= "-f ";
+		}
+		if (strlen($params['mountpoint']) > 0) {
+			$opts .= "-m " . $params['mountpoint'] . " ";
 		}
 
+		//Use /dev/disk/by-path as deafult when creating new pools as suggested in ZoL FAQ.
+		$disks = preg_split("/[,;]/", $params['devices']);
+		if (file_exists("/dev/disk/by-path/")) {
+			$tmp_disks = array();
+			foreach ($disks as $disk) {
+				$tmp_disks[] = OMVModuleZFSUtil::getDiskPath($disk);
+			}
+			$disks = $tmp_disks;
+		}
+
+		$vdev = new OMVModuleZFSVdev($params['name'], $pooltype, $disks);
+		$pool = new OMVModuleZFSZpool($vdev, $opts);
+		//Ugly fix to solve the problem of blkid not displaying info on newly created pools
+		$pool->export();
+		$pool->import($pool->getName());
+	}
+
 	public function getObjectTree($params, $context) {
 		$this->validateMethodContext($context, array("role" => OMV_ROLE_ADMINISTRATOR));
 		$objects = OMVModuleZFSUtil::getZFSFlatArray();
@@ -35,6 +88,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			$new[$a['parentid']][] = $a;
 		}
 		$tree = OMVModuleZFSUtil::createTree($new, $new['root']);
+		OMVModuleZFSUtil::addMissingOMVMntEnt(); //Adds missing ZFS filesystems to the OMV core
 		return $tree;
 	}
 
@@ -86,6 +140,11 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			$tmp = new OMVModuleZFSZvol($name);
 			$tmp->destroy();
 			break;
+		case "Pool":
+			$name = $params['name'];
+			$tmp = new OMVModuleZFSZpool($name);
+			$tmp->destroy();
+			break;
 		default:
 			throw new OMVModuleZFSException("Illegal type provided: " . $params['type']);
 			break;
@@ -107,6 +166,9 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		case "Volume":
 			$tmp = new OMVModuleZFSZvol($name);
 			break;
+		case "Pool":
+			$tmp = new OMVModuleZFSZpool($name);
+			break;
 		default:
 			throw new OMVModuleZFSException("Illegal type provided: " . $params['type']);
 			break;
@@ -137,6 +199,9 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		case "Volume":
 			$tmp = new OMVModuleZFSZvol($params['name']);
 			break;
+		case "Pool":
+			$tmp = new OMVModuleZFSZpool($params['name']);
+			break;
 		default:
 			throw new OMVModuleZFSException("Illegal type provided: " . $params['type']);
 			break;
@@ -171,6 +236,9 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 			case "Volume":
 				$tmp = new OMVModuleZFSZvol($params['name']);
 				break;
+			case "Pool":
+				$tmp = new OMVModuleZFSZpool($params['name']);
+				break;
 			default:
 				throw new OMVModuleZFSException("Illegal type provided: " . $params['type']);
 				break;
@@ -200,42 +268,22 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		$this->validateMethodContext($context, array("role" => OMV_ROLE_ADMINISTRATOR));
 
 		//Get the UUID of the Pool
-		$pooluuid = OMVModuleZFSUtil::getUUIDbyName($params['name']);
- 		preg_match('/^([A-Za-z0-9]+)\/?.*$/', $params['name'], $result);
-		$poolname = $result[1];
-		unset($result);
-
-		//Check if the UUID is already stored as an mntent object. If it isn't then create it.
-		$xpath = "//system/fstab/mntent[fsname=" . $pooluuid . "]";
-		$object = $xmlConfig->get($xpath);
-		if(is_null($object)) {
-			$uuid = OMVUtil::uuid();
-			$ds = new OMVModuleZFSDataset($poolname);
-			$dir = $ds->getMountPoint();
-			$object = array(
-				"uuid" => $uuid,
-				"fsname" => $pooluuid,
-				"dir" => $dir,
-				"type" => "zfs",
-				"opts" => "rw,relatime,xattr",
-				"freq" => "0",
-				"passno" => "2"
-			);
-			$xmlConfig->set("//system/fstab",array("mntent" => $object));
-			$dispatcher = &OMVNotifyDispatcher::getInstance();
-			$dispatcher->notify(OMV_NOTIFY_CREATE,"org.openmediavault.system.fstab.mntent", $object);
-		}
+		$poolname = OMVModuleZFSUtil::getPoolname($params['name']);
+		$pooluuid = OMVModuleZFSUtil::getUUIDbyName($poolname);
 
 		//Get the mntent object and fetch it's uuid.
-		$object = $xmlConfig->get($xpath);
-		$mntentref = $object['uuid'];
+		$xpath = "//system/fstab/mntent[fsname=" . $pooluuid . "]";
+		$mountpoint = $xmlConfig->get($xpath);
+		$mntentref = $mountpoint['uuid'];
 
 		// Prepare the configuration object. Use the name of the shared
 		// folder as the relative directory name of the share.
 		switch ($params['type']) {
 		case "Filesystem":
+			$tmp = new OMVModuleZFSDataset($params['name']);
+			break;
 		case "Clone":
-			$tmp = new OMVModuleZFSDataset($name);
+			$tmp = new OMVModuleZFSDataset($params['name']);
 			break;
 		default:
 			throw new OMVModuleZFSException("Illegal type provided: " . $params['type']);
@@ -245,7 +293,11 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		$uuid = OMVUtil::uuid();
 		$pathName = $tmp->getMountPoint();
 		$subdirs = preg_split('/\//',$pathName);
-		$reldirpath = $subdirs[count($subdirs)-1];
+		$reldirpath = "";
+		for ($i=2;$i<count($subdirs);$i++) {
+			$reldirpath .= $subdirs[$i] . "/";
+		}
+		$reldirpath = rtrim($reldirpath, "/");
 		$object = array(
 			"uuid" => $uuid,
 			"name" => $params['sharename'],
@@ -306,7 +358,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		$dispatcher->notify(OMV_NOTIFY_CREATE,"org.openmediavault.system.shares.sharedfolder", $object);
 		// Return the configuration object.
 		return $object;
-
 	}
 
 }