From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 15 Jun 2016 02:16:13 +0000 (+0800)
Subject: server: avoid side-effect of assert
X-Git-Tag: v11.0.0~157^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc6d0656dec5aafec6ea4611b5d2918227184494;p=ceph.git

server: avoid side-effect of assert

The more() method will implicitly allocate a new internal _more memeber
if it does not have and we shall avoid this.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index e7ef6251d844..b6407b2b9b65 100644
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -1472,7 +1472,7 @@ void Server::dispatch_client_request(MDRequestRef& mdr)
   dout(7) << "dispatch_client_request " << *req << dendl;
 
   // we shouldn't be waiting on anyone.
-  assert(mdr->more()->waiting_on_slave.empty());
+  assert(!mdr->has_more() || mdr->more()->waiting_on_slave.empty());
 
   if (req->may_write()) {
     if (mdcache->is_readonly()) {