From patchwork Thu Apr 8 19:31: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: 91464 Received: from mx01.colomx.prod.int.phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o38JYfgt027908 for ; Thu, 8 Apr 2010 19:35:17 GMT Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx01.colomx.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o38JWBqN019661; Thu, 8 Apr 2010 15:32:13 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o38JW84k024162 for ; Thu, 8 Apr 2010 15:32:08 -0400 Received: from mx1.redhat.com (ext-mx06.extmail.prod.ext.phx2.redhat.com [10.5.110.10]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o38JW2Rs029671 for ; Thu, 8 Apr 2010 15:32: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 o38JVpHr018723 for ; Thu, 8 Apr 2010 15:31:51 -0400 Received: (qmail 3527 invoked by uid 9475); 8 Apr 2010 19:31:50 -0000 Date: 8 Apr 2010 19:31:50 -0000 Message-ID: <20100408193150.3525.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.12 X-Scanned-By: MIMEDefang 2.67 on 10.5.110.10 X-loop: dm-devel@redhat.com Subject: [dm-devel] multipath-tools ./multipath.conf.annotated lib ... 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]); Thu, 08 Apr 2010 19:35:17 +0000 (UTC) --- multipath-tools/multipath.conf.annotated 2010/01/27 22:33:28 1.18.2.15 +++ multipath-tools/multipath.conf.annotated 2010/04/08 19:31:49 1.18.2.16 @@ -84,7 +84,8 @@ # # name : path_checker # # scope : multipath & multipathd # # desc : the default method used to determine the paths' state -# # values : directio|tur|hp_sw|rdac|emc_clariion|readsector0|cciss_tur +# # values : directio|tur|hp_sw|rdac|emc_clariion|readsector0|cciss_tur| +# # hp_tur # # default : readsector0 # # # #path_checker readsector0 @@ -484,7 +485,7 @@ # # scope : multipathd # # desc : path checking alorithm to use to check path state # # values : directio|tur|hp_sw|rdac|emc_clariion|readsector0| -# # cciss_tur +# # cciss_tur|hp_tur # # default : readsector0 # # # path_checker readsector0 --- multipath-tools/libmultipath/config.h 2010/01/27 16:46:48 1.18.2.9 +++ multipath-tools/libmultipath/config.h 2010/04/08 19:31:49 1.18.2.10 @@ -78,6 +78,7 @@ int flush_on_last_del; int queue_without_daemon; int checker_timeout; + int override_queueing; uid_t uid; gid_t gid; mode_t mode; --- multipath-tools/libmultipath/configure.c 2009/12/04 21:19:51 1.2.2.6 +++ multipath-tools/libmultipath/configure.c 2010/04/08 19:31:49 1.2.2.7 @@ -537,7 +537,9 @@ if (r == DOMAP_DRY) continue; - if (mpp->no_path_retry != NO_PATH_RETRY_UNDEF) { + if (conf->override_queueing) + dm_queue_if_no_path(mpp->alias, 0); + else if (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 --- multipath-tools/multipath/main.c 2009/05/04 18:12:07 1.44.2.7 +++ multipath-tools/multipath/main.c 2010/04/08 19:31:49 1.44.2.8 @@ -1,7 +1,7 @@ /* * Soft: multipath device mapper target autoconfig * - * Version: $Id: main.c,v 1.44.2.7 2009/05/04 18:12:07 bmarzins Exp $ + * Version: $Id: main.c,v 1.44.2.8 2010/04/08 19:31:49 bmarzins Exp $ * * Author: Christophe Varoqui * @@ -84,6 +84,7 @@ "\t 2\t\t\tdefault verbosity\n" \ "\t 3\t\t\tprint debug information\n" \ "\t-h\t\tprint this usage text\n" \ + "\t-q\t\tforce all maps to turn off queue_if_no_path\n"\ "\t-b file\t\tbindings file location\n" \ "\t-d\t\tdry run, do not create or update devmaps\n" \ "\t-l\t\tshow multipath topology (sysfs and DM info)\n" \ @@ -324,7 +325,7 @@ if (load_config(DEFAULT_CONFIGFILE)) exit(1); - while ((arg = getopt(argc, argv, ":dhl::FfM:v:p:b:r")) != EOF ) { + while ((arg = getopt(argc, argv, ":dhl::FfM:v:p:b:rq")) != EOF ) { switch(arg) { case 1: printf("optarg : %s\n",optarg); break; @@ -335,6 +336,9 @@ conf->verbosity = atoi(optarg); break; + case 'q': + conf->override_queueing = 1; + break; case 'b': if (conf->bindings_file) FREE(conf->bindings_file);