From 40b96745f02c255fd610da3381b5e5bcbef23a3e Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 23 Jun 2017 12:00:00 +0800 Subject: [PATCH 1/2] mgr: enable ceph_send_command() to send pg command Signed-off-by: Kefu Chai --- src/mgr/PyState.cc | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/mgr/PyState.cc b/src/mgr/PyState.cc index ce71dcd3f70..963526fc519 100644 --- a/src/mgr/PyState.cc +++ b/src/mgr/PyState.cc @@ -152,7 +152,24 @@ ceph_send_command(PyObject *self, PyObject *args) return nullptr; } } else if (std::string(type) == "pg") { - // TODO: expose objecter::pg_command + pg_t pgid; + if (!pgid.parse(name)) { + delete c; + string msg("invalid pgid: "); + msg.append("\"").append(name).append("\""); + PyErr_SetString(PyExc_ValueError, msg.c_str()); + return nullptr; + } + + ceph_tid_t tid; + global_handle->get_objecter().pg_command( + pgid, + {cmd_json}, + {}, + &tid, + &c->outbl, + &c->outs, + c); return nullptr; } else { string msg("unknown service type: "); From ffeddb4f22a2d3074c299a5ae94aab97da2d48f2 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 23 Jun 2017 12:00:58 +0800 Subject: [PATCH 2/2] osdc/Objecter: pass vector by const reference so we can pass temporary object to it as parameter. Signed-off-by: Kefu Chai --- src/osdc/Objecter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index 4efdb9d08b0..a9998fa2643 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -2201,7 +2201,7 @@ public: onfinish); submit_command(c, ptid); } - void pg_command(pg_t pgid, vector& cmd, + void pg_command(pg_t pgid, const vector& cmd, const bufferlist& inbl, ceph_tid_t *ptid, bufferlist *poutbl, string *prs, Context *onfinish) { CommandOp *c = new CommandOp(