]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
server: avoid side-effect of assert
authorxie xingguo <xie.xingguo@zte.com.cn>
Wed, 15 Jun 2016 02:16:13 +0000 (10:16 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Wed, 15 Jun 2016 02:16:13 +0000 (10:16 +0800)
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>
src/mds/Server.cc

index e7ef6251d844b6e69e4a44961a095bb9c9a54ac8..b6407b2b9b6592111ebc846cfcd5659c2f1cb029 100644 (file)
@@ -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()) {