From: Greg Farnum Date: Thu, 4 Nov 2010 18:30:38 +0000 (-0700) Subject: dumper: Add new Dumper class. X-Git-Tag: v0.23~22^2~12^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0a5de25c14a952fd0bf55aebb3b6e7d447981d5;p=ceph.git 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 f30b24f3a5bb..51ad4bfdffec 100644 --- 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 index 000000000000..d73c2cc7d5de --- /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 + * + * 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 index 000000000000..22b6082f23ae --- /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 + * + * 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_ */