diff options
| author | Sage Weil <sage.weil@dreamhost.com> | 2012-02-23 20:16:05 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-02-24 11:24:44 -0800 |
| commit | 0361a3c43159f6629cdad4104bf2d1da764389c0 (patch) | |
| tree | 122adc2c77e67e9742f3b87729d76a95dd9135c1 | |
| parent | c9416e6184905501159e96115f734bdf65a74d28 (diff) | |
| download | ceph-0361a3c43159f6629cdad4104bf2d1da764389c0.tar.gz | |
osd: pass in data to do_command
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
| -rw-r--r-- | src/osd/OSD.cc | 2 | ||||
| -rw-r--r-- | src/osd/PG.h | 3 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 5 | ||||
| -rw-r--r-- | src/osd/ReplicatedPG.h | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 259a058e908..4637277d830 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -2411,7 +2411,7 @@ void OSD::do_command(Connection *con, tid_t tid, vector<string>& cmd, bufferlist r = -ENOENT; } else { cmd.erase(cmd.begin(), cmd.begin() + 2); - r = pg->do_command(cmd, ss, odata); + r = pg->do_command(cmd, ss, data, odata); } pg->unlock(); } diff --git a/src/osd/PG.h b/src/osd/PG.h index d75b1ecf239..1476bf2b351 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -1399,7 +1399,8 @@ public: virtual void do_backfill(OpRequest *op) = 0; virtual bool snap_trimmer() = 0; - virtual int do_command(vector<string>& cmd, ostream& ss, bufferlist& data) = 0; + virtual int do_command(vector<string>& cmd, ostream& ss, + bufferlist& idata, bufferlist& odata) = 0; virtual bool same_for_read_since(epoch_t e) = 0; virtual bool same_for_modify_since(epoch_t e) = 0; diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index b6d721defdd..6eaf0f25850 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -251,7 +251,8 @@ int ReplicatedPG::get_pgls_filter(bufferlist::iterator& iter, PGLSFilter **pfilt // ========================================================== -int ReplicatedPG::do_command(vector<string>& cmd, ostream& ss, bufferlist& data) +int ReplicatedPG::do_command(vector<string>& cmd, ostream& ss, + bufferlist& idata, bufferlist& odata) { if (cmd.size() && cmd[0] == "query") { JSONFormatter jsf(true); @@ -271,7 +272,7 @@ int ReplicatedPG::do_command(vector<string>& cmd, ostream& ss, bufferlist& data) jsf.close_section(); stringstream dss; jsf.flush(dss); - data.append(dss); + odata.append(dss); return 0; } else if (cmd.size() > 1 && diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index 93f749c9058..7deeee3e957 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -789,7 +789,7 @@ public: ReplicatedPG(OSD *o, PGPool *_pool, pg_t p, const hobject_t& oid, const hobject_t& ioid); ~ReplicatedPG() {} - int do_command(vector<string>& cmd, ostream& ss, bufferlist& data); + int do_command(vector<string>& cmd, ostream& ss, bufferlist& idata, bufferlist& odata); void do_op(OpRequest *op); bool pg_op_must_wait(MOSDOp *op); |