From patchwork Tue Dec 11 08:30:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 1861131 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 493FF3FCA5 for ; Tue, 11 Dec 2012 08:31:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752458Ab2LKIbI (ORCPT ); Tue, 11 Dec 2012 03:31:08 -0500 Received: from mga01.intel.com ([192.55.52.88]:59907 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751821Ab2LKIbH (ORCPT ); Tue, 11 Dec 2012 03:31:07 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 11 Dec 2012 00:31:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,256,1355126400"; d="scan'208";a="262275439" Received: from zyan5-mobl.sh.intel.com ([10.239.36.25]) by fmsmga002.fm.intel.com with ESMTP; 11 Dec 2012 00:31:05 -0800 From: "Yan, Zheng" To: ceph-devel@vger.kernel.org, sage@inktank.com Cc: "Yan, Zheng" Subject: [PATCH 02/14] mds: alllow handle_client_readdir() fetching freezing dir. Date: Tue, 11 Dec 2012 16:30:48 +0800 Message-Id: <1355214660-26354-3-git-send-email-zheng.z.yan@intel.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1355214660-26354-1-git-send-email-zheng.z.yan@intel.com> References: <1355214660-26354-1-git-send-email-zheng.z.yan@intel.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org From: "Yan, Zheng" At that point, the request already auth pins and locks some objects. So CDir::fetch() should ignore the can_auth_pin check and continue to fetch freezing dir. Signed-off-by: Yan, Zheng --- src/mds/Server.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index ba43656..c8c52e1 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -2733,9 +2733,14 @@ void Server::handle_client_readdir(MDRequest *mdr) assert(dir->is_auth()); if (!dir->is_complete()) { + if (dir->is_frozen()) { + dout(7) << "dir is frozen " << *dir << dendl; + dir->add_waiter(CDir::WAIT_UNFREEZE, new C_MDS_RetryRequest(mdcache, mdr)); + return; + } // fetch dout(10) << " incomplete dir contents for readdir on " << *dir << ", fetching" << dendl; - dir->fetch(new C_MDS_RetryRequest(mdcache, mdr)); + dir->fetch(new C_MDS_RetryRequest(mdcache, mdr), true); return; }