From 455722892261cc13c46f786d4c158015da299a88 Mon Sep 17 00:00:00 2001
From: huanwen ren <ren.huanwen@zte.com.cn>
Date: Sat, 28 May 2016 09:37:04 +0800
Subject: [PATCH] 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>
---
 src/mds/Locker.cc         | 3 ++-
 src/mds/MDBalancer.cc     | 6 ++----
 src/mds/MDCache.cc        | 6 ++----
 src/mds/MDSTableClient.cc | 2 +-
 src/mds/MDSTableServer.cc | 2 +-
 src/mds/Migrator.cc       | 3 ++-
 src/mds/Server.cc         | 6 +++---
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 84e0e4897944..ff4230743495 100644
--- 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 99845fb6cfcf..8b7f55966acc 100644
--- 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 152b47b85ae4..4fda44bfc753 100644
--- 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 81b1b8a69379..b4eacf5ffe5e 100644
--- 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 eb5103de91c0..13463e00906f 100644
--- 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 3bf7ce248aeb..eed1364f36a9 100644
--- 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 750fb418cef4..f61ad83ed2d3 100644
--- 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);
 }
 
 
-- 
2.47.3