From patchwork Fri Sep 10 17:28:29 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Sage Weil <sage@newdream.net>
X-Patchwork-Id: 170312
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8AHRAGB005586
	for <patchwork-ceph-devel@patchwork.kernel.org>;
	Fri, 10 Sep 2010 17:27:11 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755368Ab0IJR1J (ORCPT
	<rfc822;patchwork-ceph-devel@patchwork.kernel.org>);
	Fri, 10 Sep 2010 13:27:09 -0400
Received: from cobra.newdream.net ([66.33.216.30]:56488 "EHLO
	cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754116Ab0IJR1J (ORCPT
	<rfc822; ceph-devel@vger.kernel.org>); Fri, 10 Sep 2010 13:27:09 -0400
Received: from cobra.newdream.net (localhost [127.0.0.1])
	by cobra.newdream.net (Postfix) with ESMTP id 2A32FBC72A;
	Fri, 10 Sep 2010 10:28:30 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=hq.newdream.net; h=date
	:from:to:cc:subject:in-reply-to:message-id:references
	:mime-version:content-type; s=drama; bh=aN6OrZVdLsppqkYxk7PcWwob
	0iM=; b=TLGuPigmdBJ44HsQtgBZqOeEtRkK5pmx6nmBtfJABrO4blkm2L+MjGoO
	8TSmLKkgg3Sg1WvkeqxEy13qET9mqVQiMveFFWKTeYtFYh3wsiLKMyOxf3rh74+1
	f8DUrKaoBlnsnhvGVNMFY4khNNSO6CX4i6MLBJGQrrYbzDVtYwM=
Received: by cobra.newdream.net (Postfix, from userid 1031)
	id 17AA8BC76B; Fri, 10 Sep 2010 10:28:29 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
	by cobra.newdream.net (Postfix) with ESMTP id F22B5BC72A;
	Fri, 10 Sep 2010 10:28:29 -0700 (PDT)
Date: Fri, 10 Sep 2010 10:28:29 -0700 (PDT)
From: Sage Weil <sage@newdream.net>
To: Nat N <phenisha@gmail.com>
cc: ceph-devel@vger.kernel.org
Subject: Re: MDS crashing
In-Reply-To: <AANLkTi=1C07ETO72hcW-9F0j5Enzgxdtfv4hVfr+PrNL@mail.gmail.com>
Message-ID: <Pine.LNX.4.64.1009090955470.19781@cobra.newdream.net>
References: <AANLkTinOE+zRi_UHq33xPkADp-xavEbxgiW+ezUhVciT@mail.gmail.com>
	<Pine.LNX.4.64.1009081019460.28511@cobra.newdream.net>
	<AANLkTi=1C07ETO72hcW-9F0j5Enzgxdtfv4hVfr+PrNL@mail.gmail.com>
MIME-Version: 1.0
Sender: ceph-devel-owner@vger.kernel.org
Precedence: bulk
List-ID: <ceph-devel.vger.kernel.org>
X-Mailing-List: ceph-devel@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Fri, 10 Sep 2010 17:27:14 +0000 (UTC)


diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index ec2013d..64fc6a3 100644
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -725,6 +725,8 @@ void ESession::replay(MDS *mds)
       Session *session = mds->sessionmap.get_session(client_inst.name);
       if (session->is_closed())
        mds->sessionmap.remove_session(session);
+      else
+       session->clear();    // the client has reconnected; keep the Session, but reset
     }
   }