diff options
| author | Sage Weil <sage@inktank.com> | 2013-04-19 10:20:18 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-04-19 10:20:18 -0700 |
| commit | af5a9b37f26e438b828adc44ef9642be6817379d (patch) | |
| tree | 0c81415f63a9a9f5cac3fdcec38c8a1b3b6a50a2 | |
| parent | 5e4b8bc4426eeb3879c3c524558c25b7f2c816b8 (diff) | |
| parent | b0c1001a5e29c9cc4465497b3cac06db89ddccb2 (diff) | |
| download | ceph-af5a9b37f26e438b828adc44ef9642be6817379d.tar.gz | |
Merge pull request #224 from ceph/wip-mon-crush
Wip mon crush
Reviewed-by: Dan Mick <dan.mick@inktank.com>
| -rw-r--r-- | src/mon/OSDMonitor.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 40103ec402f..8868189446d 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); } @@ -2812,6 +2813,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m) if (newcrush.rule_exists(name)) { ss << "rule " << name << " already exists"; + err = 0; } else { int rule = newcrush.add_simple_rule(name, root, type); if (rule < 0) { @@ -2843,6 +2845,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m) if (!newcrush.rule_exists(name)) { ss << "rule " << name << " does not exist"; + err = 0; } else { int ruleno = newcrush.get_rule_id(name); assert(ruleno >= 0); |