summaryrefslogtreecommitdiff
path: root/debian/patches/0035-tests-imsm-Set-new_num_disks-value-corectly-to-perfo.patch
diff options
context:
space:
mode:
authorDimitri John Ledkov <xnox@ubuntu.com>2018-07-23 11:41:17 +0100
committerDimitri John Ledkov <xnox@ubuntu.com>2018-07-23 11:41:17 +0100
commit3bed5265f9c792edfcd593eeaa93675711e5e264 (patch)
tree60fcbcc5048f276f07022b12d9b34245a6e8ae8d /debian/patches/0035-tests-imsm-Set-new_num_disks-value-corectly-to-perfo.patch
parent9421e599c44cd50d3df4cd019cd3c53d9320e93d (diff)
Cherrypick master patches up to 20th of July 2018. LP: #1781427
Diffstat (limited to 'debian/patches/0035-tests-imsm-Set-new_num_disks-value-corectly-to-perfo.patch')
-rw-r--r--debian/patches/0035-tests-imsm-Set-new_num_disks-value-corectly-to-perfo.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/debian/patches/0035-tests-imsm-Set-new_num_disks-value-corectly-to-perfo.patch b/debian/patches/0035-tests-imsm-Set-new_num_disks-value-corectly-to-perfo.patch
new file mode 100644
index 00000000..cddd3085
--- /dev/null
+++ b/debian/patches/0035-tests-imsm-Set-new_num_disks-value-corectly-to-perfo.patch
@@ -0,0 +1,61 @@
+From 2b2ccdc04b604ef8644a0f87dc27ccfbd2159cb9 Mon Sep 17 00:00:00 2001
+From: Michal Zylowski <michal.zylowski@intel.com>
+Date: Fri, 22 Jun 2018 16:34:09 +0200
+Subject: [PATCH 35/40] tests, imsm: Set new_num_disks value corectly to
+ perform expected size calculations
+
+In some migration tests, variable new_num_disks should be set to expected
+number of disks after migration. This is required for proper expected size
+calculation.
+
+Pass new_num_disks variable during test execution for:
+- 16imsm-r0_3d-migrate-r5_4d
+- 18imsm-r1_2d-takeover-r0_1d
+- 16imsm-r0_5d-migrate-r5_6d
+
+Signed-off-by: Michal Zylowski <michal.zylowski@intel.com>
+Signed-off-by: Jes Sorensen <jsorensen@fb.com>
+---
+ tests/16imsm-r0_3d-migrate-r5_4d | 1 +
+ tests/16imsm-r0_5d-migrate-r5_6d | 1 +
+ tests/18imsm-r1_2d-takeover-r0_1d | 2 +-
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/16imsm-r0_3d-migrate-r5_4d b/tests/16imsm-r0_3d-migrate-r5_4d
+index 4f45479a..265adf94 100644
+--- a/tests/16imsm-r0_3d-migrate-r5_4d
++++ b/tests/16imsm-r0_3d-migrate-r5_4d
+@@ -15,6 +15,7 @@ vol0_offset=0
+
+ # After: RAID 5, 4 disks, 64k chunk size
+ vol0_new_level=5
++new_num_disks=4
+ vol0_new_num_comps=$num_disks
+ vol0_new_chunk=64
+
+diff --git a/tests/16imsm-r0_5d-migrate-r5_6d b/tests/16imsm-r0_5d-migrate-r5_6d
+index bee505bf..535b6099 100644
+--- a/tests/16imsm-r0_5d-migrate-r5_6d
++++ b/tests/16imsm-r0_5d-migrate-r5_6d
+@@ -17,5 +17,6 @@ vol0_offset=0
+ vol0_new_level=5
+ vol0_new_num_comps=$num_disks
+ vol0_new_chunk=64
++new_num_disks=6
+
+ . tests/imsm-grow-template 0 1
+diff --git a/tests/18imsm-r1_2d-takeover-r0_1d b/tests/18imsm-r1_2d-takeover-r0_1d
+index cb10ec97..fd5852ed 100644
+--- a/tests/18imsm-r1_2d-takeover-r0_1d
++++ b/tests/18imsm-r1_2d-takeover-r0_1d
+@@ -17,6 +17,6 @@ vol0_offset=0
+ vol0_new_level=0
+ vol0_new_num_comps=1
+ vol0_new_chunk=64
+-new_num_disks=0
++new_num_disks=1
+
+ . tests/imsm-grow-template 0 1
+--
+2.17.1
+