dumper: Add new Dumper class.

This lets you dump an MDS journal to a file.

diff --git a/src/Makefile.am b/src/Makefile.am
index f30b24f3a5bb291c90a21bf58fec794e0cfa30ca..51ad4bfdffecf29374cfd28c936e5cbd94ac40a6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -468,6 +468,7 @@ libmon_a_SOURCES = \
        mon/MonCaps.cc
 
 libmds_a_SOURCES = \
+       mds/Dumper.cc \
        mds/MDS.cc \
        mds/locks.c \
        mds/journal.cc \

diff --git a/src/mds/Dumper.cc b/src/mds/Dumper.cc
new file mode 100644 (file)
index 0000000..d73c2cc
--- /dev/null
+++ b/src/mds/Dumper.cc
@@ -0,0 +1,93 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2010 Greg Farnum <gregf@hq.newdream.net>
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software 
+ * Foundation.  See file COPYING.
+ * 
+ */
+
+#include "mds/Dumper.h"
+#include "osdc/Journaler.h"
+#include "mds/mdstypes.h"
+#include "mon/MonClient.h"
+
+bool Dumper::ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer,
+                         bool force_new)
+{
+  if (dest_type == CEPH_ENTITY_TYPE_MON)
+    return true;
+
+  if (force_new) {
+    if (monc->wait_auth_rotating(10) < 0)
+      return false;
+  }
+
+  *authorizer = monc->auth->build_authorizer(dest_type);
+  return *authorizer != NULL;
+}
+
+void Dumper::init() {
+  inodeno_t ino = MDS_INO_LOG_OFFSET + strtol(g_conf.id, 0, 0);
+  unsigned pg_pool = CEPH_METADATA_RULE;
+  osdmap = new OSDMap();
+  objecter = new Objecter(messenger, monc, osdmap, lock);
+  journaler = new Journaler(ino, pg_pool, CEPH_FS_ONDISK_MAGIC,
+                                       objecter, 0, 0,  &lock);
+
+  objecter->set_client_incarnation(0);
+
+  messenger->register_entity(entity_name_t::CLIENT());
+  messenger->add_dispatcher_head(this);
+  messenger->start(true);
+
+  monc->set_want_keys(CEPH_ENTITY_TYPE_MON|CEPH_ENTITY_TYPE_OSD|CEPH_ENTITY_TYPE_MDS);
+  monc->set_messenger(messenger);
+  monc->init();
+  monc->authenticate();
+
+  lock.Lock();
+  objecter->init();
+  objecter->wait_for_osd_map();
+  lock.Unlock();
+}
+
+void Dumper::dump(const char *dump_file)
+{
+  bool done = false;
+  Cond cond;
+  inodeno_t ino = MDS_INO_LOG_OFFSET + strtol(g_conf.id, 0, 0);;
+
+  lock.Lock();
+  journaler->recover(new C_SafeCond(&lock, &cond, &done));
+  while (!done)
+    cond.Wait(lock);
+  lock.Unlock();
+
+  uint64_t start = journaler->get_read_pos();
+  uint64_t end = journaler->get_write_pos();
+  uint64_t len = end-start;
+  cout << "journal is " << start << "~" << len << std::endl;
+
+  Filer filer(objecter);
+  bufferlist bl;
+  filer.read(ino, &journaler->get_layout(), CEPH_NOSNAP,
+             start, len, &bl, 0, new C_SafeCond(&lock, &cond, &done));
+  lock.Lock();
+  while (!done)
+    cond.Wait(lock);
+  lock.Unlock();
+
+  cout << "read " << bl.length() << " bytes" << std::endl;
+  bl.write_file(dump_file);
+  messenger->shutdown();
+
+  // wait for messenger to finish
+  messenger->wait();
+
+}

diff --git a/src/mds/Dumper.h b/src/mds/Dumper.h
new file mode 100644 (file)
index 0000000..22b6082
--- /dev/null
+++ b/src/mds/Dumper.h
@@ -0,0 +1,74 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2010 Greg Farnum <gregf@hq.newdream.net>
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ */
+
+#ifndef JOURNAL_DUMPER_H_
+#define JOURNAL_DUMPER_H_
+
+#include "osd/OSDMap.h"
+#include "osdc/Objecter.h"
+#include "osdc/Journaler.h"
+#include "msg/Dispatcher.h"
+#include "msg/Messenger.h"
+#include "msg/SimpleMessenger.h"
+#include "auth/Auth.h"
+
+/**
+ * This class lets you dump out an mds journal for troubleshooting or whatever.
+ *
+ * It was built to work with cmds so some of the design choices are random.
+ * To use, create a Dumper, call init(), and then call dump() with the name
+ * of the file to dump to.
+ */
+
+class Dumper : public Dispatcher {
+public:
+  Objecter *objecter;
+  Journaler *journaler;
+  OSDMap *osdmap;
+  SimpleMessenger *messenger;
+  MonClient *monc;
+  Mutex lock;
+
+  /*
+   * The messenger should be a valid SimpleMessenger. You should call bind()
+   * before passing it in, but not do anything else.
+   * The MonClient needs to be valid, and you should have called
+   * build_initial_monmap().
+   */
+  Dumper(SimpleMessenger *messenger_, MonClient *monc_) : messenger(messenger_),
+      monc(monc_),
+      lock("Dumper::lock")
+  {}
+
+  bool ms_dispatch(Message *m) {
+    switch (m->get_type()) {
+    case CEPH_MSG_OSD_OPREPLY:
+      objecter->handle_osd_op_reply((MOSDOpReply *)m);
+      break;
+    case CEPH_MSG_OSD_MAP:
+      objecter->handle_osd_map((MOSDMap*)m);
+      break;
+    default:
+      return false;
+    }
+    return true;
+  }
+  bool ms_handle_reset(Connection *con) { return false; }
+  void ms_handle_remote_reset(Connection *con) {}
+  bool ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer,
+                         bool force_new);
+  void init();
+  void dump(const char *dumpfile);
+};
+
+#endif /* JOURNAL_DUMPER_H_ */