Merge pull request #49292 from rhcs-dashboard/rbd-mirror-improvements

mgr/dashboard: rbd-mirror improvements

diff --cc src/pybind/mgr/dashboard/controllers/rbd.py
index 8a3bc2defd9d8ed2240fc1ec163cbf2199f25e91,dae419c1c0cf8faf4f86ff3567027b148416782a..f3c25ca50891eb0cb82f21e0f920d2639c80ce17
--- 1/src/pybind/mgr/dashboard/controllers/rbd.py
--- 2/src/pybind/mgr/dashboard/controllers/rbd.py
+++ b/src/pybind/mgr/dashboard/controllers/rbd.py
@@@ -216,19 -217,7 +226,9 @@@ class Rbd(RESTController)
  
              RbdConfiguration(pool_ioctx=ioctx, image_name=image_name).set_configuration(
                  configuration)
 +            if metadata:
 +                RbdImageMetadataService(image).set_metadata(metadata)
  
-             mirror_image_info = image.mirror_image_get_info()
-             if enable_mirror and mirror_image_info['state'] == rbd.RBD_MIRROR_IMAGE_DISABLED:
-                 RbdMirroringService.enable_image(
-                     image_name, pool_name, namespace,
-                     MIRROR_IMAGE_MODE[mirror_mode])
-             elif (enable_mirror is False
-                   and mirror_image_info['state'] == rbd.RBD_MIRROR_IMAGE_ENABLED):
-                 RbdMirroringService.disable_image(
-                     image_name, pool_name, namespace)
- 
              if primary and not mirror_image_info['primary']:
                  RbdMirroringService.promote_image(
                      image_name, pool_name, namespace)

diff --cc src/pybind/mgr/dashboard/services/rbd.py
Simple merge