From owner-svn-src-all@freebsd.org Mon Oct 5 09:00:10 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E234A1063E; Mon, 5 Oct 2015 09:00:10 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5FC58ED9; Mon, 5 Oct 2015 09:00:10 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9590AKU019189; Mon, 5 Oct 2015 09:00:10 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9590A9n019188; Mon, 5 Oct 2015 09:00:10 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201510050900.t9590A9n019188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 5 Oct 2015 09:00:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r288735 - stable/10/sys/cam/ctl X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2015 09:00:10 -0000 Author: mav Date: Mon Oct 5 09:00:09 2015 New Revision: 288735 URL: https://svnweb.freebsd.org/changeset/base/288735 Log: MFC r287671: Make ctld restart on primary HA node less invasive for secondary. Modified: stable/10/sys/cam/ctl/ctl.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cam/ctl/ctl.c ============================================================================== --- stable/10/sys/cam/ctl/ctl.c Mon Oct 5 08:59:18 2015 (r288734) +++ stable/10/sys/cam/ctl/ctl.c Mon Oct 5 09:00:09 2015 (r288735) @@ -1748,12 +1748,12 @@ ctl_serialize_other_sc_cmd(struct ctl_sc lun = NULL; if (lun == NULL) { /* - * Why isn't LUN defined? The other side wouldn't - * send a cmd if the LUN is undefined. + * The other node would not send this request to us unless + * received announce that we are primary node for this LUN. + * If this LUN does not exist now, it is probably result of + * a race, so respond to initiator in the most opaque way. */ - printf("%s: Bad JUJU!, LUN is NULL!\n", __func__); - - ctl_set_unsupported_lun(ctsio); + ctl_set_busy(ctsio); ctl_copy_sense_data_back((union ctl_io *)ctsio, &msg_info); msg_info.hdr.original_sc = ctsio->io_hdr.original_sc; msg_info.hdr.serializing_sc = NULL;