From: Gregory Farnum <greg@gregs42.com>
Date: Thu, 10 Mar 2016 06:22:42 +0000 (-0800)
Subject: Merge pull request #7003 from jcsp/wip-cephfs-tmap-migrate
X-Git-Tag: v10.1.0~179
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9ae848687567770ce2867bbe7e29ac7ecb14c21e;p=ceph.git

Merge pull request #7003 from jcsp/wip-cephfs-tmap-migrate

tools/cephfs: add tmap_upgrade

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

9ae848687567770ce2867bbe7e29ac7ecb14c21e
diff --cc src/test/CMakeLists.txt
index 895437cc88065,16f925d329ecc..1cf72ab0c1fcb
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@@ -1898,10 -2075,22 +1898,21 @@@ add_executable(test_rados_api_mis
  set_target_properties(test_rados_api_misc PROPERTIES COMPILE_FLAGS
    ${UNITTEST_CXX_FLAGS})
  target_link_libraries(test_rados_api_misc
 -  librados global ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
 +  librados global ${UNITTEST_LIBS} radostest)
  
+ add_executable(test_rados_api_tmap_migrate
+   ../tools/cephfs/DataScan.cc
+   ../tools/cephfs/MDSUtility.cc
+   librados/tmap_migrate.cc
+   $<TARGET_OBJECTS:heap_profiler_objs>
+   )
+ set_target_properties(test_rados_api_tmap_migrate PROPERTIES COMPILE_FLAGS
+   ${UNITTEST_CXX_FLAGS})
+ target_link_libraries(test_rados_api_tmap_migrate
+   librados mds osdc global cls_cephfs_client ${UNITTEST_LIBS} ${ALLOC_LIBS} radostest)
+ 
  add_executable(test_rados_api_lock
    librados/lock.cc
 -  $<TARGET_OBJECTS:heap_profiler_objs>
    )
  set_target_properties(test_rados_api_lock PROPERTIES COMPILE_FLAGS
    ${UNITTEST_CXX_FLAGS})