From patchwork Tue Dec 11 08:30:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 1861211 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 0DCFB3FCA5 for ; Tue, 11 Dec 2012 08:31:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752555Ab2LKIbP (ORCPT ); Tue, 11 Dec 2012 03:31:15 -0500 Received: from mga11.intel.com ([192.55.52.93]:16602 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752173Ab2LKIbO (ORCPT ); Tue, 11 Dec 2012 03:31:14 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 11 Dec 2012 00:31:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,256,1355126400"; d="scan'208";a="262275508" Received: from zyan5-mobl.sh.intel.com ([10.239.36.25]) by fmsmga002.fm.intel.com with ESMTP; 11 Dec 2012 00:31:13 -0800 From: "Yan, Zheng" To: ceph-devel@vger.kernel.org, sage@inktank.com Cc: "Yan, Zheng" Subject: [PATCH 11/14] mds: delay processing cache expire when state >= EXPORT_EXPORTING Date: Tue, 11 Dec 2012 16:30:57 +0800 Message-Id: <1355214660-26354-12-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" It's possible that MDS receives cache expire in EXPORT_LOGGINGFINISH and EXPORT_NOTIFYING states. Signed-off-by: Yan, Zheng --- src/mds/MDCache.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 326e9d7..fe100f9 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -5924,7 +5924,7 @@ void MDCache::handle_cache_expire(MCacheExpire *m) (parent_dir->is_auth() && parent_dir->is_exporting() && ((migrator->get_export_state(parent_dir) == Migrator::EXPORT_WARNING && migrator->export_has_warned(parent_dir,from)) || - migrator->get_export_state(parent_dir) == Migrator::EXPORT_EXPORTING))) { + migrator->get_export_state(parent_dir) >= Migrator::EXPORT_EXPORTING))) { // not auth. dout(7) << "delaying nonauth|warned expires for " << *parent_dir << dendl; assert(parent_dir->is_frozen_tree_root());