Merging upstream version 18.2.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

22 files changed, 68 insertions, 0 deletions

diff --git a/qa/suites/rbd/nbd/% b/qa/suites/rbd/device/%
index e69de29bb..e69de29bb 100644
--- a/qa/suites/rbd/nbd/%
+++ b/qa/suites/rbd/device/%
diff --git a/qa/suites/rbd/nbd/.qa b/qa/suites/rbd/device/.qa
index a602a0353..a602a0353 120000
--- a/qa/suites/rbd/nbd/.qa
+++ b/qa/suites/rbd/device/.qa
diff --git a/qa/suites/rbd/nbd/base b/qa/suites/rbd/device/base
index fd10a859d..fd10a859d 120000
--- a/qa/suites/rbd/nbd/base
+++ b/qa/suites/rbd/device/base
diff --git a/qa/suites/rbd/nbd/cluster/+ b/qa/suites/rbd/device/cluster/+
index e69de29bb..e69de29bb 100644
--- a/qa/suites/rbd/nbd/cluster/+
+++ b/qa/suites/rbd/device/cluster/+
diff --git a/qa/suites/rbd/nbd/cluster/.qa b/qa/suites/rbd/device/cluster/.qa
index a602a0353..a602a0353 120000
--- a/qa/suites/rbd/nbd/cluster/.qa
+++ b/qa/suites/rbd/device/cluster/.qa
diff --git a/qa/suites/rbd/nbd/cluster/fixed-3.yaml b/qa/suites/rbd/device/cluster/fixed-3.yaml
index 182589152..182589152 100644
--- a/qa/suites/rbd/nbd/cluster/fixed-3.yaml
+++ b/qa/suites/rbd/device/cluster/fixed-3.yaml
diff --git a/qa/suites/rbd/nbd/cluster/openstack.yaml b/qa/suites/rbd/device/cluster/openstack.yaml
index 48becbb83..48becbb83 120000
--- a/qa/suites/rbd/nbd/cluster/openstack.yaml
+++ b/qa/suites/rbd/device/cluster/openstack.yaml
diff --git a/qa/suites/rbd/nbd/conf b/qa/suites/rbd/device/conf
index 4bc0fe86c..4bc0fe86c 120000
--- a/qa/suites/rbd/nbd/conf
+++ b/qa/suites/rbd/device/conf
diff --git a/qa/suites/rbd/nbd/msgr-failures b/qa/suites/rbd/device/msgr-failures
index 03689aa44..03689aa44 120000
--- a/qa/suites/rbd/nbd/msgr-failures
+++ b/qa/suites/rbd/device/msgr-failures
diff --git a/qa/suites/rbd/nbd/objectstore b/qa/suites/rbd/device/objectstore
index c40bd3261..c40bd3261 120000
--- a/qa/suites/rbd/nbd/objectstore
+++ b/qa/suites/rbd/device/objectstore
diff --git a/qa/suites/rbd/nbd/supported-random-distro$ b/qa/suites/rbd/device/supported-random-distro$
index 0862b4457..0862b4457 120000
--- a/qa/suites/rbd/nbd/supported-random-distro$
+++ b/qa/suites/rbd/device/supported-random-distro$
diff --git a/qa/suites/rbd/nbd/thrashers b/qa/suites/rbd/device/thrashers
index f461dadc3..f461dadc3 120000
--- a/qa/suites/rbd/nbd/thrashers
+++ b/qa/suites/rbd/device/thrashers
diff --git a/qa/suites/rbd/nbd/thrashosds-health.yaml b/qa/suites/rbd/device/thrashosds-health.yaml
index 9124eb1aa..9124eb1aa 120000
--- a/qa/suites/rbd/nbd/thrashosds-health.yaml
+++ b/qa/suites/rbd/device/thrashosds-health.yaml
diff --git a/qa/suites/rbd/nbd/workloads/.qa b/qa/suites/rbd/device/workloads/.qa
index a602a0353..a602a0353 120000
--- a/qa/suites/rbd/nbd/workloads/.qa
+++ b/qa/suites/rbd/device/workloads/.qa
diff --git a/qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml b/qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml
new file mode 100644
index 000000000..5907718d5
--- /dev/null
+++ b/qa/suites/rbd/device/workloads/diff-continuous-krbd.yaml
@@ -0,0 +1,12 @@
+overrides:
+  install:
+    ceph:
+      extra_system_packages:
+        - pv
+tasks:
+- workunit:
+    clients:
+      all:
+        - rbd/diff_continuous.sh
+    env:
+      RBD_DEVICE_TYPE: "krbd"
diff --git a/qa/suites/rbd/nbd/workloads/rbd_nbd_diff_continuous.yaml b/qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml
index e0a7ebe33..e0a7ebe33 100644
--- a/qa/suites/rbd/nbd/workloads/rbd_nbd_diff_continuous.yaml
+++ b/qa/suites/rbd/device/workloads/diff-continuous-nbd.yaml
diff --git a/qa/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml b/qa/suites/rbd/device/workloads/rbd_fsx_nbd.yaml
index b5737671f..b5737671f 100644
--- a/qa/suites/rbd/nbd/workloads/rbd_fsx_nbd.yaml
+++ b/qa/suites/rbd/device/workloads/rbd_fsx_nbd.yaml
diff --git a/qa/suites/rbd/nbd/workloads/rbd_nbd.yaml b/qa/suites/rbd/device/workloads/rbd_nbd.yaml
index ededea024..ededea024 100644
--- a/qa/suites/rbd/nbd/workloads/rbd_nbd.yaml
+++ b/qa/suites/rbd/device/workloads/rbd_nbd.yaml
diff --git a/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-krbd.yaml b/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-krbd.yaml
new file mode 100644
index 000000000..771400d01
--- /dev/null
+++ b/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-krbd.yaml
@@ -0,0 +1,13 @@
+overrides:
+  install:
+    ceph:
+      extra_system_packages:
+        - pv
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror:
+        - rbd/compare_mirror_image_alternate_primary.sh
+    env:
+      RBD_DEVICE_TYPE: 'krbd'
+    timeout: 3h
diff --git a/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-nbd.yaml b/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-nbd.yaml
new file mode 100644
index 000000000..e87d0e8ce
--- /dev/null
+++ b/qa/suites/rbd/mirror/workloads/compare-mirror-image-alternate-primary-nbd.yaml
@@ -0,0 +1,15 @@
+overrides:
+  install:
+    ceph:
+      extra_packages:
+        - rbd-nbd
+      extra_system_packages:
+        - pv
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror:
+        - rbd/compare_mirror_image_alternate_primary.sh
+    env:
+      RBD_DEVICE_TYPE: 'nbd'
+    timeout: 3h
diff --git a/qa/suites/rbd/mirror/workloads/compare-mirror-images-krbd.yaml b/qa/suites/rbd/mirror/workloads/compare-mirror-images-krbd.yaml
new file mode 100644
index 000000000..fc161987f
--- /dev/null
+++ b/qa/suites/rbd/mirror/workloads/compare-mirror-images-krbd.yaml
@@ -0,0 +1,13 @@
+overrides:
+  install:
+    ceph:
+      extra_system_packages:
+        - pv
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror:
+        - rbd/compare_mirror_images.sh
+    env:
+      RBD_DEVICE_TYPE: 'krbd'
+    timeout: 3h
diff --git a/qa/suites/rbd/mirror/workloads/compare-mirror-images-nbd.yaml b/qa/suites/rbd/mirror/workloads/compare-mirror-images-nbd.yaml
new file mode 100644
index 000000000..ed02ed257
--- /dev/null
+++ b/qa/suites/rbd/mirror/workloads/compare-mirror-images-nbd.yaml
@@ -0,0 +1,15 @@
+overrides:
+  install:
+    ceph:
+      extra_packages:
+        - rbd-nbd
+      extra_system_packages:
+        - pv
+tasks:
+- workunit:
+    clients:
+      cluster1.client.mirror:
+        - rbd/compare_mirror_images.sh
+    env:
+      RBD_DEVICE_TYPE: 'nbd'
+    timeout: 3h