From patchwork Sun Mar 17 14:51:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 2283921 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 70EA6E00E6 for ; Sun, 17 Mar 2013 15:06:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932715Ab3CQOxr (ORCPT ); Sun, 17 Mar 2013 10:53:47 -0400 Received: from mga03.intel.com ([143.182.124.21]:30053 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932673Ab3CQOxr (ORCPT ); Sun, 17 Mar 2013 10:53:47 -0400 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 17 Mar 2013 07:53:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,859,1355126400"; d="scan'208";a="215704506" Received: from unknown (HELO zyan5-mobl.ccr.corp.intel.com) ([10.255.20.118]) by AZSMGA002.ch.intel.com with ESMTP; 17 Mar 2013 07:53:43 -0700 From: "Yan, Zheng" To: ceph-devel@vger.kernel.org Cc: sage@inktank.com, greg@inktank.com, "Yan, Zheng" Subject: [PATCH 31/39] mds: unfreeze subtree if import aborts in PREPPED state Date: Sun, 17 Mar 2013 22:51:34 +0800 Message-Id: <1363531902-24909-32-git-send-email-zheng.z.yan@intel.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1363531902-24909-1-git-send-email-zheng.z.yan@intel.com> References: <1363531902-24909-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" Signed-off-by: Yan, Zheng Reviewed-by: Greg Farnum --- src/mds/Migrator.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index 143d71e..963706c 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -1658,11 +1658,14 @@ void Migrator::handle_export_cancel(MExportDirCancel *m) CInode *in = cache->get_inode(df.ino); assert(in); import_reverse_discovered(df, in); - } else if (import_state[df] == IMPORT_PREPPING || - import_state[df] == IMPORT_PREPPED) { + } else if (import_state[df] == IMPORT_PREPPING) { CDir *dir = mds->mdcache->get_dirfrag(df); assert(dir); import_reverse_prepping(dir); + } else if (import_state[df] == IMPORT_PREPPED) { + CDir *dir = mds->mdcache->get_dirfrag(df); + assert(dir); + import_reverse_unfreeze(dir); } else { assert(0 == "got export_cancel in weird state"); }