From: Sage Weil <sage@inktank.com>
Date: Sat, 6 Apr 2013 20:54:10 +0000 (-0700)
Subject: mon: make 'osd crush move ...' idempotent
X-Git-Tag: v0.62~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5ba0fbbe73e11418634bc95e1fc36d17edccf37;p=ceph.git

mon: make 'osd crush move ...' idempotent

If we don't need to move the item, return success.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index e8cf2c84280d..a9d68075cd4c 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2656,7 +2656,8 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
 	    return true;
 	  }
 	} else {
-	    ss << "no need to move item id " << id << " name '" << name << "' to location " << loc << " in crush map";
+	  ss << "no need to move item id " << id << " name '" << name << "' to location " << loc << " in crush map";
+	  err = 0;
 	}
       } while (false);
     }