Tidy the clvmd backup code.

Move the backups inside the protection of the VG lock,
Don't backup if we have a suspended LV
Correct the vg_read() call

1 files changed, 14 insertions, 6 deletions

diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c
index ced1f47b..0428e919 100644
--- a/daemons/clvmd/lvm-functions.c
+++ b/daemons/clvmd/lvm-functions.c
@@ -54,6 +54,7 @@ static struct dm_hash_table *lv_hash = NULL;
 static pthread_mutex_t lv_hash_lock;
 static pthread_mutex_t lvm_lock;
 static char last_error[1024];
+static int suspended = 0;
 
 struct lv_info {
 	int lock_id;
@@ -340,11 +341,15 @@ int do_lock_lv(unsigned char command, unsigned char lock_flags, char *resource)
 
 	case LCK_LV_SUSPEND:
 		status = do_suspend_lv(resource);
+		if (!status)
+			suspended++;
 		break;
 
 	case LCK_UNLOCK:
 	case LCK_LV_RESUME:	/* if active */
 		status = do_resume_lv(resource);
+		if (!status)
+			suspended--;
 		break;
 
 	case LCK_LV_ACTIVATE:
@@ -602,18 +607,21 @@ void init_lvhash()
 }
 
 /* Backups up the LVM metadata if it's changed */
-void lvm_do_backup(char *vgname)
+void lvm_do_backup(const char *vgname)
 {
 	struct volume_group * vg;
-	int consistent;
+	int consistent = 0;
 
-	DEBUGLOG("Triggering backup of VG metadata for %s\n", vgname);
+	DEBUGLOG("Triggering backup of VG metadata for %s. suspended=%d\n", vgname, suspended);
 
 	vg = vg_read(cmd, vgname, NULL /*vgid*/, &consistent);
-	if (vg)
-		check_current_backup(vg);
-	else
+	if (vg) {
+		if (consistent)
+			check_current_backup(vg);
+	}
+	else {
 		log_error("Error backing up metadata, can't find VG for group %s", vgname);
+	}
 }
 
 /* Called to initialise the LVM context of the daemon */