summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-07-15 16:12:50 -0700
committerDan Mick <dan.mick@inktank.com>2013-07-16 15:14:01 -0700
commit4d9d0ffb892b69baa54316f0102f2f4f89666a90 (patch)
treefd202a7783608503d13f1116eacff04af7c68f98
parent466d0f5fc8ceaa3f0625397aee28c7a7b3b03122 (diff)
downloadceph-4d9d0ffb892b69baa54316f0102f2f4f89666a90.tar.gz
mon/OSDMonitor: return error if we can't set the new bucket's name
Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Dan Mick <dan.mick@inktank.com>
-rw-r--r--src/mon/OSDMonitor.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 7e76ea271c4..8a3a4f0422b 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2647,7 +2647,11 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
int bucketno = newcrush.add_bucket(0, CRUSH_BUCKET_STRAW,
CRUSH_HASH_DEFAULT, type, 0, NULL,
NULL);
- newcrush.set_item_name(bucketno, name);
+ err = newcrush.set_item_name(bucketno, name);
+ if (err < 0) {
+ ss << "error setting bucket name to '" << name << "'";
+ goto reply;
+ }
pending_inc.crush.clear();
newcrush.encode(pending_inc.crush);