From: Sage Weil <sage@inktank.com>
Date: Thu, 18 Apr 2013 18:17:30 +0000 (-0700)
Subject: mon: make 'osd crush link ...' idempotent
X-Git-Tag: v0.61~143^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d46dc4646b1da7e4ca58a9580f7123b961f9019;p=ceph.git

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

We fixed move in f5ba0fbbe73e11418634bc95e1fc36d17edccf37 but missed this
one.

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 40103ec402f8..ec15d0abd288 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2691,7 +2691,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);
     }