Merge pull request ceph#44470 from orozery/rbd-external-migrate

librbd/migration: add external clusters support

Reviewed-by: Mykola Golub <[email protected]>
Reviewed-by: Ramana Raja <[email protected]>

Author: idryomov

doc/rbd/rbd-live-migration.rst

@@ -4,11 +4,11 @@
 
 .. index:: Ceph Block Device; live-migration
 
-RBD images can be live-migrated between different pools within the same cluster;
-between different image formats and layouts; or from external data sources.
-When started, the source will be deep-copied to the destination image, pulling
-all snapshot history while preserving the sparse allocation of data where
-possible.
+RBD images can be live-migrated between different pools, image formats and/or
+layouts within the same Ceph cluster; from an image in another Ceph cluster; or
+from external data sources. When started, the source will be deep-copied to
+the destination image, pulling all snapshot history while preserving the sparse
+allocation of data where possible.
 
 By default, when live-migrating RBD images within the same Ceph cluster, the
 source image will be marked read-only and all clients will instead redirect
@@ -18,8 +18,9 @@ image during the migration to remove the dependency on the source image's
 parent.
 
 The live-migration process can also be used in an import-only mode where the
-source image remains unmodified and the target image can be linked to an
-external data source such as a backing file, HTTP(s) file, or S3 object.
+source image remains unmodified and the target image can be linked to an image
+in another Ceph cluster or to an external data source such as a backing file,
+HTTP(s) file, or S3 object.
 
 The live-migration copy process can safely run in the background while the new
 target image is in use. There is currently a requirement to temporarily stop
@@ -156,11 +157,15 @@ as follows::
 
         {
             "type": "native",
+            ["cluster_name": "<cluster-name>",] (specify if image in another cluster,
+                                                 requires ``<cluster-name>.conf`` file)
+            ["client_name": "<client-name>",] (for connecting to another cluster,
+                                               default is ``client.admin``)
             "pool_name": "<pool-name>",
             ["pool_id": <pool-id>,] (optional alternative to "pool_name")
             ["pool_namespace": "<pool-namespace",] (optional)
             "image_name": "<image-name>",
-            ["image_id": "<image-id>",] (optional if image in trash)
+            ["image_id": "<image-id>",] (specify if image in trash)
             "snap_name": "<snap-name>",
             ["snap_id": "<snap-id>",] (optional alternative to "snap_name")
         }

qa/suites/rbd/migration-external/%

@@ -0,0 +1 @@
+../.qa/

qa/suites/rbd/migration-external/.qa

@@ -0,0 +1 @@
+../.qa/

qa/suites/rbd/migration-external/1-base/.qa

@@ -0,0 +1,8 @@
+meta:
+- desc: run two ceph clusters
+tasks:
+- install:
+- ceph:
+    cluster: cluster1
+- ceph:
+    cluster: cluster2

qa/suites/rbd/migration-external/1-base/install.yaml

@@ -0,0 +1 @@
+../.qa/

qa/suites/rbd/migration-external/2-clusters/.qa

@@ -0,0 +1,15 @@
+meta:
+- desc: 2 ceph clusters with 1 mon and 3 osds each
+roles:
+- - cluster1.mon.a
+  - cluster1.mgr.x
+  - cluster1.osd.0
+  - cluster1.osd.1
+  - cluster1.osd.2
+  - cluster1.client.0
+- - cluster2.mon.a
+  - cluster2.mgr.x
+  - cluster2.osd.0
+  - cluster2.osd.1
+  - cluster2.osd.2
+  - cluster2.client.0

qa/suites/rbd/migration-external/2-clusters/2-node.yaml

@@ -0,0 +1 @@
+.qa/objectstore

qa/suites/rbd/migration-external/3-objectstore

@@ -0,0 +1 @@
+.qa/distros/supported-random-distro$

qa/suites/rbd/migration-external/4-supported-random-distro$

@@ -0,0 +1 @@
+../.qa/