@@ -46,6 +46,7 @@
#define DEFAULT_UNKNOWN_FIND_MULTIPATHS_TIMEOUT 1
#define DEFAULT_ALL_TG_PT ALL_TG_PT_OFF
+#define CHECKINT_UNDEF (~0U)
#define DEFAULT_CHECKINT 5
#define MAX_CHECKINT(a) (a << 2)
@@ -264,7 +264,17 @@ snprint_mp_ ## option (struct config *conf, char * buff, int len, \
return function (buff, len, mpe->option); \
}
-declare_def_handler(checkint, set_int)
+static int checkint_handler(struct config *conf, vector strvec)
+{
+ int rc = set_int(strvec, &conf->checkint);
+
+ if (rc)
+ return rc;
+ if (conf->checkint == CHECKINT_UNDEF)
+ conf->checkint--;
+ return 0;
+}
+
declare_def_snprint(checkint, print_int)
declare_def_handler(max_checkint, set_int)
@@ -1563,7 +1573,7 @@ init_keywords(vector keywords)
{
install_keyword_root("defaults", NULL);
install_keyword("verbosity", &def_verbosity_handler, &snprint_def_verbosity);
- install_keyword("polling_interval", &def_checkint_handler, &snprint_def_checkint);
+ install_keyword("polling_interval", &checkint_handler, &snprint_def_checkint);
install_keyword("max_polling_interval", &def_max_checkint_handler, &snprint_def_max_checkint);
install_keyword("reassign_maps", &def_reassign_maps_handler, &snprint_def_reassign_maps);
install_keyword("multipath_dir", &def_multipath_dir_handler, &snprint_def_multipath_dir);
@@ -100,6 +100,7 @@ alloc_path (void)
pp->fd = -1;
pp->tpgs = TPGS_UNDEF;
pp->priority = PRIO_UNDEF;
+ pp->checkint = CHECKINT_UNDEF;
checker_clear(&pp->checker);
dm_path_to_gen(pp)->ops = &dm_gen_path_ops;
pp->hwe = vector_alloc();
@@ -1839,6 +1839,12 @@ check_path (struct vectors * vecs, struct path * pp, int ticks)
max_checkint = conf->max_checkint;
verbosity = conf->verbosity;
put_multipath_config(conf);
+
+ if (pp->checkint == CHECKINT_UNDEF) {
+ condlog(0, "%s: BUG: checkint is not set", pp->dev);
+ pp->checkint = checkint;
+ };
+
if (!pp->mpp && pp->initialized == INIT_MISSING_UDEV) {
if (pp->retriggers < retrigger_tries) {
condlog(2, "%s: triggering change event to reinitialize",