cache: improve vgremove loop

Support internal removal of 'cache origin' volume - which we
do not normally expose to a user - however internal processing
loops may hit this condition (depending on order of list LVs).

So when this operation is internally requested - we automatically
try to remove it's 'holding' LV (cache LV) - which will also
remove the origin.

diff --git a/WHATS_NEW b/WHATS_NEW
index 0b48e032b05e6fd25e5930f3cda106385db3f0b9..cb93bbef15114f727d5a4a4e34df650aeddb4b73 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.03.06 - 
 ================================
+  Improve internal removal of cached devices.
   Synchronize with udev when dropping snapshot.
   Add missing device synchronization point before removing pvmove node.
   Correctly set read_ahead for LVs when pvmove is finished.

diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 6aee947b97f5c6e63439ceeb67d52365c045417d..af3a16fe2d214bc36e190e6583dd3f0ffede3569 100644 (file)
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -6544,6 +6544,13 @@ int lv_remove_with_dependencies(struct cmd_context *cmd, struct logical_volume *
                return 0;
        }
 
+       if (lv_is_cache_origin(lv)) {
+               if (!_lv_remove_segs_using_this_lv(cmd, lv, force, level, "cache origin"))
+                       return_0;
+               /* Removal of cache LV also removes caching origin */
+               return 1;
+       }
+
        if (lv_is_external_origin(lv) &&
            !_lv_remove_segs_using_this_lv(cmd, lv, force, level, "external origin"))
                return_0;