---

yaml
---
r: 310423
b: refs/heads/master
c: f220fd4
h: refs/heads/master
i:
  310421: 0be2613
  310419: f4cdc5c
  310415: 6938da0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fbdd2b3a3cf77f77b0cdf25dd969241ea2c0ce1
+refs/heads/master: f220fd4efb334a772f9a14b2372175f38d89355e

trunk/drivers/md/dm-mpath.c

@@ -329,14 +329,18 @@ static void __choose_pgpath(struct multipath *m, size_t nr_bytes)
 	/*
 	 * Loop through priority groups until we find a valid path.
 	 * First time we skip PGs marked 'bypassed'.
-	 * Second time we only try the ones we skipped.
+	 * Second time we only try the ones we skipped, but set
+	 * pg_init_delay_retry so we do not hammer controllers.
 	 */
 	do {
 		list_for_each_entry(pg, &m->priority_groups, list) {
 			if (pg->bypassed == bypassed)
 				continue;
-			if (!__choose_path_in_pg(m, pg, nr_bytes))
+			if (!__choose_path_in_pg(m, pg, nr_bytes)) {
+				if (!bypassed)
+					m->pg_init_delay_retry = 1;
 				return;
+			}
 		}
 	} while (bypassed--);