Don't attempt remote metadata backups of non-clustered VGs. (2.02.29)

diff --git a/WHATS_NEW b/WHATS_NEW
index 27244ddee4203dc4a70bfaba2029965d9ff28a53..b1765d9c7482161084afb5f150464d44a96a0398 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.35 - 
 =================================
+  Don't attempt remote metadata backups of non-clustered VGs. (2.02.29)
   Don't store fid in VG metadata cache to avoid clvmd segfault. (2.02.34)
   Update vgsplit tests to verify loosening of active LV restriction.
   Update vgsplit to only restrict split with active LVs involved in split.

diff --git a/lib/locking/cluster_locking.c b/lib/locking/cluster_locking.c
index dfadbb36dcd324aceb34e8ec1957334eae25a973..08003314cb89b3806ef87943fb045907cd17a37e 100644 (file)
--- a/lib/locking/cluster_locking.c
+++ b/lib/locking/cluster_locking.c
@@ -438,8 +438,10 @@ int lock_resource(struct cmd_context *cmd, const char *resource, uint32_t flags)
                return 0;
        }
 
-       /* If we are unlocking a VG, then trigger remote metadata backups */
-       if (cluster_cmd == CLVMD_CMD_LOCK_VG && ((flags & LCK_TYPE_MASK) == LCK_UNLOCK)) {
+       /* If we are unlocking a clustered VG, then trigger remote metadata backups */
+       if (cluster_cmd == CLVMD_CMD_LOCK_VG &&
+           ((flags & LCK_TYPE_MASK) == LCK_UNLOCK) &&
+           (flags & LCK_CLUSTER_VG)) {
                log_very_verbose("Requesing backup of VG metadata for %s", resource);
                _lock_for_cluster(CLVMD_CMD_VG_BACKUP, LCK_CLUSTER_VG, resource);
        }