Skip to contentSkip to conversation

Fix pvmove test mode to not fail and do not poll.

PATCH New Milan Broz 1 participant 1 message Dec 3, 2009

lore
Share & tools
lore

Milan Broz

author
#0 lore raw

PATCH 1/1 Fix pvmove test mode to not fail and do not poll.

Test mode should not fail nor try to poll non-existent devices.

---
 tools/pvmove.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
tools/pvmove.c +6 -1
index ac09d6a..745f5ca 100644
@@ -312,8 +312,10 @@ static int _update_metadata(struct cmd_context *cmd, struct volume_group *vg,
 	/* FIXME: Add option to use a log */
 	if (first_time) {
 		if (!_activate_lv(cmd, lv_mirr, exclusive)) {
-			if (test_mode())
+			if (test_mode()) {
+				r = 1;
 				goto out;
+			}
 
 			/*
 			 * Nothing changed yet, try to revert pvmove.
@@ -570,6 +572,9 @@ static struct poll_functions _pvmove_fns = {
 int pvmove_poll(struct cmd_context *cmd, const char *pv_name,
 		unsigned background)
 {
+	if (test_mode())
+		return ECMD_PROCESSED;
+
 	return poll_daemon(cmd, pv_name, NULL, background, PVMOVE, &_pvmove_fns,
 			   "Moved");
 }
Signature · 1 line
1.6.5.3