mds: fixed dispatch in the default branch

fixed dispatch in the default branch.
include:
mdcache->dispatch(m);
mdcache->migrator->dispatch(m);
server->dispatch(m);
balancer->proc_message(m);
locker->dispatch(m);
client->handle_request(req);
server->handle_request(req);

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 84e0e4897944874a0d4da6004f8e1cae15eec681..ff4230743495f6978adcd0841a558dbc72ecaa4d 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -98,7 +98,8 @@ void Locker::dispatch(Message *m)
     break;
     
   default:
-    assert(0);
+    derr << "locker unknown message " << m->get_type() << dendl;
+    assert(0 == "locker unknown message");
   }
 }
 

diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index 99845fb6cfcf56bd21f93ee7baf97afdadf769c5..8b7f55966acc168cdd0b1de906bfd6e54353b898 100644 (file)
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -58,10 +58,8 @@ int MDBalancer::proc_message(Message *m)
     break;
 
   default:
-    dout(1) << " balancer unknown message " << m->get_type() << dendl;
-    assert(0);
-    m->put();
-    break;
+    derr << " balancer unknown message " << m->get_type() << dendl;
+    assert(0 == "balancer unknown message");
   }
 
   return 0;

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 152b47b85ae4afd6ba19ef3c69c32cae234ea5dc..4fda44bfc7538afccc50ea4ed88f9e88ab2f30b2 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -7624,10 +7624,8 @@ void MDCache::dispatch(Message *m)
     break;
     
   default:
-    dout(7) << "cache unknown message " << m->get_type() << dendl;
-    assert(0);
-    m->put();
-    break;
+    derr << "cache unknown message " << m->get_type() << dendl;
+    assert(0 == "cache unknown message");
   }
 }
 

diff --git a/src/mds/MDSTableClient.cc b/src/mds/MDSTableClient.cc
index 81b1b8a69379c1ff71eaa50dba378520b5e8a19b..b4eacf5ffe5ed2b0ca0d174792047e6082ebfba9 100644 (file)
--- a/src/mds/MDSTableClient.cc
+++ b/src/mds/MDSTableClient.cc
@@ -127,7 +127,7 @@ void MDSTableClient::handle_request(class MMDSTableRequest *m)
     break;
 
   default:
-    assert(0);
+    assert(0 == "unrecognized mds_table_client request op");
   }
 
   m->put();

diff --git a/src/mds/MDSTableServer.cc b/src/mds/MDSTableServer.cc
index eb5103de91c0f4b3260a4597e248aa1bc35729b9..13463e00906fb267b79130a1ea45e82434993bd1 100644 (file)
--- a/src/mds/MDSTableServer.cc
+++ b/src/mds/MDSTableServer.cc
@@ -33,7 +33,7 @@ void MDSTableServer::handle_request(MMDSTableRequest *req)
   case TABLESERVER_OP_PREPARE: return handle_prepare(req);
   case TABLESERVER_OP_COMMIT: return handle_commit(req);
   case TABLESERVER_OP_ROLLBACK: return handle_rollback(req);
-  default: assert(0);
+  default: assert(0 == "unrecognized mds_table_server request op");
   }
 }
 

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index 3bf7ce248aeb556840c35a9a8ac8c8f9cfbca64c..eed1364f36a936af5389483cb1d9f6a111289e63 100644 (file)
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -145,7 +145,8 @@ void Migrator::dispatch(Message *m)
     break;
 
   default:
-    assert(0);
+    derr << "migrator unknown message " << m->get_type() << dendl;
+    assert(0 == "migrator unknown message");
   }
 }
 

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 750fb418cef48086229e5beccf5622ee8f9d2270..f61ad83ed2d3adbfb55860bca50ec5b2b10b3bc4 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -194,10 +194,10 @@ void Server::dispatch(Message *m)
   case MSG_MDS_SLAVE_REQUEST:
     handle_slave_request(static_cast<MMDSSlaveRequest*>(m));
     return;
+  default:
+    derr << "server unknown message " << m->get_type() << dendl;
+    assert(0 == "server unknown message");  
   }
-
-  dout(1) << "server unknown message " << m->get_type() << dendl;
-  assert(0);
 }