From: Sage Weil <sage@inktank.com>
Date: Wed, 23 Jan 2013 00:13:14 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/wip-3833-b'
X-Git-Tag: v0.57~146
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8eee815fb2686d505ec0ad4e3d3239e323990610;p=ceph.git

Merge remote-tracking branch 'gh/wip-3833-b'

Conflicts:
	src/osd/OSD.cc
	src/osd/OSD.h

Reviewed-by: Samuel Just <sam.just@inktank.com>
---

8eee815fb2686d505ec0ad4e3d3239e323990610
diff --cc src/osd/OSD.cc
index 34ec3678f089,ecc23cdcde29..a17fec0fea88
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -857,35 -859,24 +860,40 @@@ public
    }
  };
  
- 
- class OpsFlightSocketHook : public AdminSocketHook {
-   OSD *osd;
- public:
-   OpsFlightSocketHook(OSD *o) : osd(o) {}
-   bool call(std::string command, std::string args, bufferlist& out) {
-     stringstream ss;
-     osd->dump_ops_in_flight(ss);
-     out.append(ss);
-     return true;
+ bool OSD::asok_command(string command, string args, ostream& ss)
+ {
+   if (command == "dump_ops_in_flight") {
+     op_tracker.dump_ops_in_flight(ss);
+   } else if (command == "dump_historic_ops") {
+     op_tracker.dump_historic_ops(ss);
+   } else if (command == "dump_op_pq_state") {
+     JSONFormatter f(true);
+     f.open_object_section("pq");
+     op_wq.dump(&f);
+     f.close_section();
+     f.flush(ss);
+   } else {
+     assert(0 == "broken asok registration");
    }
- };
+   return true;
+ }
  
 +class TestOpsSocketHook : public AdminSocketHook {
 +  OSDService *service;
 +  ObjectStore *store;
 +public:
 +  TestOpsSocketHook(OSDService *s, ObjectStore *st) : service(s), store(st) {}
 +  bool call(std::string command, std::string args, bufferlist& out) {
 +    stringstream ss;
 +    test_ops(service, store, command, args, ss);
 +    out.append(ss);
 +    return true;
 +  }
 +  void test_ops(OSDService *service, ObjectStore *store, std::string command,
 +     std::string args, ostream &ss);
 +
 +};
 +
  int OSD::init()
  {
    Mutex::Locker lock(osd_lock);
@@@ -979,28 -970,15 +987,30 @@@
    // tick
    timer.add_event_after(g_conf->osd_heartbeat_interval, new C_Tick(this));
  
-   admin_ops_hook = new OpsFlightSocketHook(this);
 -  asok_hook = new OSDSocketHook(this);
    AdminSocket *admin_socket = cct->get_admin_socket();
-   r = admin_socket->register_command("dump_ops_in_flight", admin_ops_hook,
-                                          "show the ops currently in flight");
++  asok_hook = new OSDSocketHook(this);
+   r = admin_socket->register_command("dump_ops_in_flight", asok_hook,
+ 				     "show the ops currently in flight");
 +  assert(r == 0);
-   historic_ops_hook = new HistoricOpsSocketHook(this);
-   r = admin_socket->register_command("dump_historic_ops", historic_ops_hook,
-                                          "show slowest recent ops");
+   r = admin_socket->register_command("dump_historic_ops", asok_hook,
+ 				     "show slowest recent ops");
++  assert(r == 0);
+   r = admin_socket->register_command("dump_op_pq_state", asok_hook,
+ 				     "dump op priority queue state");
    assert(r == 0);
 +  test_ops_hook = new TestOpsSocketHook(&(this->service), this->store);
 +  r = admin_socket->register_command("setomapval", test_ops_hook,
 +                              "setomap <pool-id> <obj-name> <key> <val>");
 +  assert(r == 0);
 +  r = admin_socket->register_command("rmomapkey", test_ops_hook,
 +                               "rmomapkey <pool-id> <obj-name> <key>");
 +  assert(r == 0);
 +  r = admin_socket->register_command("setomapheader", test_ops_hook,
 +                               "setomapheader <pool-id> <obj-name> <header>");
 +  assert(r == 0);
 +  r = admin_socket->register_command("getomap", test_ops_hook,
 +                               "getomap <pool-id> <obj-name>");
 +  assert(r == 0);
  
    service.init();
    service.publish_map(osdmap);
@@@ -1152,17 -1132,10 +1164,17 @@@ int OSD::shutdown(
  
    cct->get_admin_socket()->unregister_command("dump_ops_in_flight");
    cct->get_admin_socket()->unregister_command("dump_historic_ops");
-   delete admin_ops_hook;
-   delete historic_ops_hook;
-   admin_ops_hook = NULL;
-   historic_ops_hook = NULL;
+   cct->get_admin_socket()->unregister_command("dump_op_pq_state");
+   delete asok_hook;
+   asok_hook = NULL;
+ 
 +  cct->get_admin_socket()->unregister_command("setomapval");
 +  cct->get_admin_socket()->unregister_command("rmomapkey");
 +  cct->get_admin_socket()->unregister_command("setomapheader");
 +  cct->get_admin_socket()->unregister_command("getomap");
 +  delete test_ops_hook;
 +  test_ops_hook = NULL;
 +
    recovery_tp.stop();
    dout(10) << "recovery tp stopped" << dendl;
    op_tp.stop();
@@@ -2324,125 -2297,6 +2336,120 @@@ void OSD::check_ops_in_flight(
    return;
  }
  
- void OSD::dump_ops_in_flight(ostream& ss)
- {
-   op_tracker.dump_ops_in_flight(ss);
- }
- 
 +// Usage:
 +//   setomapval <pool-id> <obj-name> <key> <val>
 +//   rmomapkey <pool-id> <obj-name> <key>
 +//   setomapheader <pool-id> <obj-name> <header>
 +void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store,
 +     std::string command, std::string args, ostream &ss)
 +{
 +  //Test support
 +  //Support changing the omap on a single osd by using the Admin Socket to
 +  //directly request the osd make a change.
 +  if (command == "setomapval" || command == "rmomapkey" ||
 +        command == "setomapheader" || command == "getomap") {
 +    std::vector<std::string> argv;
 +    pg_t rawpg, pgid;
 +    int64_t pool;
 +    OSDMapRef curmap = service->get_osdmap();
 +    int r;
 +
 +    argv.push_back(command);
 +    string_to_vec(argv, args);
 +    int argc = argv.size();
 +
 +    if (argc < 3) {
 +      ss << "Illegal request";
 +      return;
 +    }
 + 
 +    pool = curmap->const_lookup_pg_pool_name(argv[1].c_str());
 +    //If we can't find it my name then maybe id specified
 +    if (pool < 0 && isdigit(argv[1].c_str()[0]))
 +      pool = atoll(argv[1].c_str());
 +    r = -1;
 +    if (pool >= 0)
 +        r = curmap->object_locator_to_pg(object_t(argv[2]),
 +          object_locator_t(pool), rawpg);
 +    if (r < 0) {
 +        ss << "Invalid pool " << argv[1];
 +        return;
 +    }
 +    pgid = curmap->raw_pg_to_pg(rawpg);
 +
 +    hobject_t obj(object_t(argv[2]), string(""), CEPH_NOSNAP, rawpg.ps(), pool);
 +    ObjectStore::Transaction t;
 +
 +    if (command == "setomapval") {
 +      if (argc != 5) {
 +        ss << "usage: setomapval <pool> <obj-name> <key> <val>";
 +        return;
 +      }
 +      map<string, bufferlist> newattrs;
 +      bufferlist val;
 +      string key(argv[3]);
 + 
 +      val.append(argv[4]);
 +      newattrs[key] = val;
 +      t.omap_setkeys(coll_t(pgid), obj, newattrs);
 +      r = store->apply_transaction(t);
 +      if (r < 0)
 +        ss << "error=" << r;
 +      else
 +        ss << "ok";
 +    } else if (command == "rmomapkey") {
 +      if (argc != 4) {
 +        ss << "usage: rmomapkey <pool> <obj-name> <key>";
 +        return;
 +      }
 +      set<string> keys;
 +
 +      keys.insert(string(argv[3]));
 +      t.omap_rmkeys(coll_t(pgid), obj, keys);
 +      r = store->apply_transaction(t);
 +      if (r < 0)
 +        ss << "error=" << r;
 +      else
 +        ss << "ok";
 +    } else if (command == "setomapheader") {
 +      if (argc != 4) {
 +        ss << "usage: setomapheader <pool> <obj-name> <header>";
 +        return;
 +      }
 +      bufferlist newheader;
 +
 +      newheader.append(argv[3]);
 +      t.omap_setheader(coll_t(pgid), obj, newheader);
 +      r = store->apply_transaction(t);
 +      if (r < 0)
 +        ss << "error=" << r;
 +      else
 +        ss << "ok";
 +    } else if (command == "getomap") {
 +      if (argc != 3) {
 +        ss << "usage: getomap <pool> <obj-name>";
 +        return;
 +      }
 +      //Debug: Output entire omap
 +      bufferlist hdrbl;
 +      map<string, bufferlist> keyvals;
 +      r = store->omap_get(coll_t(pgid), obj, &hdrbl, &keyvals);
 +      if (r >= 0) {
 +          ss << "header=" << string(hdrbl.c_str(), hdrbl.length());
 +          for (map<string, bufferlist>::iterator it = keyvals.begin();
 +              it != keyvals.end(); it++)
 +            ss << " key=" << (*it).first << " val="
 +               << string((*it).second.c_str(), (*it).second.length());
 +      } else {
 +          ss << "error=" << r;
 +      }
 +    }
 +    return;
 +  }
 +  ss << "Internal error - command=" << command;
 +  return;
 +}
 +
  // =========================================
  void OSD::RemoveWQ::_process(boost::tuple<coll_t, SequencerRef, DeletingStateRef> *item)
  {
diff --cc src/osd/OSD.h
index be4ed11791e4,c9b408a2747c..359d75396fea
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@@ -614,18 -625,7 +626,10 @@@ private
    // -- op tracking --
    OpTracker op_tracker;
    void check_ops_in_flight();
-   void dump_ops_in_flight(ostream& ss);
-   void dump_historic_ops(ostream& ss) {
-     return op_tracker.dump_historic_ops(ss);
-   }
 +  void test_ops(std::string command, std::string args, ostream& ss);
-   friend class OpsFlightSocketHook;
-   friend class HistoricOpsSocketHook;
 +  friend class TestOpsSocketHook;
-   friend class C_CompleteSplits;
-   OpsFlightSocketHook *admin_ops_hook;
-   HistoricOpsSocketHook *historic_ops_hook;
 +  TestOpsSocketHook *test_ops_hook;
+   friend class C_CompleteSplits;
  
    // -- op queue --