make mdsmon be a bit more robust/simple

diff --git a/.gitignore b/.gitignore
index 9d2a60dc18f512796629e83211ab3bc678b5063c..57f6a5d08082115844de12b13901878fb95f29b1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 .depend
 web/*.html
 gmon.out
+core.*
+vgcore.*

diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index f93a3bbb6ff2792de6d7434a2736eafde57e22a6..d97a9928c7c4dfb8acefb9b36964f46d2ad1851b 100644 (file)
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -29,25 +29,6 @@ using namespace std;
 
 /*
 
-  beautiful state diagram:  
-
-   STOPPED                     DNE              FAILED                    
-  / |  \                      / |                  |
- /  |   \________     _______/  |                  |               
-|   v            v   v          v                  |
-| STARTING <--> STANDBY <--> CREATING              |
-|      \                      /                    |
-|       \____    ____________/                     |
- \           v  v                                  |
-  \         ACTIVE  <-- REJOIN <-- RECONNECT <-- REPLAY
-   \          |
-    \         |
-     \        v
-      \--  STOPPING 
-
-
- new states:
-
  boot  --> standby, creating, or starting.
 
 

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index db71d66cb991f872fb945597bf2a60adb1fe21e8..8fa1647e472364f93fa205c87a2080317ae34484 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -581,6 +581,9 @@ void MDSMonitor::tick()
        newstate = MDSMap::STATE_STOPPED;
        break;
 
+      case MDSMap::STATE_STOPPED:
+       break;
+
       case MDSMap::STATE_REPLAY:
       case MDSMap::STATE_RESOLVE:
       case MDSMap::STATE_RECONNECT:
@@ -589,7 +592,7 @@ void MDSMonitor::tick()
       case MDSMap::STATE_STOPPING:
        newstate = MDSMap::STATE_FAILED;
        break;
-       
+
       default:
        assert(0);
       }