Merge pull request #2560 from phillxnet/2395_Allow_delete_of_un-mount…

…ed/un-mountable_pool

Allow delete of un-mounted/un-mountable pool #2395

src/rockstor/fs/btrfs.py

@@ -805,7 +805,7 @@ def umount_root(root_pool_mnt):
         if ce.rc == 32:
             for l in ce.err:
                 l = l.strip()
-                if re.search("not mounted$", l) is not None:
+                if re.search("not mounted\.$", l) is not None:
                     return
             raise ce
     for i in range(20):
@@ -1149,8 +1149,8 @@ def share_id(pool, share_name):
 
 def remove_share(pool, share_name, pqgroup, force=False):
     """
-    umount share if its mounted.
-    unsures given pool is mounted.
+    umount share if it's mounted.
+    ensures given pool is mounted.
     if force flag set then first delete all share's subvolumes.
     btrfs subvolume delete root_mnt/vol_name.
     destroy shares qgroup and associated pqgroup.

src/rockstor/storageadmin/static/storageadmin/js/templates/pool/pool_details_layout.jst

@@ -119,7 +119,9 @@
       </div>
       <div class="modal-body">
         <div class="messages"></div>
-        <h4>{{poolName}} will be deleted including it's Shares listed below and their Snapshots, NFS exports, Samba and SFTP config and Replicas. Are you sure?</h4>
+        <h4>Pool and all associated Shares, Snapshots, NFS/Samba/SFTP exports, and Replicas, will be deleted.</h4>
+        <div class="alert alert-danger">Are you sure? DATA WILL BE LOST!</div>
+        Rockstor managed Shares:
         <ul>
         {{#each share}}
         <li>{{this.name}} ({{this.size_gb}} GB)</li>

src/rockstor/storageadmin/static/storageadmin/js/templates/pool/pools_table.jst

@@ -136,7 +136,9 @@
            </div>
            <div class="modal-body">
             <div class="messages"></div>
-            <h4>{{this.name}} will be deleted including it's Shares listed below and their Snapshots, NFS exports, Samba and SFTP config and Replics. Are you sure?</h4>
+            <h4>Pool and all associated Shares, Snapshots, NFS/Samba/SFTP exports, and Replicas, will be deleted.</h4>
+            <div class="alert alert-danger">Are you sure? DATA WILL BE LOST!</div>
+            Rockstor managed Shares:
             <ul id="pool-shares"></ul>
            </div>
            <div class="modal-footer">

src/rockstor/storageadmin/views/pool.py

@@ -772,7 +772,17 @@ def delete(self, request, pid, command=""):
                 ).format(pool.name)
                 handle_exception(Exception(e_msg), request)
 
-            if Share.objects.filter(pool=pool).exists():
+            if not pool.is_mounted:
+                logger.info(
+                    "Pool ({}) to be deleted is not mounted. "
+                    "Proceeding with database removal only.".format(pool.name)
+                )
+            elif pool.redundancy_exceeded:
+                logger.info(
+                    "Pool ({}) to be deleted has exceeded its redundancy limits. "
+                    "Proceeding with database removal only.".format(pool.name)
+                )
+            elif Share.objects.filter(pool=pool).exists():
                 if not force:
                     e_msg = (
                         "Pool ({}) is not empty. Delete is not allowed "
@@ -785,14 +795,7 @@ def delete(self, request, pid, command=""):
             pool_path = "{}{}".format(settings.MNT_PT, pool.name)
             umount_root(pool_path)
             pool.delete()
-            try:
-                # TODO: this call fails as the inheritance of disks was removed
-                # We need another method to invoke this as self no good now.
-                self._update_disk_state()
-            except Exception as e:
-                logger.error(
-                    ("Exception while updating disk state: ({}).").format(e.__str__())
-                )
+            # We may need to update disk state here.
             return Response()