Merge pull request #6896 from liewegas/wip-bluestore

bluestore: latest and greatest
ceph · Jan 3, 2016 · fbd056b · fbd056b
2 parents 2694e11 + 4502446
commit fbd056b
Show file tree

Hide file tree

Showing 127 changed files with 16,280 additions and 3,893 deletions.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -789,6 +789,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ceph-mon
 %{_bindir}/ceph-mds
 %{_bindir}/ceph-objectstore-tool
+%{_bindir}/ceph-bluefs-tool
 %{_bindir}/ceph-osd
 %{_bindir}/ceph-detect-init
 %{_bindir}/librados-config
@@ -1203,7 +1204,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %{_bindir}/ceph_smalliobenchdumb
 %{_bindir}/ceph_smalliobenchfs
 %{_bindir}/ceph_smalliobenchrbd
-%{_bindir}/ceph_streamtest
 %{_bindir}/ceph_test_*
 %{_bindir}/ceph_tpbench
 %{_bindir}/ceph_xattr_bench

diff --git a/debian/ceph-test.install b/debian/ceph-test.install
@@ -19,7 +19,6 @@ usr/bin/ceph_smalliobench
 usr/bin/ceph_smalliobenchdumb
 usr/bin/ceph_smalliobenchfs
 usr/bin/ceph_smalliobenchrbd
-usr/bin/ceph_streamtest
 usr/bin/ceph_test_*
 usr/bin/ceph_tpbench
 usr/bin/ceph_xattr_bench

diff --git a/debian/ceph.install b/debian/ceph.install
@@ -8,6 +8,7 @@ usr/bin/ceph-clsinfo
 usr/bin/ceph-debugpack
 usr/bin/ceph-mon
 usr/bin/ceph-objectstore-tool
+usr/bin/ceph-bluefs-tool
 usr/bin/ceph-osd
 usr/bin/ceph-run
 usr/bin/ceph-rest-api

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
@@ -1043,6 +1043,7 @@ function test_mon_osd()
     ceph osd set $f
     ceph osd unset $f
   done
+  ceph osd set sortbitwise  # new backends can't handle nibblewise
   expect_false ceph osd set bogus
   expect_false ceph osd unset bogus
 

diff --git a/qa/workunits/rados/test_rados_tool.sh b/qa/workunits/rados/test_rados_tool.sh
@@ -277,15 +277,15 @@ test_omap() {
 	else
             echo -n "$i" | $RADOS_TOOL -p $POOL setomapval $OBJ $i
 	fi
-        $RADOS_TOOL -p $POOL getomapval $OBJ $i | grep -q "\\: $i\$"
+        $RADOS_TOOL -p $POOL getomapval $OBJ $i | grep -q "|$i|\$"
     done
     $RADOS_TOOL -p $POOL listomapvals $OBJ | grep -c value | grep 600
     cleanup
 }
 
 test_xattr() {
     cleanup
-    $RADOS_TOOL -p $POOL put $OBJ /etc/pass
+    $RADOS_TOOL -p $POOL put $OBJ /etc/passwd
     V1=`mktemp fooattrXXXXXXX`
     V2=`mktemp fooattrXXXXXXX`
     echo -n fooval > $V1

diff --git a/src/.gitignore b/src/.gitignore
@@ -44,7 +44,6 @@ Makefile
 /ceph_rgw_multiparser
 /ceph_scratchtool
 /ceph_scratchtoolpp
-/ceph_streamtest
 /ceph_test_*
 /ceph_tpbench
 /ceph_xattr_bench
@@ -58,6 +57,7 @@ Makefile
 /ceph-monstore-tool
 /ceph-osdomap-tool
 /ceph-kvstore-tool
+/ceph-bluefs-tool
 /ceph_ver.h
 /dev
 /get_command_descriptions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -573,32 +573,32 @@ install(TARGETS ceph-mon DESTINATION bin)
 # OSD
 if(${HAVE_XFS})
   set(libos_xfs_srcs
-    os/XfsFileStoreBackend.cc
+    os/filestore/XfsFileStoreBackend.cc
     os/fs/XFS.cc)
 endif(${HAVE_XFS})
 set(libkv_srcs
   kv/LevelDBStore.cc
   kv/KeyValueDB.cc)
 set(libos_srcs
-  os/FileJournal.cc
-  os/FileStore.cc
-  os/chain_xattr.cc
   os/ObjectStore.cc
-  os/JournalingObjectStore.cc
-  os/LFNIndex.cc
-  os/IndexManager.cc
-  os/DBObjectMap.cc 
   os/Transaction.cc
-  os/WBThrottle.cc
-  os/GenericFileStoreBackend.cc
-  os/BtrfsFileStoreBackend.cc
-  os/ZFSFileStoreBackend.cc
-  os/KeyValueStore.cc
-  os/MemStore.cc
-  os/GenericObjectMap.cc
-  os/HashIndex.cc
-  os/newstore/NewStore.cc
-  os/newstore/newstore_types.cc
+  os/filestore/chain_xattr.cc
+  os/filestore/BtrfsFileStoreBackend.cc
+  os/filestore/DBObjectMap.cc
+  os/filestore/FileJournal.cc
+  os/filestore/FileStore.cc
+  os/filestore/GenericFileStoreBackend.cc
+  os/filestore/JournalingObjectStore.cc
+  os/filestore/HashIndex.cc
+  os/filestore/IndexManager.cc
+  os/filestore/LFNIndex.cc
+  os/filestore/WBThrottle.cc
+  os/filestore/ZFSFileStoreBackend.cc
+  os/keyvaluestore/GenericObjectMap.cc
+  os/keyvaluestore/KeyValueStore.cc
+  os/memstore/MemStore.cc
+  os/bluestore/BlueStore.cc
+  os/bluestore/bluestore_types.cc
   os/fs/FS.cc
   ${libkv_srcs}
   ${libos_xfs_srcs})