From a2caea7c9198d9bf49f55e53b2ec82d768c890ab Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Fri, 2 May 2014 10:43:02 +0800 Subject: [PATCH] mds: clear aborted flag before rollback slave requests There is a special case that the MDRequest needs to be preserved after rolling back slave rename. The preserved MDRequest will be used later. Signed-off-by: Yan, Zheng --- src/mds/MDCache.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index c10d52a3980..82fb44242c6 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -8761,7 +8761,9 @@ void MDCache::request_finish(MDRequestRef& mdr) if (mdr->has_more() && mdr->more()->slave_commit) { Context *fin = mdr->more()->slave_commit; mdr->more()->slave_commit = 0; - fin->complete(mdr->aborted ? -1 : 0); // this must re-call request_finish. + int ret = mdr->aborted ? -1 : 0; + mdr->aborted = false; + fin->complete(ret); // this must re-call request_finish. return; } -- 2.47.3