osd: pass in data to do_command

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 259a058e9085d908b9d168e278a6c942a27bf06c..4637277d830297474c8a8ab590bfa17a364a8a8a 100644 (file)
--- 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 d75b1ecf2397fcf06c27f8ffc99e7acba9d161e4..1476bf2b351a5986879b8dcecaa905eeebc58400 100644 (file)
--- 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 b6d721defdd1f34f4ec609e3a862cf45bc2398f7..6eaf0f2585082c133bd0c3d051945d1960920e84 100644 (file)
--- 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 93f749c9058752525a19ae6905afac5430150309..7deeee3e95790e9b207298bd08f3d8ce55a52c92 100644 (file)
--- 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);