diff options
| author | Sage Weil <sage@inktank.com> | 2013-04-22 12:58:08 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-04-22 12:58:08 -0700 |
| commit | 70e1e47da0970a4ad5cdd311aaaebf45361d5dff (patch) | |
| tree | dcc87daa3d5f4cf088585fbc40fbe7d5579e55a4 | |
| parent | 568101fa72e29ee960fcf3d704f04edfd50bd072 (diff) | |
| parent | 85fd2ca20d1237da0e4df953317be393d354c995 (diff) | |
| download | ceph-70e1e47da0970a4ad5cdd311aaaebf45361d5dff.tar.gz | |
Merge pull request #233 from ceph/wip-mon-idempotent
Wip mon idempotent
Reviewed-by: Dan Mick <dan.mick@inktank.com>
| -rw-r--r-- | src/mon/OSDMonitor.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 348d3130e1c..b07ab5e2583 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3180,7 +3180,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m) return true; } ss << addr << " isn't blacklisted"; - err = -ENOENT; + err = 0; goto out; } } @@ -3199,7 +3199,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m) if (p->snap_exists(snapname.c_str()) || (pp && pp->snap_exists(snapname.c_str()))) { ss << "pool " << m->cmd[3] << " snap " << snapname << " already exists"; - err = -EEXIST; + err = 0; } else { if (!pp) { pp = &pending_inc.new_pools[pool]; @@ -3228,7 +3228,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m) if (!p->snap_exists(snapname.c_str()) && (!pp || !pp->snap_exists(snapname.c_str()))) { ss << "pool " << m->cmd[3] << " snap " << snapname << " does not exists"; - err = -ENOENT; + err = 0; } else { if (!pp) { pp = &pending_inc.new_pools[pool]; |