From patchwork Wed Apr 7 06:37:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bmarzins@sourceware.org X-Patchwork-Id: 90933 Received: from mx02.colomx.prod.int.phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o376eUCi002518 for ; Wed, 7 Apr 2010 06:41:06 GMT Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx02.colomx.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o376c8Ww014933; Wed, 7 Apr 2010 02:38:10 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o376c7rY025515 for ; Wed, 7 Apr 2010 02:38:07 -0400 Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.14]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o376c2Kt006213 for ; Wed, 7 Apr 2010 02:38:02 -0400 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by mx1.redhat.com (8.13.8/8.13.8) with SMTP id o376boU5026654 for ; Wed, 7 Apr 2010 02:37:51 -0400 Received: (qmail 2879 invoked by uid 9475); 7 Apr 2010 06:37:50 -0000 Date: 7 Apr 2010 06:37:50 -0000 Message-ID: <20100407063750.2877.qmail@sourceware.org> From: bmarzins@sourceware.org To: dm-cvs@sourceware.org, dm-devel@redhat.com X-RedHat-Spam-Score: -2.31 (RCVD_IN_DNSWL_MED,T_RP_MATCHES_RCVD) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-Scanned-By: MIMEDefang 2.67 on 10.5.110.14 X-loop: dm-devel@redhat.com Subject: [dm-devel] multipath-tools libmultipath/config.h multipat ... X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 07 Apr 2010 06:41:06 +0000 (UTC) --- multipath-tools/libmultipath/config.h 2008/04/14 22:40:08 1.17.2.4 +++ multipath-tools/libmultipath/config.h 2010/04/07 06:37:49 1.17.2.5 @@ -78,6 +78,7 @@ int max_fds; int attribute_flags; int flush_on_last_del; + int override_queueing; uid_t uid; gid_t gid; mode_t mode; --- multipath-tools/multipath/main.c 2008/04/14 22:32:04 1.41.2.7 +++ multipath-tools/multipath/main.c 2010/04/07 06:37:49 1.41.2.8 @@ -1,7 +1,7 @@ /* * Soft: multipath device mapper target autoconfig * - * Version: $Id: main.c,v 1.41.2.7 2008/04/14 22:32:04 bmarzins Exp $ + * Version: $Id: main.c,v 1.41.2.8 2010/04/07 06:37:49 bmarzins Exp $ * * Author: Christophe Varoqui * @@ -828,7 +828,9 @@ if (r || mpp->action == ACT_RELOADFEATURES) { condlog(3, "reloading features"); - if (r && mpp->no_path_retry != NO_PATH_RETRY_UNDEF) { + if (conf->override_queueing) + dm_queue_if_no_path(mpp->alias, 0); + else if (r && mpp->no_path_retry != NO_PATH_RETRY_UNDEF) { if (mpp->no_path_retry == NO_PATH_RETRY_FAIL) dm_queue_if_no_path(mpp->alias, 0); else @@ -880,6 +882,7 @@ "\t 2\t\t\tdefault verbosity\n" \ "\t 3\t\t\tprint debug information\n" \ "\t-b file\t\tbindings file location\n" \ + "\t-q\t\tforce all maps to turn off queue_if_no_path\n"\ "\t-d\t\tdry run, do not create or update devmaps\n" \ "\t-l\t\tshow multipath topology (sysfs and DM info)\n" \ "\t-ll\t\tshow multipath topology (maximum info)\n" \ @@ -1146,6 +1149,9 @@ case 'F': conf->remove = FLUSH_ALL; break; + case 'q': + conf->override_queueing = 1; + break; case 'l': conf->list = 1; conf->dry_run = 1; --- multipath-tools/multipathd/multipathd.init.redhat 2007/07/23 22:15:11 1.2.2.2 +++ multipath-tools/multipathd/multipathd.init.redhat 2010/04/07 06:37:49 1.2.2.3 @@ -33,6 +33,7 @@ start() { test -x $DAEMON || exit 5 echo -n $"Starting $prog daemon: " + /sbin/multipath -v0 daemon $DAEMON RETVAL=$? [ $RETVAL -eq 0 ] && touch $lockdir/$prog