From: Greg Farnum <gregf@hq.newdream.net>
Date: Thu, 3 Dec 2009 21:26:00 +0000 (-0800)
Subject: mds: Cleanup/doc updates
X-Git-Tag: v0.18~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2939a1199afb7aa99fff738e56fd902a4776f91;p=ceph.git

mds: Cleanup/doc updates
---

diff --git a/src/doc/killpoints.txt b/src/doc/killpoints.txt
index f7ad5198a93..1cd2bb6ba6f 100644
--- a/src/doc/killpoints.txt
+++ b/src/doc/killpoints.txt
@@ -3,6 +3,16 @@ mds_kill_mdstable_at
 mds_kill_export_at
 mds_kill_import_at
 
+mds_kill_mdstable_at:
+1: (Server) After receiving MMDStableRequest
+2: (Server) After logging request, before sending reply to client
+3: (Client) After receiving Agree from Server
+4: (Client) Prior to sending Commit to server, but after making local change
+5: (Server) After receiving commit message from client (before doing so)
+6: (Server) After logging commit, before sending Ack
+7: (Client) After receiving commit Ack from server
+8: (Client) After logging Ack from server
+
 mds_kill_export_at:
 1: After moving to STATE_EXPORTING
 2: After sending MExportDirDiscover
diff --git a/src/mds/Migrator.h b/src/mds/Migrator.h
index ff399d3beac..fc36bf3e5a0 100644
--- a/src/mds/Migrator.h
+++ b/src/mds/Migrator.h
@@ -10,8 +10,8 @@
  * License version 2.1, as published by the Free Software 
  * Foundation.  See file COPYING.
  * 
- * Handles the import and export of authority for mds cache data.
- * See src/doc/exports.txt for a general description.
+ * Handles the import and export of  mds authorities and actual cache data.
+ * See src/doc/exports.txt for a description.
  */
 
 #ifndef __MDS_MIGRATOR_H
@@ -59,12 +59,11 @@ public:
   // export stages.  used to clean up intelligently if there's a failure.
   const static int EXPORT_DISCOVERING   = 1;  // dest is disovering export dir
   const static int EXPORT_FREEZING      = 2;  // we're freezing the dir tree
-  const static int EXPORT_PREPPING      = 4;  // sending dest spanning tree to export bounds
-  const static int EXPORT_WARNING       = 5;  // warning bystanders of dir_auth_pending
-  const static int EXPORT_EXPORTING     = 6;  // sent actual export, waiting for ack
-  const static int EXPORT_LOGGINGFINISH = 7;  // logging EExportFinish
-  const static int EXPORT_NOTIFYING     = 8;  // waiting for notifyacks
-  const static int EXPORT_ABORTING      = 9;  // notifying bystanders of abort
+  const static int EXPORT_PREPPING      = 3;  // sending dest spanning tree to export bounds
+  const static int EXPORT_WARNING       = 4;  // warning bystanders of dir_auth_pending
+  const static int EXPORT_EXPORTING     = 5;  // sent actual export, waiting for ack
+  const static int EXPORT_LOGGINGFINISH = 6;  // logging EExportFinish
+  const static int EXPORT_NOTIFYING     = 7;  // waiting for notifyacks
   static const char *get_export_statename(int s) {
     switch (s) {
     case EXPORT_DISCOVERING: return "discovering";
@@ -74,7 +73,6 @@ public:
     case EXPORT_EXPORTING: return "exporting";
     case EXPORT_LOGGINGFINISH: return "loggingfinish";
     case EXPORT_NOTIFYING: return "notifying";
-    case EXPORT_ABORTING: return "aborting";
     default: assert(0); return 0;
     }
   }
@@ -99,7 +97,7 @@ public:
   const static int IMPORT_PREPPED       = 4; // opened bounds, waiting for import
   const static int IMPORT_LOGGINGSTART  = 5; // got import, logging EImportStart
   const static int IMPORT_ACKING        = 6; // logged EImportStart, sent ack, waiting for finish
-  const static int IMPORT_ABORTING      = 8; // notifying bystanders of an abort before unfreezing
+  const static int IMPORT_ABORTING      = 7; // notifying bystanders of an abort before unfreezing
   static const char *get_import_statename(int s) {
     switch (s) {
     case IMPORT_DISCOVERING: return "discovering";