Minor change to clarify shared folder creation.

[omvzfs.git] / gui / rpc / zfs.inc

diff --git a/gui/rpc/zfs.inc b/gui/rpc/zfs.inc
index e72038ec1f2a16ab16a3f22587a9a272e26ac2ba..22011e4ada941ab42311e14d103a9e052cff146a 100644 (file)
--- a/gui/rpc/zfs.inc
+++ b/gui/rpc/zfs.inc
@@ -45,7 +45,8 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                                  "force":{"type":"boolean"},
                                  "mountpoint":{"type":"string"},
                                  "name":{"type":"string"},
                                  "force":{"type":"boolean"},
                                  "mountpoint":{"type":"string"},
                                  "name":{"type":"string"},

-                                 "devices":{"type":"string"}
+                                 "devices":{"type":"string"},
+                                 "diskpath":{"type":"boolean"}

                          }
                  }');
                switch ($params['pooltype']) {
                          }
                  }');
                switch ($params['pooltype']) {


@@ -77,14 +78,23 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                        $opts .= "-m " . $params['mountpoint'] . " ";
                }
 
                        $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']);
                $disks = preg_split("/[,;]/", $params['devices']);

-               if (file_exists("/dev/disk/by-path/")) {
-                       $tmp_disks = array();
-                       foreach ($disks as $disk) {
-                               $tmp_disks[] = OMVModuleZFSUtil::getDiskPath($disk);
+               foreach ($disks as $disk) {
+                       OMVModuleZFSUtil::setGPTLabel($disk);
+               }
+               //Use /dev/disk/by-path as suggested in ZoL FAQ.
+               if ($params['diskpath']) {
+                       try {
+                               if (file_exists("/dev/disk/by-path/")) {
+                                       $tmp_disks = array();
+                                       foreach ($disks as $disk) {
+                                               $tmp_disks[] = OMVModuleZFSUtil::getDiskPath($disk);
+                                       }
+                                       $disks = $tmp_disks;
+                               }
+                       } catch (OMVModuleZFSException $e) {
+                               //Do nothing if an excpetion is thrown

                        }
                        }

-                       $disks = $tmp_disks;

                }
 
                $vdev = new OMVModuleZFSVdev($params['name'], $pooltype, $disks);
                }
 
                $vdev = new OMVModuleZFSVdev($params['name'], $pooltype, $disks);


