From owner-svn-src-all@FreeBSD.ORG  Sun Feb  5 15:23:33 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20ABE106566C;
	Sun,  5 Feb 2012 15:23:33 +0000 (UTC)
	(envelope-from trociny@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0FE5C8FC0A;
	Sun,  5 Feb 2012 15:23:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q15FNWsY088524;
	Sun, 5 Feb 2012 15:23:32 GMT (envelope-from trociny@svn.freebsd.org)
Received: (from trociny@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q15FNWUQ088522;
	Sun, 5 Feb 2012 15:23:32 GMT (envelope-from trociny@svn.freebsd.org)
Message-Id: <201202051523.q15FNWUQ088522@svn.freebsd.org>
From: Mikolaj Golub <trociny@FreeBSD.org>
Date: Sun, 5 Feb 2012 15:23:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231016 - head/sbin/hastd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Feb 2012 15:23:33 -0000

Author: trociny
Date: Sun Feb  5 15:23:32 2012
New Revision: 231016
URL: http://svn.freebsd.org/changeset/base/231016

Log:
  If a local write request is from the synchronization thread, when it
  is synchronizing data that is out of date on the local component, we
  should not send G_GATE_CMD_DONE acknowledge to the kernel.
  
  This fixes the issue, observed in async mode, when on synchronization
  from the remote component the worker terminated with "G_GATE_CMD_DONE
  failed" error.
  
  Reported by:	Artem Kajalainen <artem kayalaynen ru>
  Reviewed by:	pjd
  MFC after:	1 week

Modified:
  head/sbin/hastd/primary.c

Modified: head/sbin/hastd/primary.c
==============================================================================
--- head/sbin/hastd/primary.c	Sun Feb  5 15:21:08 2012	(r231015)
+++ head/sbin/hastd/primary.c	Sun Feb  5 15:23:32 2012	(r231016)
@@ -1326,7 +1326,8 @@ local_send_thread(void *arg)
 			} else {
 				hio->hio_errors[ncomp] = 0;
 				if (hio->hio_replication ==
-				    HAST_REPLICATION_ASYNC) {
+				    HAST_REPLICATION_ASYNC &&
+				    !ISSYNCREQ(hio)) {
 					ggio->gctl_error = 0;
 					write_complete(res, hio);
 				}