svn commit: r288735 - stable/10/sys/cam/ctl

Alexander Motin mav at FreeBSD.org
Mon Oct 5 09:00:10 UTC 2015


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;


More information about the svn-src-all mailing list