Merge pull request #6129 from dillaman/wip-13292

RBD pool mirroring configuration API + CLI Reviewed-by: Josh Durgin <jdurgin@redhat.com>
ceph · Dec 4, 2015 · 77131e0 · 77131e0
2 parents 15a81bb + ba449e3
commit 77131e0
Show file tree

Hide file tree

Showing 28 changed files with 1,602 additions and 61 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -942,6 +942,7 @@ if(${WITH_RBD})
     tools/rbd/action/List.cc
     tools/rbd/action/Lock.cc
     tools/rbd/action/MergeDiff.cc
+    tools/rbd/action/MirrorPool.cc
     tools/rbd/action/ObjectMap.cc
     tools/rbd/action/Remove.cc
     tools/rbd/action/Rename.cc

diff --git a/src/cls/CMakeLists.txt b/src/cls/CMakeLists.txt
@@ -7,11 +7,11 @@ install(TARGETS cls_hello DESTINATION lib/rados-classes)
 
 # cls_rbd
 if (WITH_RBD)
-  add_library(cls_rbd SHARED rbd/cls_rbd.cc)
+  add_library(cls_rbd SHARED rbd/cls_rbd.cc rbd/cls_rbd_types.cc)
   set_target_properties(cls_rbd PROPERTIES VERSION "1.0.0" SOVERSION "1")
   install(TARGETS cls_rbd DESTINATION lib/rados-classes)
 
-  add_library(cls_rbd_client rbd/cls_rbd_client.cc)
+  add_library(cls_rbd_client rbd/cls_rbd_client.cc rbd/cls_rbd_types.cc)
 endif (WITH_RBD)
 
 # cls_lock

diff --git a/src/cls/Makefile-client.am b/src/cls/Makefile-client.am
@@ -41,8 +41,11 @@ libcls_rgw_client_la_SOURCES = \
 noinst_LTLIBRARIES += libcls_rgw_client.la
 DENCODER_DEPS += libcls_rgw_client.la
 
-libcls_rbd_client_la_SOURCES = cls/rbd/cls_rbd_client.cc
+libcls_rbd_client_la_SOURCES = \
+	cls/rbd/cls_rbd_client.cc \
+	cls/rbd/cls_rbd_types.cc
 noinst_LTLIBRARIES += libcls_rbd_client.la
+DENCODER_DEPS += libcls_rbd_client.la
 
 libcls_user_client_a_SOURCES = cls/user/cls_user_client.cc \
 	cls/user/cls_user_types.cc \
@@ -71,6 +74,7 @@ noinst_HEADERS += \
 	cls/numops/cls_numops_client.h \
 	cls/rbd/cls_rbd.h \
 	cls/rbd/cls_rbd_client.h \
+	cls/rbd/cls_rbd_types.h \
 	cls/refcount/cls_refcount_ops.h \
 	cls/refcount/cls_refcount_client.h \
 	cls/version/cls_version_types.h \

diff --git a/src/cls/Makefile-server.am b/src/cls/Makefile-server.am
@@ -10,7 +10,9 @@ libcls_numops_la_SOURCES = cls/numops/cls_numops.cc
 libcls_numops_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
 radoslib_LTLIBRARIES += libcls_numops.la
 
-libcls_rbd_la_SOURCES = cls/rbd/cls_rbd.cc
+libcls_rbd_la_SOURCES = \
+	cls/rbd/cls_rbd.cc \
+	cls/rbd/cls_rbd_types.cc
 libcls_rbd_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
 libcls_rbd_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -export-symbols-regex '.*__cls_.*'
 radoslib_LTLIBRARIES += libcls_rbd.la