@@ -126,16 +136,26 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                          "type":"object",
                          "properties":{
                                  "type":{"type":"string","enum":["filesystem","snapshot",' .
                          "type":"object",
                          "properties":{
                                  "type":{"type":"string","enum":["filesystem","snapshot",' .

-                                       '"volume"]},
+                                       '"volume","clone"]},

                                  "path":{"type":"string"},
                                  "name":{"type":"string"},
                                  "path":{"type":"string"},
                                  "name":{"type":"string"},

-                                 "size":{"type":"string"}
+                                 "size":{"type":"string"},
+                                 "clonename":{"type":"string"},
+                                 "mountpoint":{"type":"string"}

                          }
                  }');
                switch ($params['type']) {
                          }
                  }');
                switch ($params['type']) {

+               case "clone":
+                       $tmp = new OMVModuleZFSSnapshot($params['path']);
+                       $tmp->clonesnap($params['clonename']);
+                       break;

                case "filesystem":
                        $name = $params['path'] . "/" . $params['name'];
                        $tmp = new OMVModuleZFSDataset($name);
                case "filesystem":
                        $name = $params['path'] . "/" . $params['name'];
                        $tmp = new OMVModuleZFSDataset($name);

+                       if (strlen($params['mountpoint']) > 0) {
+                               $properties = array("mountpoint"=>$params['mountpoint']);
+                               $tmp->setProperties($properties);
+                       }

                        break;
                case "snapshot":
                        $name = $params['path'] . "@" . $params['name'];
                        break;
                case "snapshot":
                        $name = $params['path'] . "@" . $params['name'];


@@ -159,7 +179,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                          "type":"object",
                          "properties":{
                                  "type":{"type":"string","enum":["Filesystem","Snapshot",' .
                          "type":"object",
                          "properties":{
                                  "type":{"type":"string","enum":["Filesystem","Snapshot",' .

-                                       '"Volume","Clone","Pool"]},
+                                       '"Volume","Pool"]},

                                  "name":{"type":"string"}
                          }
                  }');
                                  "name":{"type":"string"}
                          }
                  }');


@@ -171,10 +191,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                        $tmp = new OMVModuleZFSDataset($name);
                        $tmp->destroy();
                        break;
                        $tmp = new OMVModuleZFSDataset($name);
                        $tmp->destroy();
                        break;

-               case "Clone":
-                       $tmp = new OMVModuleZFSDataset($name);
-                       $tmp->destroy();
-                       break;

                case "Snapshot":
                        $tmp = new OMVModuleZFSSnapshot($name);
                        $tmp->destroy();
                case "Snapshot":
                        $tmp = new OMVModuleZFSSnapshot($name);
                        $tmp->destroy();


@@ -217,7 +233,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                $name = $params['name'];
                switch ($params['type']) {
                case "Filesystem":
                $name = $params['name'];
                switch ($params['type']) {
                case "Filesystem":

-               case "Clone":

                        $tmp = new OMVModuleZFSDataset($name);
                        break;
                case "Snapshot":
                        $tmp = new OMVModuleZFSDataset($name);
                        break;
                case "Snapshot":


@@ -252,7 +267,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                        "type":"object",
                                "properties":{
                                        "type":{"type":"string","enum":["Filesystem","Snapshot",' .
                        "type":"object",
                                "properties":{
                                        "type":{"type":"string","enum":["Filesystem","Snapshot",' .

-                                               '"Volume","Clone","Pool"]},
+                                               '"Volume","Pool"]},

                                        "name":{"type":"string"},
                                        "properties":{"type":"array","items":{
                                                "type":"object",
                                        "name":{"type":"string"},
                                        "properties":{"type":"array","items":{
                                                "type":"object",


@@ -264,7 +279,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                global $xmlConfig;
                switch ($params['type']) {
                case "Filesystem":
                global $xmlConfig;
                switch ($params['type']) {
                case "Filesystem":

-               case "Clone":

                        $tmp = new OMVModuleZFSDataset($params['name']);
                        break;
                case "Snapshot":
                        $tmp = new OMVModuleZFSDataset($params['name']);
                        break;
                case "Snapshot":


@@ -298,7 +312,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                          "type":"object",
                          "properties":{
                                  "type":{"type":"string","enum":["Filesystem","Snapshot",' .
                          "type":"object",
                          "properties":{
                                  "type":{"type":"string","enum":["Filesystem","Snapshot",' .

-                                       '"Volume","Clone","Pool"]},
+                                       '"Volume","Pool"]},

                                  "name":{"type":"string"},
                                  "property":{"type":"string"}
                          }
                                  "name":{"type":"string"},
                                  "property":{"type":"string"}
                          }


@@ -316,7 +330,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                        $this->updateBgProcStatus($bgStatusFilename, "outputfilename", $bgOutputFilename);
                        switch ($params['type']) {
                        case "Filesystem":
                        $this->updateBgProcStatus($bgStatusFilename, "outputfilename", $bgOutputFilename);
                        switch ($params['type']) {
                        case "Filesystem":

-                       case "Clone":

                                $tmp = new OMVModuleZFSDataset($params['name']);
                                break;
                        case "Snapshot":
                                $tmp = new OMVModuleZFSDataset($params['name']);
                                break;
                        case "Snapshot":


@@ -368,7 +381,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                          "type":"object",
                          "properties":{
                                  "name":{"type":"string"},
                          "type":"object",
                          "properties":{
                                  "name":{"type":"string"},

-                                 "type":{"type":"string","enum":["Filesystem","Clone"]},
+                                 "type":{"type":"string","enum":["Filesystem"]},

                                  "sharename":{'.$GLOBALS['OMV_JSONSCHEMA_SHARENAME'].'},
                                  "comment":{"type":"string"},
                                  "mode":{"type":"string","enum":["700","750","755",'.
                                  "sharename":{'.$GLOBALS['OMV_JSONSCHEMA_SHARENAME'].'},
                                  "comment":{"type":"string"},
                                  "mode":{"type":"string","enum":["700","750","755",'.


@@ -391,9 +404,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                case "Filesystem":
                        $tmp = new OMVModuleZFSDataset($params['name']);
                        break;
                case "Filesystem":
                        $tmp = new OMVModuleZFSDataset($params['name']);
                        break;

-               case "Clone":
-                       $tmp = new OMVModuleZFSDataset($params['name']);
-                       break;

                default:
                        throw new OMVModuleZFSException("Illegal type provided: " . $params['type']);
                        break;
                default:
                        throw new OMVModuleZFSException("Illegal type provided: " . $params['type']);
                        break;


@@ -516,8 +526,18 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                        $cmd = "zfs get all {$params['name']}";
                        break;
                case "Pool":
                        $cmd = "zfs get all {$params['name']}";
                        break;
                case "Pool":

-                       $output .= "Pool details (zpool get all):\n\r\n\r";
+                       $output .= "Pool status (zpool status):\n\r\n\r";
+                       $cmd = "zpool status {$params['name']}";
+                       OMVModuleZFSUtil::exec($cmd,$out,$res);
+                       $output .= implode("\n\r", $out);
+                       unset($out);
+                       $output .= "\n\r\n\rPool details (zpool get all):\n\r\n\r";

                        $cmd = "zpool get all {$params['name']}";
                        $cmd = "zpool get all {$params['name']}";

+                       OMVModuleZFSUtil::exec($cmd,$out,$res);
+                       $output .= implode("\n\r", $out);
+                       unset($out);
+                       $output .= "\n\r\n\rPool filesystem details (zfs get all):\n\r\n\r";
+                       $cmd = "zfs get all {$params['name']}";

                        break;
                default:
                        throw new OMVModuleZFSException("Incorrect type provided");
                        break;
                default:
                        throw new OMVModuleZFSException("Incorrect type provided");


@@ -536,7 +556,9 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                                  "vdevtype":{"type":"string","enum":["basic","mirror",' .
                                        '"raidz1","raidz2","raidz3"]},
                                  "name":{"type":"string"},
                                  "vdevtype":{"type":"string","enum":["basic","mirror",' .
                                        '"raidz1","raidz2","raidz3"]},
                                  "name":{"type":"string"},

-                                 "devices":{"type":"string"}
+                                 "devices":{"type":"string"},
+                                 "force":{"type":"boolean"},
+                                 "diskpath":{"type":"boolean"}

                          }
                }');
                $pool = new OMVModuleZFSZpool($params['name']);
                          }
                }');
                $pool = new OMVModuleZFSZpool($params['name']);


@@ -560,17 +582,29 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                        throw new OMVModuleZFSException("Incorrect pool type specified");
                        break;
                }
                        throw new OMVModuleZFSException("Incorrect pool type specified");
                        break;
                }

-               //Use /dev/disk/by-path as deafult when creating new pools as suggested in ZoL FAQ.
+               if ($params['force']) {
+                       $opts .= "-f ";
+               }

                $disks = preg_split("/[,;]/", $params['devices']);
                $disks = preg_split("/[,;]/", $params['devices']);

-               if (file_exists("/dev/disk/by-path/")) {
-                       $tmp_disks = array();
-                       foreach ($disks as $disk) {
-                               $tmp_disks[] = OMVModuleZFSUtil::getDiskPath($disk);
+               foreach ($disks as $disk) {
+                       OMVModuleZFSUtil::setGPTLabel($disk);
+               }
+               //Use /dev/disk/by-path as suggested in ZoL FAQ.
+               if ($params['diskpath']) {
+                       try {
+                               if (file_exists("/dev/disk/by-path/")) {
+                                       $tmp_disks = array();
+                                       foreach ($disks as $disk) {
+                                               $tmp_disks[] = OMVModuleZFSUtil::getDiskPath($disk);
+                                       }
+                                       $disks = $tmp_disks;
+                               }
+                       } catch (OMVModuleZFSException $e) {
+                               //Do nothing if an exception is thrown

                        }
                        }

-                       $disks = $tmp_disks;

                }
                $vdev[] = new OMVModuleZFSVdev($params['name'], $pooltype, $disks);
                }
                $vdev[] = new OMVModuleZFSVdev($params['name'], $pooltype, $disks);

-               $pool->addVdev($vdev);
+               $pool->addVdev($vdev, $opts);

                //Ugly fix to solve the problem of blkid not displaying info on newly created pools
                $pool->export();
                $pool->import($pool->getName());
                //Ugly fix to solve the problem of blkid not displaying info on newly created pools
                $pool->export();
                $pool->import($pool->getName());