[Pkg-ceph-commits] [ceph] 03/03: Resync with Ubuntu, introducing Ceph Hammer stable release.
James Downing Page
jamespage at moszumanska.debian.org
Mon Jun 15 08:03:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch experimental
in repository ceph.
commit 866ee83aaa5c1a52b630e4785eed3627ee9870d9
Merge: 636f290 08581ca
Author: James Page <james.page at ubuntu.com>
Date: Tue Jun 9 17:49:38 2015 +0100
Resync with Ubuntu, introducing Ceph Hammer stable release.
AUTHORS | 118 +-
COPYING | 2 +-
ChangeLog | 2794 ++-
Makefile.am | 24 +-
Makefile.in | 33 +-
README | 8 +-
aclocal.m4 | 1 +
autogen.sh | 4 +-
ceph.spec | 326 +-
ceph.spec.in | 324 +-
configure | 1552 +-
configure.ac | 301 +-
debian/ceph-common.install | 4 +
debian/ceph-mds.install | 3 +-
debian/ceph-test.install | 5 +-
debian/ceph.install | 16 +-
debian/changelog | 6 +
debian/control | 213 +-
debian/lib-systemd/system/ceph-create-keys.service | 9 +
debian/lib-systemd/system/ceph-mon.service | 6 +-
debian/lib-systemd/system/ceph-osd at .service | 9 +-
debian/libcephfs1.symbols | 21 +-
debian/librados2.symbols | 156 +-
debian/libradosstriper-dev.install | 2 +-
debian/libradosstriper1.symbols | 138 +
debian/librbd1.install | 4 -
debian/librbd1.symbols | 11 +-
debian/patches/0latest-giant.patch | 955 -
debian/patches/arch.patch | 20 +-
debian/patches/bug-10059.patch | 28 -
debian/patches/bug-9814.patch | 141 -
debian/patches/ceph-osd-prestart-path.patch | 11 +
debian/patches/fix-argparse-defaults.patch | 26 +
debian/patches/fix-cycles-arch.patch | 38 +
debian/patches/modules.patch | 30 +-
debian/patches/sample.ceph.conf.patch | 66 +-
debian/patches/series | 9 +-
debian/patches/sleep-recover.patch | 4 +-
debian/patches/tests-disable.patch | 48 +-
debian/patches/use_system_gtest.patch | 79 -
debian/patches/use_system_jerasure.patch | 39 +-
debian/patches/vivid-does-systemd.patch | 18 +
debian/python-ceph.install | 1 -
debian/python-cephfs.install | 1 +
debian/python-rados.install | 1 +
debian/python-rbd.install | 1 +
install-deps.sh | 67 +
m4/ax_arm.m4 | 27 +
man/Makefile-client.am | 39 +
man/Makefile-server.am | 26 +
man/Makefile.am | 38 +-
man/Makefile.in | 101 +-
man/ceph-authtool.8 | 6 +-
man/ceph-clsinfo.8 | 2 +-
man/ceph-conf.8 | 2 +-
man/ceph-debugpack.8 | 2 +-
man/ceph-dencoder.8 | 2 +-
man/ceph-deploy.8 | 841 +
man/ceph-disk.8 | 400 +
man/ceph-fuse.8 | 2 +-
man/ceph-mds.8 | 2 +-
man/ceph-mon.8 | 2 +-
man/ceph-osd.8 | 2 +-
man/ceph-post-file.8 | 2 +-
man/ceph-rbdnamer.8 | 2 +-
man/ceph-rest-api.8 | 2 +-
man/ceph-run.8 | 2 +-
man/ceph-syn.8 | 2 +-
man/ceph.8 | 2728 ++-
man/cephfs.8 | 4 +-
man/crushtool.8 | 2 +-
man/librados-config.8 | 2 +-
man/monmaptool.8 | 2 +-
man/mount.ceph.8 | 2 +-
man/osdmaptool.8 | 2 +-
man/rados.8 | 2 +-
man/radosgw-admin.8 | 2 +-
man/radosgw.8 | 2 +-
man/rbd-fuse.8 | 2 +-
man/rbd-replay-many.8 | 134 +
man/rbd-replay-prep.8 | 11 +-
man/rbd-replay.8 | 15 +-
man/rbd.8 | 61 +-
src/.git_version | 4 +-
src/Makefile-client.am | 111 +
src/Makefile-env.am | 11 +-
src/Makefile-rocksdb.am | 372 +
src/Makefile-server.am | 69 +
src/Makefile.am | 545 +-
src/Makefile.in | 13287 +++++++-----
src/acconfig.h.in | 33 +
src/arch/Makefile.am | 4 +-
src/arch/arm.c | 56 +
src/arch/arm.h | 16 +
src/arch/neon.c | 51 -
src/arch/neon.h | 16 -
src/arch/probe.cc | 4 +-
src/auth/AuthSessionHandler.h | 5 +-
src/auth/KeyRing.cc | 2 +
src/auth/cephx/CephxKeyServer.cc | 4 +
src/auth/none/AuthNoneServiceHandler.h | 1 -
src/brag/Makefile.am | 3 +-
src/ceph-create-keys | 4 +
src/ceph-debugpack.in | 2 +-
src/ceph-disk | 472 +-
src/ceph-disk-udev | 15 +
src/ceph.in | 62 +-
src/ceph_fuse.cc | 74 +-
src/ceph_mds.cc | 54 +-
src/ceph_mon.cc | 111 +-
src/ceph_osd.cc | 87 +-
src/ceph_syn.cc | 7 +-
src/civetweb/include/civetweb_conf.h | 6 +
src/client/Client.cc | 2074 +-
src/client/Client.h | 143 +-
src/client/Dentry.h | 12 +-
src/client/Dir.h | 6 +-
src/client/Fh.h | 13 +-
src/client/Inode.cc | 15 +-
src/client/Inode.h | 102 +-
src/client/Makefile.am | 2 +
src/client/MetaRequest.h | 21 +-
src/client/MetaSession.cc | 20 +
src/client/MetaSession.h | 10 +-
src/client/ObjecterWriteback.h | 8 +-
src/client/SyntheticClient.cc | 46 +-
src/client/fuse_ll.cc | 145 +-
src/cls/Makefile-client.am | 76 +
src/cls/Makefile-server.am | 60 +
src/cls/Makefile.am | 141 +-
src/cls/lock/cls_lock.cc | 76 +
src/cls/lock/cls_lock_client.cc | 24 +
src/cls/lock/cls_lock_client.h | 9 +-
src/cls/lock/cls_lock_ops.cc | 18 +
src/cls/lock/cls_lock_ops.h | 33 +
src/cls/log/cls_log_ops.h | 2 +-
src/cls/rbd/cls_rbd.cc | 367 +-
src/cls/rbd/cls_rbd.h | 14 +-
src/cls/rbd/cls_rbd_client.cc | 153 +-
src/cls/rbd/cls_rbd_client.h | 26 +-
src/cls/refcount/cls_refcount.cc | 2 +-
src/cls/rgw/cls_rgw.cc | 1850 +-
src/cls/rgw/cls_rgw_client.cc | 474 +-
src/cls/rgw/cls_rgw_client.h | 446 +-
src/cls/rgw/cls_rgw_ops.cc | 166 +-
src/cls/rgw/cls_rgw_ops.h | 409 +-
src/cls/rgw/cls_rgw_types.cc | 278 +-
src/cls/rgw/cls_rgw_types.h | 278 +-
src/cls/statelog/cls_statelog_ops.h | 4 +-
src/cls/statelog/cls_statelog_types.h | 2 +-
src/common/Clock.cc | 6 +
src/common/ContextCompletion.cc | 49 +
src/common/ContextCompletion.h | 47 +
src/common/Continuation.h | 175 +
src/common/Cycles.cc | 221 +
src/common/Cycles.h | 104 +
src/common/Finisher.h | 16 +-
src/common/Formatter.cc | 463 +-
src/common/Formatter.h | 318 +-
src/common/Initialize.h | 96 +
src/common/LogClient.cc | 70 +
src/common/LogClient.h | 18 +-
src/common/LogEntry.cc | 22 +
src/common/LogEntry.h | 14 +-
src/common/Makefile.am | 53 +-
src/common/Mutex.h | 2 +-
src/common/QueueRing.h | 61 +
src/common/RWLock.h | 4 +-
src/common/Readahead.cc | 161 +
src/common/Readahead.h | 153 +
src/common/TextTable.h | 1 -
src/common/Thread.cc | 2 +-
src/common/Thread.h | 2 +-
src/common/Timer.cc | 187 -
src/common/Timer.h | 71 -
src/common/TrackedOp.h | 6 +-
src/common/WorkQueue.cc | 28 +-
src/common/address_helper.cc | 99 +
src/common/address_helper.h | 24 +
src/common/admin_socket.cc | 4 +-
src/common/bit_vector.hpp | 423 +
src/common/blkdev.cc | 157 +
src/common/blkdev.h | 8 +-
src/common/bloom_filter.cc | 2 +-
src/common/buffer.cc | 168 +-
src/common/ceph_context.cc | 105 +-
src/common/ceph_context.h | 33 +
src/common/ceph_json.h | 25 +
src/common/ceph_strings.cc | 121 +-
src/common/cmdparse.h | 4 +-
src/common/config.cc | 4 +-
src/common/config_opts.h | 140 +-
src/common/crc32c_intel_fast_asm.S | 2 +
src/common/crc32c_intel_fast_zero_asm.S | 2 +
src/common/debug.h | 2 +
src/common/dout.h | 3 +
src/common/escape.c | 21 +-
src/common/escape.h | 4 +-
src/common/histogram.h | 4 +
src/common/hobject.cc | 9 +-
src/common/hobject.h | 63 +-
src/common/lockdep.cc | 6 +-
src/common/map_cacher.hpp | 2 +-
src/common/obj_bencher.cc | 24 +
src/common/obj_bencher.h | 1 +
src/common/perf_counters.cc | 90 +-
src/common/perf_counters.h | 21 +-
src/common/safe_io.c | 3 +-
src/common/shared_cache.hpp | 97 +-
src/common/str_map.cc | 29 +
src/common/sync_filesystem.h | 11 +-
src/crush/CrushCompiler.cc | 11 +
src/crush/CrushTester.cc | 101 +-
src/crush/CrushTester.h | 11 +
src/crush/CrushTreeDumper.h | 179 +
src/crush/CrushWrapper.cc | 371 +-
src/crush/CrushWrapper.h | 154 +-
src/crush/Makefile.am | 2 +
src/crush/builder.c | 423 +-
src/crush/builder.h | 11 +-
src/crush/crush.c | 17 +
src/crush/crush.h | 42 +-
src/crush/crush_ln_table.h | 170 +
src/crush/grammar.h | 5 +-
src/crush/mapper.c | 117 +
src/erasure-code/ErasureCode.cc | 11 +-
src/erasure-code/ErasureCodePlugin.cc | 3 +-
src/erasure-code/Makefile.am | 1 +
src/erasure-code/isa/ErasureCodeIsa.cc | 15 +-
src/erasure-code/isa/ErasureCodeIsa.h | 3 +
.../isa/isa-l/erasure_code/ec_multibinary.asm.s | 2 +
.../isa-l/erasure_code/gf_2vect_dot_prod_avx.asm.s | 2 +
.../erasure_code/gf_2vect_dot_prod_avx2.asm.s | 2 +
.../isa-l/erasure_code/gf_2vect_dot_prod_sse.asm.s | 2 +
.../isa-l/erasure_code/gf_3vect_dot_prod_avx.asm.s | 2 +
.../erasure_code/gf_3vect_dot_prod_avx2.asm.s | 2 +
.../isa-l/erasure_code/gf_3vect_dot_prod_sse.asm.s | 2 +
.../isa-l/erasure_code/gf_4vect_dot_prod_avx.asm.s | 2 +
.../erasure_code/gf_4vect_dot_prod_avx2.asm.s | 2 +
.../isa-l/erasure_code/gf_4vect_dot_prod_sse.asm.s | 2 +
.../isa-l/erasure_code/gf_5vect_dot_prod_avx.asm.s | 2 +
.../erasure_code/gf_5vect_dot_prod_avx2.asm.s | 2 +
.../isa-l/erasure_code/gf_5vect_dot_prod_sse.asm.s | 2 +
.../isa-l/erasure_code/gf_6vect_dot_prod_avx.asm.s | 2 +
.../erasure_code/gf_6vect_dot_prod_avx2.asm.s | 2 +
.../isa-l/erasure_code/gf_6vect_dot_prod_sse.asm.s | 2 +
.../isa-l/erasure_code/gf_vect_dot_prod_avx.asm.s | 2 +
.../isa-l/erasure_code/gf_vect_dot_prod_avx2.asm.s | 2 +
.../isa-l/erasure_code/gf_vect_dot_prod_sse.asm.s | 2 +
.../isa/isa-l/erasure_code/gf_vect_mul_avx.asm.s | 2 +
.../isa/isa-l/erasure_code/gf_vect_mul_sse.asm.s | 2 +
src/erasure-code/isa/xor_op.h | 4 +-
src/erasure-code/jerasure/ErasureCodeJerasure.cc | 15 +-
src/erasure-code/jerasure/ErasureCodeJerasure.h | 3 +
.../jerasure/ErasureCodePluginSelectJerasure.cc | 3 +
src/erasure-code/jerasure/Makefile.am | 43 +-
.../jerasure/gf-complete/include/gf_complete.h | 28 +-
.../jerasure/gf-complete/include/gf_int.h | 14 +-
.../jerasure/gf-complete/include/gf_w16.h | 66 +
.../jerasure/gf-complete/include/gf_w32.h | 71 +
.../jerasure/gf-complete/include/gf_w4.h | 63 +
.../jerasure/gf-complete/include/gf_w64.h | 50 +
.../jerasure/gf-complete/include/gf_w8.h | 99 +
src/erasure-code/jerasure/gf-complete/src/gf.c | 186 +-
.../jerasure/gf-complete/src/gf_general.c | 11 +-
.../jerasure/gf-complete/src/gf_method.c | 14 +-
.../jerasure/gf-complete/src/gf_w128.c | 51 +-
src/erasure-code/jerasure/gf-complete/src/gf_w16.c | 80 +-
src/erasure-code/jerasure/gf-complete/src/gf_w32.c | 238 +-
src/erasure-code/jerasure/gf-complete/src/gf_w4.c | 84 +-
src/erasure-code/jerasure/gf-complete/src/gf_w64.c | 74 +-
src/erasure-code/jerasure/gf-complete/src/gf_w8.c | 136 +-
.../jerasure/gf-complete/src/gf_wgen.c | 4 +-
.../jerasure/gf-complete/src/neon/gf_w16_neon.c | 356 +
.../jerasure/gf-complete/src/neon/gf_w32_neon.c | 269 +
.../jerasure/gf-complete/src/neon/gf_w4_neon.c | 247 +
.../jerasure/gf-complete/src/neon/gf_w64_neon.c | 333 +
.../jerasure/gf-complete/src/neon/gf_w8_neon.c | 302 +
src/erasure-code/jerasure/jerasure/src/galois.c | 31 +-
src/erasure-code/jerasure/jerasure/src/jerasure.c | 13 +-
src/erasure-code/jerasure/jerasure/src/reed_sol.c | 9 +-
src/erasure-code/lrc/ErasureCodeLrc.cc | 15 +-
src/erasure-code/lrc/ErasureCodeLrc.h | 7 -
src/erasure-code/shec/ErasureCodePluginShec.cc | 93 +
src/erasure-code/shec/ErasureCodeShec.cc | 404 +
src/erasure-code/shec/ErasureCodeShec.h | 143 +
src/erasure-code/shec/ErasureCodeShecTableCache.cc | 97 +
src/erasure-code/shec/ErasureCodeShecTableCache.h | 66 +
src/erasure-code/shec/Makefile.am | 61 +
src/erasure-code/shec/determinant.c | 94 +
src/erasure-code/shec/shec.cc | 329 +
src/erasure-code/shec/shec.h | 35 +
src/gmock/CHANGES | 126 +
src/gmock/CMakeLists.txt | 171 +
src/gmock/CONTRIBUTORS | 40 +
src/{gtest/COPYING => gmock/LICENSE} | 0
src/gmock/Makefile.am | 216 +
src/gmock/Makefile.in | 1335 ++
src/gmock/README | 369 +
src/gmock/aclocal.m4 | 9799 +++++++++
src/{gtest => gmock}/build-aux/config.guess | 0
src/{gtest => gmock}/build-aux/config.h.in | 0
src/{gtest => gmock}/build-aux/config.sub | 0
src/{gtest => gmock}/build-aux/depcomp | 0
src/{gtest => gmock}/build-aux/install-sh | 0
src/{gtest => gmock}/build-aux/ltmain.sh | 0
src/{gtest => gmock}/build-aux/missing | 0
src/gmock/configure | 18535 +++++++++++++++++
src/gmock/configure.ac | 146 +
src/gmock/fused-src/gmock-gtest-all.cc | 11443 +++++++++++
src/gmock/fused-src/gmock/gmock.h | 14198 +++++++++++++
src/gmock/fused-src/gmock_main.cc | 54 +
src/gmock/fused-src/gtest/gtest.h | 20061 +++++++++++++++++++
src/gmock/gtest/CHANGES | 157 +
src/gmock/gtest/CMakeLists.txt | 252 +
src/gmock/gtest/CONTRIBUTORS | 37 +
src/{gtest/COPYING => gmock/gtest/LICENSE} | 0
src/gmock/gtest/Makefile.am | 306 +
src/gmock/gtest/Makefile.in | 1327 ++
src/gmock/gtest/README | 435 +
src/{ => gmock}/gtest/aclocal.m4 | 0
src/{ => gmock}/gtest/build-aux/config.guess | 0
src/{ => gmock}/gtest/build-aux/config.h.in | 0
src/{ => gmock}/gtest/build-aux/config.sub | 0
src/{ => gmock}/gtest/build-aux/depcomp | 0
src/{ => gmock}/gtest/build-aux/install-sh | 0
src/{ => gmock}/gtest/build-aux/ltmain.sh | 0
src/{ => gmock}/gtest/build-aux/missing | 0
src/gmock/gtest/cmake/internal_utils.cmake | 227 +
src/{ => gmock}/gtest/codegear/gtest.cbproj | 0
src/{ => gmock}/gtest/codegear/gtest.groupproj | 0
src/{ => gmock}/gtest/codegear/gtest_all.cc | 0
src/{ => gmock}/gtest/codegear/gtest_link.cc | 0
src/{ => gmock}/gtest/codegear/gtest_main.cbproj | 0
.../gtest/codegear/gtest_unittest.cbproj | 0
src/gmock/gtest/configure | 18222 +++++++++++++++++
src/gmock/gtest/configure.ac | 68 +
src/gmock/gtest/fused-src/gtest/gtest-all.cc | 9592 +++++++++
src/gmock/gtest/fused-src/gtest/gtest.h | 20061 +++++++++++++++++++
src/gmock/gtest/fused-src/gtest/gtest_main.cc | 38 +
src/gmock/gtest/include/gtest/gtest-death-test.h | 294 +
src/gmock/gtest/include/gtest/gtest-message.h | 250 +
src/gmock/gtest/include/gtest/gtest-param-test.h | 1421 ++
.../gtest/include/gtest/gtest-param-test.h.pump | 487 +
src/gmock/gtest/include/gtest/gtest-printers.h | 855 +
src/gmock/gtest/include/gtest/gtest-spi.h | 232 +
src/gmock/gtest/include/gtest/gtest-test-part.h | 179 +
src/gmock/gtest/include/gtest/gtest-typed-test.h | 259 +
src/gmock/gtest/include/gtest/gtest.h | 2291 +++
src/gmock/gtest/include/gtest/gtest_pred_impl.h | 358 +
src/{ => gmock}/gtest/include/gtest/gtest_prod.h | 0
.../gtest/internal/gtest-death-test-internal.h | 319 +
.../gtest/include/gtest/internal/gtest-filepath.h | 206 +
.../gtest/include/gtest/internal/gtest-internal.h | 1158 ++
.../include/gtest/internal/gtest-linked_ptr.h | 233 +
.../gtest/internal/gtest-param-util-generated.h | 5143 +++++
.../internal/gtest-param-util-generated.h.pump | 301 +
.../include/gtest/internal/gtest-param-util.h | 619 +
.../gtest/include/gtest/internal/gtest-port.h | 1947 ++
.../gtest/include/gtest/internal/gtest-string.h | 167 +
.../gtest/include/gtest/internal/gtest-tuple.h | 1012 +
.../include/gtest/internal/gtest-tuple.h.pump | 339 +
.../gtest/include/gtest/internal/gtest-type-util.h | 3331 +++
.../include/gtest/internal/gtest-type-util.h.pump | 297 +
src/{ => gmock}/gtest/m4/acx_pthread.m4 | 0
src/{ => gmock}/gtest/m4/gtest.m4 | 0
src/{ => gmock}/gtest/m4/libtool.m4 | 0
src/{ => gmock}/gtest/m4/ltoptions.m4 | 0
src/{ => gmock}/gtest/m4/ltsugar.m4 | 0
src/{ => gmock}/gtest/m4/ltversion.m4 | 0
src/{ => gmock}/gtest/m4/lt~obsolete.m4 | 0
src/gmock/gtest/make/Makefile | 82 +
src/{ => gmock}/gtest/msvc/gtest-md.sln | 0
src/gmock/gtest/msvc/gtest-md.vcproj | 126 +
src/{ => gmock}/gtest/msvc/gtest.sln | 0
src/gmock/gtest/msvc/gtest.vcproj | 126 +
src/gmock/gtest/msvc/gtest_main-md.vcproj | 129 +
src/gmock/gtest/msvc/gtest_main.vcproj | 129 +
.../gtest/msvc/gtest_prod_test-md.vcproj | 0
src/{ => gmock}/gtest/msvc/gtest_prod_test.vcproj | 0
.../gtest/msvc/gtest_unittest-md.vcproj | 0
src/{ => gmock}/gtest/msvc/gtest_unittest.vcproj | 0
src/{ => gmock}/gtest/samples/prime_tables.h | 0
src/{ => gmock}/gtest/samples/sample1.cc | 0
src/{ => gmock}/gtest/samples/sample1.h | 0
src/gmock/gtest/samples/sample10_unittest.cc | 144 +
src/gmock/gtest/samples/sample1_unittest.cc | 153 +
src/{ => gmock}/gtest/samples/sample2.cc | 0
src/gmock/gtest/samples/sample2.h | 85 +
src/gmock/gtest/samples/sample2_unittest.cc | 109 +
src/gmock/gtest/samples/sample3-inl.h | 172 +
src/gmock/gtest/samples/sample3_unittest.cc | 151 +
src/{ => gmock}/gtest/samples/sample4.cc | 0
src/{ => gmock}/gtest/samples/sample4.h | 0
src/gmock/gtest/samples/sample4_unittest.cc | 45 +
src/gmock/gtest/samples/sample5_unittest.cc | 199 +
src/gmock/gtest/samples/sample6_unittest.cc | 224 +
src/gmock/gtest/samples/sample7_unittest.cc | 130 +
src/gmock/gtest/samples/sample8_unittest.cc | 173 +
src/gmock/gtest/samples/sample9_unittest.cc | 160 +
src/gmock/gtest/scripts/fuse_gtest_files.py | 250 +
src/gmock/gtest/scripts/gen_gtest_pred_impl.py | 730 +
src/gmock/gtest/scripts/gtest-config.in | 274 +
src/gmock/gtest/scripts/pump.py | 855 +
src/gmock/gtest/scripts/test/Makefile | 59 +
src/gmock/gtest/src/gtest-all.cc | 48 +
src/gmock/gtest/src/gtest-death-test.cc | 1344 ++
src/gmock/gtest/src/gtest-filepath.cc | 382 +
src/gmock/gtest/src/gtest-internal-inl.h | 1218 ++
src/gmock/gtest/src/gtest-port.cc | 805 +
src/gmock/gtest/src/gtest-printers.cc | 363 +
src/gmock/gtest/src/gtest-test-part.cc | 110 +
src/gmock/gtest/src/gtest-typed-test.cc | 110 +
src/gmock/gtest/src/gtest.cc | 5015 +++++
src/gmock/gtest/src/gtest_main.cc | 38 +
src/gmock/gtest/test/gtest-death-test_ex_test.cc | 93 +
src/gmock/gtest/test/gtest-death-test_test.cc | 1367 ++
src/gmock/gtest/test/gtest-filepath_test.cc | 680 +
src/gmock/gtest/test/gtest-linked_ptr_test.cc | 154 +
src/gmock/gtest/test/gtest-listener_test.cc | 310 +
src/gmock/gtest/test/gtest-message_test.cc | 159 +
src/gmock/gtest/test/gtest-options_test.cc | 215 +
src/gmock/gtest/test/gtest-param-test2_test.cc | 65 +
src/gmock/gtest/test/gtest-param-test_test.cc | 904 +
src/gmock/gtest/test/gtest-param-test_test.h | 57 +
src/gmock/gtest/test/gtest-port_test.cc | 1253 ++
src/gmock/gtest/test/gtest-printers_test.cc | 1566 ++
src/gmock/gtest/test/gtest-test-part_test.cc | 208 +
src/gmock/gtest/test/gtest-tuple_test.cc | 320 +
src/gmock/gtest/test/gtest-typed-test2_test.cc | 45 +
src/gmock/gtest/test/gtest-typed-test_test.cc | 360 +
src/gmock/gtest/test/gtest-typed-test_test.h | 66 +
src/gmock/gtest/test/gtest-unittest-api_test.cc | 341 +
src/gmock/gtest/test/gtest_all_test.cc | 47 +
.../gtest/test/gtest_break_on_failure_unittest.py | 212 +
.../gtest/test/gtest_break_on_failure_unittest_.cc | 88 +
.../gtest/test/gtest_catch_exceptions_test.py | 237 +
.../gtest/test/gtest_catch_exceptions_test_.cc | 311 +
src/{ => gmock}/gtest/test/gtest_color_test.py | 0
src/gmock/gtest/test/gtest_color_test_.cc | 71 +
src/gmock/gtest/test/gtest_env_var_test.py | 103 +
src/gmock/gtest/test/gtest_env_var_test_.cc | 126 +
src/gmock/gtest/test/gtest_environment_test.cc | 192 +
.../gtest/test/gtest_filter_unittest.py | 0
src/gmock/gtest/test/gtest_filter_unittest_.cc | 140 +
src/gmock/gtest/test/gtest_help_test.py | 172 +
src/gmock/gtest/test/gtest_help_test_.cc | 46 +
src/gmock/gtest/test/gtest_list_tests_unittest.py | 207 +
src/gmock/gtest/test/gtest_list_tests_unittest_.cc | 157 +
src/gmock/gtest/test/gtest_main_unittest.cc | 45 +
src/gmock/gtest/test/gtest_no_test_unittest.cc | 56 +
src/gmock/gtest/test/gtest_output_test.py | 335 +
src/gmock/gtest/test/gtest_output_test_.cc | 1034 +
.../gtest/test/gtest_output_test_golden_lin.txt | 720 +
src/gmock/gtest/test/gtest_pred_impl_unittest.cc | 2427 +++
src/gmock/gtest/test/gtest_premature_exit_test.cc | 141 +
src/gmock/gtest/test/gtest_prod_test.cc | 57 +
src/gmock/gtest/test/gtest_repeat_test.cc | 253 +
src/{ => gmock}/gtest/test/gtest_shuffle_test.py | 0
src/gmock/gtest/test/gtest_shuffle_test_.cc | 103 +
src/gmock/gtest/test/gtest_sole_header_test.cc | 57 +
src/gmock/gtest/test/gtest_stress_test.cc | 256 +
src/gmock/gtest/test/gtest_test_utils.py | 320 +
.../gtest/test/gtest_throw_on_failure_ex_test.cc | 92 +
.../gtest/test/gtest_throw_on_failure_test.py | 0
.../gtest/test/gtest_throw_on_failure_test_.cc | 72 +
.../gtest/test/gtest_uninitialized_test.py | 0
src/gmock/gtest/test/gtest_uninitialized_test_.cc | 43 +
src/gmock/gtest/test/gtest_unittest.cc | 7415 +++++++
src/gmock/gtest/test/gtest_xml_outfile1_test_.cc | 49 +
src/gmock/gtest/test/gtest_xml_outfile2_test_.cc | 49 +
src/gmock/gtest/test/gtest_xml_outfiles_test.py | 132 +
src/gmock/gtest/test/gtest_xml_output_unittest.py | 307 +
src/gmock/gtest/test/gtest_xml_output_unittest_.cc | 181 +
src/gmock/gtest/test/gtest_xml_test_utils.py | 194 +
src/{ => gmock}/gtest/test/production.cc | 0
src/gmock/gtest/test/production.h | 55 +
.../gtest/xcode/Config/DebugProject.xcconfig | 0
.../gtest/xcode/Config/FrameworkTarget.xcconfig | 0
.../gtest/xcode/Config/General.xcconfig | 0
.../gtest/xcode/Config/ReleaseProject.xcconfig | 0
.../xcode/Config/StaticLibraryTarget.xcconfig | 0
.../gtest/xcode/Config/TestTarget.xcconfig | 0
src/{ => gmock}/gtest/xcode/Resources/Info.plist | 0
.../gtest/xcode/Samples/FrameworkSample/Info.plist | 0
.../WidgetFramework.xcodeproj/project.pbxproj | 0
.../xcode/Samples/FrameworkSample/runtests.sh | 0
.../gtest/xcode/Samples/FrameworkSample/widget.cc | 0
.../gtest/xcode/Samples/FrameworkSample/widget.h | 0
.../xcode/Samples/FrameworkSample/widget_test.cc | 68 +
src/{ => gmock}/gtest/xcode/Scripts/runtests.sh | 0
.../gtest/xcode/Scripts/versiongenerate.py | 0
.../gtest/xcode/gtest.xcodeproj/project.pbxproj | 1135 ++
src/gmock/include/gmock/gmock-actions.h | 1078 +
src/gmock/include/gmock/gmock-cardinalities.h | 147 +
src/gmock/include/gmock/gmock-generated-actions.h | 2415 +++
.../include/gmock/gmock-generated-actions.h.pump | 821 +
.../gmock/gmock-generated-function-mockers.h | 991 +
.../gmock/gmock-generated-function-mockers.h.pump | 265 +
src/gmock/include/gmock/gmock-generated-matchers.h | 2190 ++
.../include/gmock/gmock-generated-matchers.h.pump | 674 +
.../include/gmock/gmock-generated-nice-strict.h | 397 +
.../gmock/gmock-generated-nice-strict.h.pump | 161 +
src/gmock/include/gmock/gmock-matchers.h | 3986 ++++
src/gmock/include/gmock/gmock-more-actions.h | 233 +
src/gmock/include/gmock/gmock-more-matchers.h | 58 +
src/gmock/include/gmock/gmock-spec-builders.h | 1791 ++
src/gmock/include/gmock/gmock.h | 94 +
.../internal/gmock-generated-internal-utils.h | 279 +
.../internal/gmock-generated-internal-utils.h.pump | 136 +
.../include/gmock/internal/gmock-internal-utils.h | 498 +
src/gmock/include/gmock/internal/gmock-port.h | 78 +
src/gmock/make/Makefile | 101 +
src/gmock/msvc/2005/gmock.sln | 32 +
src/gmock/msvc/2005/gmock.vcproj | 191 +
src/gmock/msvc/2005/gmock_config.vsprops | 15 +
src/gmock/msvc/2005/gmock_main.vcproj | 187 +
src/gmock/msvc/2005/gmock_test.vcproj | 201 +
src/gmock/msvc/2010/gmock.sln | 32 +
src/gmock/msvc/2010/gmock.vcxproj | 82 +
src/gmock/msvc/2010/gmock_config.props | 19 +
src/gmock/msvc/2010/gmock_main.vcxproj | 88 +
src/gmock/msvc/2010/gmock_test.vcxproj | 101 +
src/gmock/scripts/fuse_gmock_files.py | 240 +
src/gmock/scripts/generator/LICENSE | 203 +
src/gmock/scripts/generator/README | 35 +
src/gmock/scripts/generator/README.cppclean | 115 +
src/gmock/scripts/generator/cpp/__init__.py | 0
src/gmock/scripts/generator/cpp/ast.py | 1723 ++
src/gmock/scripts/generator/cpp/gmock_class.py | 226 +
src/gmock/scripts/generator/cpp/keywords.py | 59 +
src/gmock/scripts/generator/cpp/tokenize.py | 287 +
src/gmock/scripts/generator/cpp/utils.py | 41 +
src/gmock/scripts/generator/gmock_gen.py | 31 +
src/gmock/scripts/gmock-config.in | 303 +
src/gmock/src/gmock-all.cc | 47 +
src/gmock/src/gmock-cardinalities.cc | 156 +
src/gmock/src/gmock-internal-utils.cc | 174 +
src/gmock/src/gmock-matchers.cc | 498 +
src/gmock/src/gmock-spec-builders.cc | 813 +
src/gmock/src/gmock.cc | 182 +
src/gmock/src/gmock_main.cc | 54 +
src/gmock/test/gmock-actions_test.cc | 1256 ++
src/gmock/test/gmock-cardinalities_test.cc | 428 +
src/gmock/test/gmock-generated-actions_test.cc | 1225 ++
.../test/gmock-generated-function-mockers_test.cc | 588 +
.../test/gmock-generated-internal-utils_test.cc | 127 +
src/gmock/test/gmock-generated-matchers_test.cc | 1289 ++
src/gmock/test/gmock-internal-utils_test.cc | 649 +
src/gmock/test/gmock-matchers_test.cc | 5247 +++++
src/gmock/test/gmock-more-actions_test.cc | 705 +
src/gmock/test/gmock-nice-strict_test.cc | 424 +
src/gmock/test/gmock-port_test.cc | 43 +
src/gmock/test/gmock-spec-builders_test.cc | 2613 +++
src/gmock/test/gmock_all_test.cc | 48 +
src/gmock/test/gmock_ex_test.cc | 78 +
src/gmock/test/gmock_leak_test.py | 108 +
src/gmock/test/gmock_leak_test_.cc | 100 +
src/gmock/test/gmock_link2_test.cc | 40 +
src/gmock/test/gmock_link_test.cc | 40 +
src/gmock/test/gmock_link_test.h | 669 +
src/gmock/test/gmock_output_test.py | 180 +
src/gmock/test/gmock_output_test_.cc | 291 +
src/gmock/test/gmock_output_test_golden.txt | 310 +
src/gmock/test/gmock_stress_test.cc | 322 +
src/gmock/test/gmock_test.cc | 255 +
src/gmock/test/gmock_test_utils.py | 112 +
src/gtest/CHANGES | 98 -
src/gtest/CMakeLists.txt | 384 -
src/gtest/CONTRIBUTORS | 36 -
src/gtest/Makefile.am | 287 -
src/gtest/Makefile.in | 1381 --
src/gtest/README | 417 -
src/gtest/configure | 18222 -----------------
src/gtest/configure.ac | 68 -
src/gtest/fused-src/gtest/gtest-all.cc | 8510 --------
src/gtest/fused-src/gtest/gtest.h | 18007 -----------------
src/gtest/fused-src/gtest/gtest_main.cc | 39 -
src/gtest/include/gtest/gtest-death-test.h | 283 -
src/gtest/include/gtest/gtest-message.h | 230 -
src/gtest/include/gtest/gtest-param-test.h | 1392 --
src/gtest/include/gtest/gtest-param-test.h.pump | 457 -
src/gtest/include/gtest/gtest-spi.h | 232 -
src/gtest/include/gtest/gtest-test-part.h | 176 -
src/gtest/include/gtest/gtest-typed-test.h | 259 -
src/gtest/include/gtest/gtest.h | 2052 --
src/gtest/include/gtest/gtest_pred_impl.h | 368 -
.../gtest/internal/gtest-death-test-internal.h | 275 -
src/gtest/include/gtest/internal/gtest-filepath.h | 210 -
src/gtest/include/gtest/internal/gtest-internal.h | 923 -
.../include/gtest/internal/gtest-linked_ptr.h | 242 -
.../gtest/internal/gtest-param-util-generated.h | 4820 -----
.../internal/gtest-param-util-generated.h.pump | 301 -
.../include/gtest/internal/gtest-param-util.h | 619 -
src/gtest/include/gtest/internal/gtest-port.h | 1497 --
src/gtest/include/gtest/internal/gtest-string.h | 350 -
src/gtest/include/gtest/internal/gtest-tuple.h | 968 -
.../include/gtest/internal/gtest-tuple.h.pump | 336 -
src/gtest/include/gtest/internal/gtest-type-util.h | 3321 ---
.../include/gtest/internal/gtest-type-util.h.pump | 287 -
src/gtest/make/Makefile | 80 -
src/gtest/msvc/gtest-md.vcproj | 237 -
src/gtest/msvc/gtest.vcproj | 237 -
src/gtest/msvc/gtest_main-md.vcproj | 165 -
src/gtest/msvc/gtest_main.vcproj | 165 -
src/gtest/samples/sample10_unittest.cc | 145 -
src/gtest/samples/sample1_unittest.cc | 153 -
src/gtest/samples/sample2.h | 86 -
src/gtest/samples/sample2_unittest.cc | 109 -
src/gtest/samples/sample3-inl.h | 173 -
src/gtest/samples/sample3_unittest.cc | 151 -
src/gtest/samples/sample4_unittest.cc | 45 -
src/gtest/samples/sample5_unittest.cc | 199 -
src/gtest/samples/sample6_unittest.cc | 224 -
src/gtest/samples/sample7_unittest.cc | 132 -
src/gtest/samples/sample8_unittest.cc | 173 -
src/gtest/samples/sample9_unittest.cc | 160 -
src/gtest/scripts/fuse_gtest_files.py | 250 -
src/gtest/scripts/gen_gtest_pred_impl.py | 733 -
src/gtest/scripts/gtest-config.in | 274 -
src/gtest/scripts/pump.py | 835 -
src/gtest/scripts/test/Makefile | 57 -
src/gtest/src/gtest-all.cc | 47 -
src/gtest/src/gtest-death-test.cc | 1172 --
src/gtest/src/gtest-filepath.cc | 380 -
src/gtest/src/gtest-internal-inl.h | 1074 -
src/gtest/src/gtest-port.cc | 711 -
src/gtest/src/gtest-test-part.cc | 110 -
src/gtest/src/gtest-typed-test.cc | 110 -
src/gtest/src/gtest.cc | 4704 -----
src/gtest/src/gtest_main.cc | 39 -
src/gtest/test/gtest-death-test_test.cc | 1230 --
src/gtest/test/gtest-filepath_test.cc | 690 -
src/gtest/test/gtest-linked_ptr_test.cc | 154 -
src/gtest/test/gtest-listener_test.cc | 313 -
src/gtest/test/gtest-message_test.cc | 167 -
src/gtest/test/gtest-options_test.cc | 212 -
src/gtest/test/gtest-param-test2_test.cc | 65 -
src/gtest/test/gtest-param-test_test.cc | 835 -
src/gtest/test/gtest-param-test_test.h | 55 -
src/gtest/test/gtest-port_test.cc | 1018 -
src/gtest/test/gtest-test-part_test.cc | 208 -
src/gtest/test/gtest-tuple_test.cc | 320 -
src/gtest/test/gtest-typed-test2_test.cc | 45 -
src/gtest/test/gtest-typed-test_test.cc | 360 -
src/gtest/test/gtest-typed-test_test.h | 66 -
src/gtest/test/gtest-unittest-api_test.cc | 343 -
src/gtest/test/gtest_all_test.cc | 48 -
src/gtest/test/gtest_break_on_failure_unittest.py | 218 -
src/gtest/test/gtest_break_on_failure_unittest_.cc | 86 -
src/gtest/test/gtest_color_test_.cc | 71 -
src/gtest/test/gtest_env_var_test.py | 105 -
src/gtest/test/gtest_env_var_test_.cc | 126 -
src/gtest/test/gtest_environment_test.cc | 186 -
src/gtest/test/gtest_filter_unittest_.cc | 140 -
src/gtest/test/gtest_help_test.py | 169 -
src/gtest/test/gtest_help_test_.cc | 46 -
src/gtest/test/gtest_list_tests_unittest.py | 177 -
src/gtest/test/gtest_list_tests_unittest_.cc | 85 -
src/gtest/test/gtest_main_unittest.cc | 45 -
src/gtest/test/gtest_no_test_unittest.cc | 54 -
src/gtest/test/gtest_output_test.py | 327 -
src/gtest/test/gtest_output_test_.cc | 1135 --
src/gtest/test/gtest_output_test_golden_lin.txt | 696 -
src/gtest/test/gtest_output_test_golden_win.txt | 605 -
src/gtest/test/gtest_pred_impl_unittest.cc | 2432 ---
src/gtest/test/gtest_prod_test.cc | 57 -
src/gtest/test/gtest_repeat_test.cc | 253 -
src/gtest/test/gtest_shuffle_test_.cc | 104 -
src/gtest/test/gtest_sole_header_test.cc | 57 -
src/gtest/test/gtest_stress_test.cc | 257 -
src/gtest/test/gtest_test_utils.py | 309 -
src/gtest/test/gtest_throw_on_failure_ex_test.cc | 92 -
src/gtest/test/gtest_throw_on_failure_test_.cc | 56 -
src/gtest/test/gtest_uninitialized_test_.cc | 43 -
src/gtest/test/gtest_unittest.cc | 6718 -------
src/gtest/test/gtest_xml_outfile1_test_.cc | 49 -
src/gtest/test/gtest_xml_outfile2_test_.cc | 49 -
src/gtest/test/gtest_xml_outfiles_test.py | 132 -
src/gtest/test/gtest_xml_output_unittest.py | 224 -
src/gtest/test/gtest_xml_output_unittest_.cc | 145 -
src/gtest/test/gtest_xml_test_utils.py | 172 -
src/gtest/test/production.h | 55 -
src/gtest/test/run_tests_util.py | 466 -
src/gtest/test/run_tests_util_test.py | 676 -
.../xcode/Samples/FrameworkSample/widget_test.cc | 68 -
src/gtest/xcode/gtest.xcodeproj/project.pbxproj | 1080 -
src/include/Context.h | 33 +-
src/include/Makefile.am | 33 +-
src/include/addr_parsing.h | 2 +-
src/include/atomic.h | 8 +-
src/include/buffer.h | 100 +-
src/include/ceph_features.h | 39 +-
src/include/ceph_fs.h | 17 +-
src/include/cephfs/libcephfs.h | 48 +
src/include/encoding.h | 77 +-
src/include/filepath.h | 1 +
src/include/frag.h | 2 +-
src/include/int_types.h | 2 +
src/include/msgr.h | 2 +-
src/include/rados.h | 280 +-
src/include/rados/buffer.h | 100 +-
src/include/rados/librados.h | 1058 +-
src/include/rados/librados.hpp | 216 +-
src/include/rados/rados_types.h | 9 +
src/include/rados/rados_types.hpp | 11 +
src/include/rbd/features.h | 19 +-
src/include/rbd/librbd.h | 238 +-
src/include/rbd/librbd.hpp | 22 +-
src/include/rbd_types.h | 8 +-
src/include/str_map.h | 13 +
src/include/stringify.h | 12 +
src/include/triple.h | 29 -
src/include/types.h | 23 +
src/include/unordered_map.h | 2 +
src/include/util.h | 34 +
src/include/utime.h | 21 +-
src/include/xlist.h | 4 +
src/init-ceph.in | 30 +-
src/init-radosgw | 12 +-
src/init-radosgw.sysv | 26 +-
src/init-rbdmap | 2 +-
src/java/Makefile.am | 8 +-
src/java/Makefile.in | 63 +-
src/key_value_store/Makefile.am | 5 +
src/key_value_store/kv_flat_btree_async.cc | 12 +-
src/key_value_store/kv_flat_btree_async.h | 2 +-
src/libcephfs.cc | 158 +-
src/librados-config.cc | 12 +-
src/librados/IoCtxImpl.cc | 322 +-
src/librados/IoCtxImpl.h | 75 +-
src/librados/ListObjectImpl.h | 78 +
src/librados/Makefile.am | 33 +-
src/librados/RadosClient.cc | 234 +-
src/librados/RadosClient.h | 23 +-
src/librados/librados.cc | 989 +-
src/librados/snap_set_diff.cc | 2 +-
src/libradosstriper/Makefile.am | 10 +-
src/libradosstriper/MultiAioCompletionImpl.h | 9 +-
src/libradosstriper/RadosStriperImpl.cc | 93 +-
src/libradosstriper/RadosStriperImpl.h | 53 +-
src/libradosstriper/libradosstriper.cc | 2 +-
src/librbd/AioCompletion.cc | 17 +-
src/librbd/AioCompletion.h | 31 +-
src/librbd/AioRequest.cc | 421 +-
src/librbd/AioRequest.h | 188 +-
src/librbd/AsyncFlattenRequest.cc | 213 +
src/librbd/AsyncFlattenRequest.h | 77 +
src/librbd/AsyncObjectThrottle.cc | 88 +
src/librbd/AsyncObjectThrottle.h | 70 +
src/librbd/AsyncOperation.cc | 56 +
src/librbd/AsyncOperation.h | 44 +
src/librbd/AsyncRequest.cc | 33 +
src/librbd/AsyncRequest.h | 76 +
src/librbd/AsyncResizeRequest.cc | 320 +
src/librbd/AsyncResizeRequest.h | 103 +
src/librbd/AsyncTrimRequest.cc | 312 +
src/librbd/AsyncTrimRequest.h | 77 +
src/librbd/CopyupRequest.cc | 211 +
src/librbd/CopyupRequest.h | 74 +
src/librbd/ImageCtx.cc | 257 +-
src/librbd/ImageCtx.h | 79 +-
src/librbd/ImageWatcher.cc | 1033 +
src/librbd/ImageWatcher.h | 275 +
src/librbd/LibrbdWriteback.cc | 24 +-
src/librbd/LibrbdWriteback.h | 12 +-
src/librbd/Makefile.am | 55 +-
src/librbd/ObjectMap.cc | 486 +
src/librbd/ObjectMap.h | 133 +
src/librbd/SnapInfo.h | 7 +-
src/librbd/TaskFinisher.h | 141 +
src/librbd/WatchCtx.cc | 36 -
src/librbd/WatchCtx.h | 32 -
src/librbd/WatchNotifyTypes.cc | 387 +
src/librbd/WatchNotifyTypes.h | 244 +
src/librbd/internal.cc | 1259 +-
src/librbd/internal.h | 45 +-
src/librbd/librbd.cc | 583 +-
src/libs3/debian/changelog | 5 +
src/libs3/debian/changelog.Debian | 6 +
src/libs3/debian/control | 12 +
src/libs3/debian/control.dev | 26 +
src/libs3/debian/postinst | 3 +
src/mds/Beacon.cc | 5 +-
src/mds/Beacon.h | 6 +-
src/mds/CDentry.cc | 22 +-
src/mds/CDentry.h | 68 +-
src/mds/CDir.cc | 229 +-
src/mds/CDir.h | 107 +-
src/mds/CInode.cc | 484 +-
src/mds/CInode.h | 206 +-
src/mds/Capability.h | 7 +-
src/mds/InoTable.cc | 8 +-
src/mds/InoTable.h | 16 +
src/mds/Locker.cc | 143 +-
src/mds/Locker.h | 7 +-
src/mds/LogSegment.h | 8 +
src/mds/MDBalancer.cc | 92 +-
src/mds/MDBalancer.h | 22 +-
src/mds/MDCache.cc | 1045 +-
src/mds/MDCache.h | 216 +-
src/mds/MDLog.cc | 109 +-
src/mds/MDLog.h | 26 +-
src/mds/MDS.cc | 952 +-
src/mds/MDS.h | 52 +-
src/mds/MDSAuthCaps.cc | 216 +
src/mds/MDSAuthCaps.h | 87 +
src/mds/MDSContext.cc | 19 +
src/mds/MDSContext.h | 30 +-
src/mds/MDSContinuation.h | 35 +
src/mds/MDSMap.cc | 51 +-
src/mds/MDSMap.h | 211 +-
src/mds/MDSTable.cc | 19 +-
src/mds/MDSTable.h | 8 +-
src/mds/MDSTableClient.cc | 2 +-
src/mds/MDSTableClient.h | 2 +-
src/mds/MDSTableServer.cc | 20 +-
src/mds/MDSTableServer.h | 8 +-
src/mds/Makefile.am | 12 +-
src/mds/Migrator.cc | 127 +-
src/mds/Migrator.h | 41 +-
src/mds/Mutation.cc | 26 +
src/mds/Mutation.h | 55 +-
src/mds/RecoveryQueue.cc | 10 +
src/mds/RecoveryQueue.h | 6 +-
src/mds/Server.cc | 826 +-
src/mds/Server.h | 22 +-
src/mds/SessionMap.cc | 47 +-
src/mds/SessionMap.h | 104 +-
src/mds/SimpleLock.h | 23 +-
src/mds/SnapRealm.cc | 39 +-
src/mds/SnapRealm.h | 1 +
src/mds/SnapServer.cc | 19 +-
src/mds/SnapServer.h | 2 +-
src/mds/events/EMetaBlob.h | 43 +-
src/mds/events/ESlaveUpdate.h | 2 +-
src/mds/events/ETableServer.h | 6 +-
src/mds/flock.cc | 82 +-
src/mds/flock.h | 2 +
src/mds/inode_backtrace.cc | 48 +
src/mds/inode_backtrace.h | 22 +
src/mds/journal.cc | 45 +-
src/mds/locks.c | 6 -
src/mds/mdstypes.cc | 97 +-
src/mds/mdstypes.h | 150 +-
src/messages/MClientCapRelease.h | 14 +-
src/messages/MClientCaps.h | 34 +-
src/messages/MClientQuota.h | 50 +
src/messages/MClientReconnect.h | 6 +-
src/messages/MClientReply.h | 6 +
src/messages/MClientSession.h | 7 +-
src/messages/MCommand.h | 2 +-
src/messages/MDataPing.h | 93 +
src/messages/MDirUpdate.h | 7 +-
src/messages/MDiscoverReply.h | 4 +-
src/messages/MExportDirDiscover.h | 6 +-
src/messages/MExportDirPrep.h | 6 +-
src/messages/MForward.h | 14 +-
src/messages/MGatherCaps.h | 32 +
src/messages/MHeartbeat.h | 4 +-
src/messages/MMDSBeacon.h | 14 +-
src/messages/MMDSLoadTargets.h | 6 +-
src/messages/MMDSOpenInoReply.h | 4 +-
src/messages/MMDSSlaveRequest.h | 5 +-
src/messages/MMonGetOSDMap.h | 87 +
src/messages/MOSDBoot.h | 20 +-
src/messages/MOSDECSubOpRead.h | 4 +-
src/messages/MOSDMap.h | 7 +-
src/messages/MOSDOp.h | 22 +-
src/messages/MOSDPGCreate.h | 25 +-
src/messages/MOSDRepOp.h | 138 +
src/messages/MOSDRepOpReply.h | 120 +
src/messages/MOSDRepScrub.h | 29 +-
src/messages/MOSDSubOp.h | 57 +-
src/messages/MOSDSubOpReply.h | 2 +-
src/messages/MPing.h | 2 -
src/messages/MRoute.h | 6 +-
src/messages/MWatchNotify.h | 20 +-
src/messages/Makefile.am | 6 +
src/mon/AuthMonitor.cc | 7 +-
src/mon/ConfigKeyService.cc | 16 +-
src/mon/Elector.cc | 4 +
src/mon/LogMonitor.cc | 10 +-
src/mon/LogMonitor.h | 11 +-
src/mon/MDSMonitor.cc | 465 +-
src/mon/MDSMonitor.h | 15 +-
src/mon/Makefile.am | 5 +
src/mon/MonCap.cc | 17 +-
src/mon/MonCap.h | 8 +-
src/mon/MonClient.cc | 20 +-
src/mon/MonCommands.h | 96 +-
src/mon/Monitor.cc | 858 +-
src/mon/Monitor.h | 224 +-
src/mon/MonitorDBStore.h | 18 +
src/mon/MonitorStore.cc | 16 +-
src/mon/MonmapMonitor.cc | 2 +-
src/mon/OSDMonitor.cc | 878 +-
src/mon/OSDMonitor.h | 11 +-
src/mon/PGMap.cc | 446 +-
src/mon/PGMap.h | 47 +-
src/mon/PGMonitor.cc | 247 +-
src/mon/Paxos.cc | 172 +-
src/mon/Paxos.h | 62 +-
src/mon/PaxosService.cc | 33 +-
src/mon/PaxosService.h | 1 -
src/mon/Session.h | 3 +-
src/mon/mon_types.h | 17 +
src/mount/mount.ceph.c | 6 +-
src/mount/mtab.c | 14 +-
src/msg/Accepter.cc | 255 -
src/msg/Connection.h | 19 +-
src/msg/DispatchQueue.cc | 243 -
src/msg/DispatchQueue.h | 208 -
src/msg/Makefile.am | 82 +-
src/msg/Message.cc | 60 +-
src/msg/Message.h | 64 +-
src/msg/Messenger.cc | 44 +-
src/msg/Messenger.h | 49 +-
src/msg/Pipe.cc | 2416 ---
src/msg/Pipe.h | 356 -
src/msg/PipeConnection.cc | 91 -
src/msg/PipeConnection.h | 57 -
src/msg/SimpleMessenger.cc | 702 -
src/msg/SimpleMessenger.h | 417 -
src/msg/async/AsyncConnection.cc | 2369 +++
src/msg/async/AsyncConnection.h | 304 +
src/msg/async/AsyncMessenger.cc | 770 +
src/msg/async/AsyncMessenger.h | 469 +
src/msg/async/Event.cc | 388 +
src/msg/async/Event.h | 156 +
src/msg/async/EventEpoll.cc | 130 +
src/msg/async/EventEpoll.h | 48 +
src/msg/async/EventKqueue.cc | 122 +
src/msg/async/EventKqueue.h | 48 +
src/msg/async/EventSelect.cc | 92 +
src/msg/async/EventSelect.h | 44 +
src/msg/async/net_handler.cc | 145 +
src/msg/async/net_handler.h | 37 +
src/msg/simple/Accepter.cc | 278 +
src/msg/{ => simple}/Accepter.h | 0
src/msg/simple/DispatchQueue.cc | 243 +
src/msg/simple/DispatchQueue.h | 207 +
src/msg/simple/Pipe.cc | 2548 +++
src/msg/simple/Pipe.h | 380 +
src/msg/simple/PipeConnection.cc | 96 +
src/msg/simple/PipeConnection.h | 55 +
src/msg/simple/SimpleMessenger.cc | 714 +
src/msg/simple/SimpleMessenger.h | 418 +
src/msg/xio/DispatchStrategy.h | 37 +
src/msg/xio/FastStrategy.h | 35 +
src/msg/xio/QueueStrategy.cc | 113 +
src/msg/xio/QueueStrategy.h | 61 +
src/msg/xio/XioConnection.cc | 709 +
src/msg/xio/XioConnection.h | 357 +
src/msg/xio/XioInSeq.h | 84 +
src/msg/xio/XioMessenger.cc | 1049 +
src/msg/xio/XioMessenger.h | 142 +
src/msg/xio/XioMsg.cc | 36 +
src/msg/xio/XioMsg.h | 403 +
src/msg/xio/XioPool.cc | 22 +
src/msg/xio/XioPool.h | 221 +
src/msg/xio/XioPortal.cc | 99 +
src/msg/xio/XioPortal.h | 456 +
src/msg/xio/XioSubmit.h | 55 +
src/ocf/Makefile.in | 8 +-
src/os/BtrfsFileStoreBackend.cc | 10 +-
src/os/DBObjectMap.cc | 258 +-
src/os/DBObjectMap.h | 7 +-
src/os/FDCache.h | 6 +-
src/os/FileJournal.cc | 242 +-
src/os/FileJournal.h | 14 +-
src/os/FileStore.cc | 573 +-
src/os/FileStore.h | 21 +-
src/os/GenericFileStoreBackend.cc | 16 +-
src/os/GenericObjectMap.cc | 30 +-
src/os/GenericObjectMap.h | 1 +
src/os/HashIndex.cc | 5 +-
src/os/IndexManager.cc | 6 +-
src/os/IndexManager.h | 4 +-
src/os/KeyValueDB.cc | 11 +-
src/os/KeyValueStore.cc | 394 +-
src/os/KeyValueStore.h | 16 +-
src/os/KineticStore.cc | 20 +
src/os/KineticStore.h | 1 +
src/os/LFNIndex.cc | 11 +-
src/os/LevelDBStore.cc | 1 -
src/os/Makefile.am | 4 +
src/os/MemStore.cc | 368 +-
src/os/MemStore.h | 43 +-
src/os/ObjectStore.cc | 4 +-
src/os/ObjectStore.h | 1335 +-
src/os/RocksDBStore.cc | 2 +-
src/os/Transaction.cc | 705 +-
src/os/WBThrottle.cc | 20 +-
src/os/WBThrottle.h | 9 +-
src/os/XfsFileStoreBackend.cc | 26 +-
src/os/chain_xattr.cc | 6 +-
src/osd/Ager.cc | 1 -
src/osd/ClassHandler.cc | 26 +-
src/osd/ECBackend.cc | 142 +-
src/osd/ECBackend.h | 14 +-
src/osd/ECMsgTypes.cc | 63 +-
src/osd/ECMsgTypes.h | 7 +-
src/osd/ECTransaction.cc | 25 +-
src/osd/ECTransaction.h | 12 +-
src/osd/HitSet.h | 8 +-
src/osd/Makefile.am | 11 +-
src/osd/OSD.cc | 642 +-
src/osd/OSD.h | 108 +-
src/osd/OSDCap.cc | 8 +-
src/osd/OSDMap.cc | 436 +-
src/osd/OSDMap.h | 56 +-
src/osd/OpRequest.cc | 12 +-
src/osd/OpRequest.h | 8 +-
src/osd/PG.cc | 1024 +-
src/osd/PG.h | 118 +-
src/osd/PGBackend.cc | 148 +-
src/osd/PGBackend.h | 36 +-
src/osd/PGLog.cc | 259 +-
src/osd/PGLog.h | 172 +-
src/osd/ReplicatedBackend.cc | 1728 +-
src/osd/ReplicatedBackend.h | 29 +-
src/osd/ReplicatedPG.cc | 3547 ++--
src/osd/ReplicatedPG.h | 260 +-
src/osd/Watch.cc | 120 +-
src/osd/Watch.h | 44 +-
src/osd/osd_types.cc | 553 +-
src/osd/osd_types.h | 395 +-
src/osdc/Filer.cc | 10 +-
src/osdc/Filer.h | 5 +-
src/osdc/Journaler.cc | 8 +
src/osdc/Journaler.h | 5 +-
src/osdc/ObjectCacher.cc | 163 +-
src/osdc/ObjectCacher.h | 47 +-
src/osdc/Objecter.cc | 960 +-
src/osdc/Objecter.h | 423 +-
src/osdc/Striper.cc | 15 +-
src/osdc/Striper.h | 3 +-
src/osdc/WritebackHandler.h | 8 +-
src/perfglue/cpu_profiler.cc | 13 +-
src/perfglue/heap_profiler.cc | 33 +-
src/pybind/ceph_argparse.py | 59 +-
src/pybind/cephfs.py | 58 +-
src/pybind/rados.py | 408 +-
src/pybind/rbd.py | 77 +-
src/rbd-replay-many | 88 +
src/rbd.cc | 827 +-
src/rbd_fuse/rbd-fuse.c | 785 -
src/rbd_fuse/rbd-fuse.cc | 830 +
src/rbd_replay/BoundedBuffer.hpp | 13 +-
src/rbd_replay/Deser.hpp | 5 +
src/rbd_replay/ImageNameMap.hpp | 14 +
src/rbd_replay/Makefile.am | 8 +
src/rbd_replay/PendingIO.cc | 4 +-
src/rbd_replay/PendingIO.hpp | 13 +-
src/rbd_replay/Replayer.cc | 23 +-
src/rbd_replay/Replayer.hpp | 21 +-
src/rbd_replay/Ser.hpp | 5 +
src/rbd_replay/actions.hpp | 53 +-
src/rbd_replay/ios.hpp | 47 +-
src/rbd_replay/rbd-replay-prep.cc | 64 +-
src/rbd_replay/rbd-replay.cc | 11 +
src/rbd_replay/rbd_loc.hpp | 44 +
src/rgw/Makefile.am | 28 +-
src/rgw/rgw_admin.cc | 484 +-
src/rgw/rgw_bucket.cc | 268 +-
src/rgw/rgw_bucket.h | 20 +-
src/rgw/rgw_cache.cc | 52 +
src/rgw/rgw_cache.h | 121 +-
src/rgw/rgw_civetweb.cc | 6 +-
src/rgw/rgw_common.cc | 90 +-
src/rgw/rgw_common.h | 351 +-
src/rgw/rgw_dencoder.cc | 12 +-
src/rgw/rgw_fcgi.cc | 4 +-
src/rgw/rgw_formats.cc | 19 +-
src/rgw/rgw_formats.h | 2 +-
src/rgw/rgw_gc.cc | 16 +-
src/rgw/rgw_http_errors.h | 2 +
src/rgw/rgw_json_enc.cc | 50 +-
src/rgw/rgw_log.cc | 50 +-
src/rgw/rgw_log.h | 43 +-
src/rgw/rgw_main.cc | 96 +-
src/rgw/rgw_metadata.cc | 2 +-
src/rgw/rgw_multi_del.cc | 15 +-
src/rgw/rgw_multi_del.h | 15 +-
src/rgw/rgw_op.cc | 787 +-
src/rgw/rgw_op.h | 143 +-
src/rgw/rgw_quota.cc | 4 +-
src/rgw/rgw_rados.cc | 4152 ++--
src/rgw/rgw_rados.h | 1209 +-
src/rgw/rgw_replica_log.cc | 164 +-
src/rgw/rgw_replica_log.h | 35 +-
src/rgw/rgw_rest.cc | 223 +-
src/rgw/rgw_rest.h | 6 +-
src/rgw/rgw_rest_client.cc | 6 +-
src/rgw/rgw_rest_log.cc | 35 +-
src/rgw/rgw_rest_log.h | 6 +-
src/rgw/rgw_rest_replica_log.cc | 71 +-
src/rgw/rgw_rest_s3.cc | 397 +-
src/rgw/rgw_rest_s3.h | 21 +-
src/rgw/rgw_rest_swift.cc | 131 +-
src/rgw/rgw_rest_user.cc | 12 +-
src/rgw/rgw_swift.cc | 36 +-
src/rgw/rgw_swift.h | 1 +
src/rgw/rgw_swift_auth.cc | 9 +-
src/rgw/rgw_swift_auth.h | 2 +-
src/rgw/rgw_tools.cc | 23 +-
src/rgw/rgw_tools.h | 3 +-
src/rgw/rgw_user.cc | 41 +-
src/rgw/rgw_user.h | 7 +-
src/sample.ceph.conf | 23 +-
src/stop.sh | 15 +-
src/test/Makefile-client.am | 515 +
src/test/Makefile-server.am | 234 +
src/test/Makefile.am | 710 +-
src/test/TestSignalHandlers.cc | 1 +
src/test/bench/dumb_backend.h | 4 +-
src/test/bench/small_io_bench_dumb.cc | 24 +-
src/test/bench/small_io_bench_fs.cc | 26 +-
src/test/bench/tp_bench.cc | 26 +-
src/test/bench_log.cc | 9 +-
src/test/bufferlist.cc | 176 +-
src/test/centos-6/Dockerfile.in | 30 +
src/test/centos-6/ceph.spec.in | 915 +
src/test/centos-6/install-deps.sh | 67 +
src/test/centos-7/Dockerfile.in | 33 +
src/test/centos-7/ceph.spec.in | 915 +
src/test/centos-7/install-deps.sh | 67 +
src/test/ceph-disk.sh | 267 +-
src/test/ceph_objectstore_tool.py | 924 +
src/test/cephtool-test-mds.sh | 20 +
src/test/cephtool-test-mon.sh | 20 +
src/test/cephtool-test-osd.sh | 20 +
src/test/cli/crushtool/add-item-in-tree.t | 10 +
src/test/cli/crushtool/add-item.t | 3 +
src/test/cli/crushtool/adjust-item-weight.t | 17 +
src/test/cli/crushtool/build.t | 52 +-
src/test/cli/crushtool/help.t | 4 +
src/test/cli/crushtool/location.t | 16 +
src/test/cli/crushtool/set-choose.t | 9 +-
src/test/cli/crushtool/show-choose-tries.t | 109 +
src/test/cli/crushtool/show-choose-tries.txt | 47 +
src/test/cli/crushtool/simple.template.adj.one | 56 +
src/test/cli/crushtool/simple.template.adj.three | 64 +
src/test/cli/crushtool/simple.template.adj.two | 64 +
src/test/cli/crushtool/straw2.t | 4 +
src/test/cli/crushtool/straw2.txt | 43 +
src/test/cli/crushtool/test-map-big-1.crushmap | Bin 0 -> 8936 bytes
src/test/cli/crushtool/test-map-bobtail-tunables.t | 2 +-
src/test/cli/crushtool/test-map-firefly-tunables.t | 2 +-
src/test/cli/crushtool/test-map-indep.t | 2 +-
src/test/cli/crushtool/test-map-legacy-tunables.t | 2 +-
src/test/cli/crushtool/test-map-tries-vs-retries.t | 2 +-
src/test/cli/crushtool/test-map-vary-r-0.t | 2 +-
src/test/cli/crushtool/test-map-vary-r-1.t | 2 +-
src/test/cli/crushtool/test-map-vary-r-2.t | 2 +-
src/test/cli/crushtool/test-map-vary-r-3.t | 2 +-
src/test/cli/crushtool/test-map-vary-r-4.t | 2 +-
src/test/cli/crushtool/tree.template | Bin 0 -> 376 bytes
src/test/cli/crushtool/tree.template.final | 70 +
src/test/cli/osdmaptool/create-print.t | 1 +
src/test/cli/osdmaptool/create-racks.t | 1 +
src/test/cli/osdmaptool/crush.t | 2 +-
src/test/cli/osdmaptool/help.t | 1 +
src/test/cli/osdmaptool/missing-argument.t | 1 +
src/test/cli/radosgw-admin/help.t | 1 +
src/test/cli/rbd/help.t | 27 +-
src/test/cls_lock/test_cls_lock.cc | 40 +
src/test/cls_rbd/test_cls_rbd.cc | 647 +-
src/test/cls_refcount/test_cls_refcount.cc | 50 +-
src/test/cls_rgw/test_cls_rgw.cc | 51 +-
src/test/common/Readahead.cc | 130 +
src/test/common/get_command_descriptions.cc | 7 +-
src/test/common/test_bit_vector.cc | 231 +
src/test/common/test_blkdev.cc | 85 +
src/test/common/test_context.cc | 37 +-
src/test/common/test_safe_io.cc | 37 +
src/test/common/test_shared_cache.cc | 338 +-
src/test/common/test_sharedptr_registry.cc | 2 +-
src/test/common/test_sloppy_crc_map.cc | 2 +-
src/test/common/test_str_map.cc | 1 -
src/test/common/test_tableformatter.cc | 245 +
src/test/container-make-check-ubuntu-14.04.sh | 3 +
src/test/crush/CrushWrapper.cc | 818 +
src/test/crush/TestCrushWrapper.cc | 638 -
src/test/crush/crush.cc | 650 +
src/test/crush/indep.cc | 265 -
src/test/debian-jessie/Dockerfile.in | 31 +
src/test/debian-jessie/install-deps.sh | 67 +
src/test/encoding/ceph_dencoder.cc | 8 +-
src/test/encoding/types.h | 36 +-
src/test/erasure-code/Makefile.am | 57 +
src/test/erasure-code/TestErasureCode.cc | 36 +
src/test/erasure-code/TestErasureCodeIsa.cc | 19 +-
src/test/erasure-code/TestErasureCodeJerasure.cc | 18 +-
.../erasure-code/TestErasureCodePluginJerasure.cc | 24 +-
src/test/erasure-code/TestErasureCodeShec.cc | 3014 +++
src/test/erasure-code/TestErasureCodeShec_all.cc | 330 +
.../erasure-code/TestErasureCodeShec_thread.cc | 231 +
src/test/erasure-code/TestJerasurePluginNEON.cc | 25 +
src/test/erasure-code/ceph_erasure_code.cc | 49 +-
.../erasure-code/ceph_erasure_code_benchmark.cc | 140 +-
.../erasure-code/ceph_erasure_code_benchmark.h | 16 +-
.../ceph_erasure_code_non_regression.cc | 325 +
src/test/erasure-code/test-erasure-code.sh | 30 +-
src/test/escape.cc | 5 +-
src/test/formatter.cc | 2 +-
src/test/fs/mds_types.cc | 252 +
src/test/kv_store_bench.cc | 22 +-
src/test/kv_store_bench.h | 1 +
src/test/libcephfs/test.cc | 65 +-
src/test/librados/TestCase.cc | 296 +-
src/test/librados/TestCase.h | 108 +-
src/test/librados/aio.cc | 245 +
src/test/librados/c_read_operations.cc | 42 +-
src/test/librados/c_write_operations.cc | 56 +
src/test/librados/io.cc | 78 +
src/test/librados/list.cc | 44 +-
src/test/librados/misc.cc | 147 +-
src/test/librados/nlist.cc | 689 +
src/test/librados/pool.cc | 48 +
src/test/librados/snapshots.cc | 26 +-
src/test/librados/tier.cc | 480 +-
src/test/librados/watch_notify.cc | 440 +-
src/test/librados_test_stub/LibradosTestStub.cc | 995 +
src/test/librados_test_stub/TestClassHandler.cc | 110 +
src/test/librados_test_stub/TestClassHandler.h | 66 +
src/test/librados_test_stub/TestIoCtxImpl.cc | 254 +
src/test/librados_test_stub/TestIoCtxImpl.h | 148 +
src/test/librados_test_stub/TestMemIoCtxImpl.cc | 599 +
src/test/librados_test_stub/TestMemIoCtxImpl.h | 71 +
src/test/librados_test_stub/TestMemRadosClient.cc | 127 +
src/test/librados_test_stub/TestMemRadosClient.h | 99 +
src/test/librados_test_stub/TestRadosClient.cc | 213 +
src/test/librados_test_stub/TestRadosClient.h | 99 +
src/test/librados_test_stub/TestWatchNotify.cc | 206 +
src/test/librados_test_stub/TestWatchNotify.h | 88 +
src/test/libradosstriper/aio.cc | 32 +
src/test/libradosstriper/io.cc | 14 +
src/test/libradosstriper/striping.cc | 52 +-
src/test/librbd/fsx.c | 72 +-
src/test/librbd/test_ImageWatcher.cc | 930 +
src/test/librbd/test_fixture.cc | 110 +
src/test/librbd/test_fixture.h | 59 +
src/test/librbd/test_internal.cc | 363 +
src/test/librbd/test_librbd.cc | 1844 +-
src/test/librbd/test_main.cc | 29 +
src/test/mds/TestMDSAuthCaps.cc | 151 +
src/test/messenger/Makefile.am | 76 +
src/test/messenger/message_helper.h | 134 +
src/test/messenger/simple_client.cc | 160 +
src/test/messenger/simple_dispatcher.cc | 84 +
src/test/messenger/simple_dispatcher.h | 124 +
src/test/messenger/simple_server.cc | 106 +
src/test/messenger/xio_client.cc | 187 +
src/test/messenger/xio_dispatcher.cc | 76 +
src/test/messenger/xio_dispatcher.h | 124 +
src/test/messenger/xio_server.cc | 122 +
src/test/mon/misc.sh | 61 +-
src/test/mon/mkfs.sh | 25 +-
src/test/mon/mon-handle-forward.sh | 5 +-
src/test/mon/mon-test-helpers.sh | 22 +-
src/test/mon/moncap.cc | 5 +-
src/test/mon/osd-crush.sh | 17 +-
src/test/mon/osd-erasure-code-profile.sh | 57 +-
src/test/mon/osd-pool-create.sh | 43 +-
src/test/mon/test-mon-msg.cc | 2 +-
src/test/mon/test_mon_workloadgen.cc | 10 +-
src/test/msgr/test_async_driver.cc | 307 +
src/test/msgr/test_msgr.cc | 1189 ++
src/test/multi_stress_watch.cc | 7 +
src/test/objectstore/DeterministicOpSequence.cc | 57 +-
src/test/objectstore/DeterministicOpSequence.h | 9 +-
src/test/objectstore/FileStoreDiff.cc | 4 +-
.../objectstore/ObjectStoreTransactionBenchmark.cc | 269 +
src/test/objectstore/TestObjectStoreState.h | 5 +-
src/test/objectstore/chain_xattr.cc | 9 +-
src/test/objectstore/store_test.cc | 165 +-
src/test/objectstore/workload_generator.cc | 12 +-
src/test/objectstore/workload_generator.h | 2 +-
src/test/os/TestFlatIndex.cc | 4 +-
src/test/os/TestLFNIndex.cc | 6 +-
src/test/osd/Object.h | 12 +-
src/test/osd/RadosModel.h | 59 +-
src/test/osd/TestOSDMap.cc | 4 +-
src/test/osd/TestOSDScrub.cc | 157 +
src/test/osd/TestPGLog.cc | 239 +-
src/test/osd/TestRados.cc | 4 +
src/test/osd/osd-bench.sh | 8 +-
src/test/osd/osd-config.sh | 10 +-
src/test/osd/osd-copy-from.sh | 63 +
src/test/osd/osd-scrub-repair.sh | 163 +
src/test/osd/osd-test-helpers.sh | 9 +-
src/test/osdc/FakeWriteback.cc | 4 +-
src/test/osdc/FakeWriteback.h | 8 +-
src/test/perf_counters.cc | 45 +-
src/test/pybind/test_ceph_argparse.py | 23 +-
src/test/system/rados_list_parallel.cc | 10 +-
src/test/system/st_rados_list_objects.cc | 13 +-
src/test/system/st_rados_notify.cc | 7 +
src/test/system/st_rados_watch.cc | 10 +-
src/test/test-ceph-helpers.sh | 20 +
src/test/test_arch.cc | 90 +-
src/test/test_filejournal.cc | 22 +-
src/test/test_rbd_replay.cc | 24 +-
src/test/test_rgw_admin_log.cc | 12 +-
src/test/test_str_list.cc | 19 +-
src/test/test_stress_watch.cc | 12 +-
src/test/test_striper.cc | 19 +
src/test/testmsgr.cc | 145 -
src/test/ubuntu-12.04/Dockerfile.in | 31 +
src/test/ubuntu-12.04/install-deps.sh | 67 +
src/test/ubuntu-14.04/Dockerfile.in | 31 +
src/test/ubuntu-14.04/install-deps.sh | 67 +
src/test/vstart_wrapped_tests.sh | 30 -
src/tools/Makefile-client.am | 34 +
src/tools/Makefile-server.am | 52 +
src/tools/Makefile.am | 74 +-
src/tools/ceph_authtool.cc | 393 +-
src/tools/ceph_monstore_tool.cc | 548 +-
src/tools/ceph_objectstore_tool.cc | 1179 +-
src/tools/ceph_osdomap_tool.cc | 20 +-
src/tools/cephfs/Dumper.cc | 96 +-
src/tools/cephfs/Dumper.h | 4 +-
src/tools/cephfs/EventOutput.cc | 10 +
src/tools/cephfs/JournalScanner.cc | 11 +-
src/tools/cephfs/JournalScanner.h | 15 +
src/tools/cephfs/JournalTool.cc | 530 +-
src/tools/cephfs/JournalTool.h | 13 +-
src/tools/cephfs/MDSUtility.cc | 4 +-
src/tools/cephfs/TableTool.cc | 306 +
src/tools/cephfs/TableTool.h | 50 +
src/tools/cephfs/cephfs-table-tool.cc | 46 +
src/tools/common.h | 132 -
src/tools/crushtool.cc | 95 +-
src/tools/dupstore.cc | 110 -
src/tools/mon_store_converter.cc | 334 -
src/tools/osdmaptool.cc | 13 +-
src/tools/psim.cc | 10 +-
src/tools/rados/rados.cc | 529 +-
src/tools/rados/rados_export.cc | 6 +-
src/tools/rados/rados_import.cc | 6 +-
src/tools/rados/rados_sync.cc | 4 +-
src/tools/scratchtool.c | 10 +-
src/tools/scratchtoolpp.cc | 10 +-
src/tracing/Makefile.in | 8 +-
src/tracing/librados.tp | 288 +-
src/tracing/librbd.tp | 918 +
src/tracing/objectstore.tp | 18 +-
src/tracing/oprequest.tp | 2 +
src/tracing/osd.tp | 6 +-
src/tracing/pg.tp | 2 +
src/vstart.sh | 62 +-
udev/95-ceph-osd.rules | 20 +-
1354 files changed, 344088 insertions(+), 139460 deletions(-)
diff --cc debian/changelog
index 214b56d,a1d4751..8494bfc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,55 -1,111 +1,61 @@@
-ceph (0.94.1-0ubuntu1) vivid; urgency=high
++ceph (0.94.1-1) UNRELEASED; urgency=medium
+
- * New upstream stable point release (LP: #1443821):
- - Includes critical fix for communication from pre-0.94 clients
- during cluster upgrades.
++ * Resync with Ubuntu, introducing Ceph Hammer stable release.
+
- -- James Page <james.page at ubuntu.com> Tue, 14 Apr 2015 11:46:12 +0100
++ -- James Page <james.page at ubuntu.com> Tue, 09 Jun 2015 17:41:26 +0100
+
-ceph (0.94-0ubuntu1) vivid; urgency=low
+ceph (0.87-2) experimental; urgency=low
- * New upstream stable release 'Hammer' (LP: #1423601):
- - d/p/*: Refresh.
- - d/*.symbols: Update inline with upstream additions, use regex
- for ceph version symbol.
+ * Team upload.
- -- James Page <james.page at ubuntu.com> Wed, 08 Apr 2015 18:57:08 +0100
+ [ Gaudenz Steinlin ]
+ * README.Debian: added clarification about setting the hashpspool flag.
+ (Closes: #769596).
-ceph (0.93-0ubuntu6) vivid; urgency=medium
-
- * d/control,rules,*.symbols: Disable lttng support until we can make
- it play a bit nicer with libvirt and apparmor, drop associated
- symbols (LP: #1432644).
-
- -- James Page <james.page at ubuntu.com> Wed, 01 Apr 2015 10:37:03 +0100
-
-ceph (0.93-0ubuntu5) vivid; urgency=medium
-
- * d/lib-systemd/system/ceph-create-keys.service: Automatically create
- admin and bootstrap keys after ceph mon startup (LP: #1435450).
- * d/p/vivid-does-systemd.patch: Ensure that disks prepared on vivid
- or later use systemd for init (LP: #1435464).
- * d/lib-systemd/system/*.service: Align nofile limits and restart config
- with equivalent upstart configurations.
-
- -- James Page <james.page at ubuntu.com> Tue, 24 Mar 2015 12:30:14 +0000
-
-ceph (0.93-0ubuntu4) vivid; urgency=medium
-
- * d/p/fix-cycles-arch.patch: Skip initialization of cycles_per_sec
- if rtdsc (or equivalent) is not supported (LP: #1432786).
-
- -- James Page <james.page at ubuntu.com> Wed, 18 Mar 2015 14:44:39 +0000
-
-ceph (0.93-0ubuntu3) vivid; urgency=medium
-
- * d/ceph{-common}.install,control: Move ceph_argparse.py down into
- ceph-common package to fixup ceph cli usage/autopkgtest failure.
-
- -- James Page <james.page at ubuntu.com> Sat, 14 Mar 2015 21:27:26 +0000
-
-ceph (0.93-0ubuntu2) vivid; urgency=medium
-
- * d/p/fix-cycles-arch.patch: Expand highres cycles support to cover
- PPC architectures, warn and default to return 0 for archs without
- support, fixing FTBFS.
-
- -- James Page <james.page at ubuntu.com> Fri, 13 Mar 2015 19:40:03 +0000
-
-ceph (0.93-0ubuntu1) vivid; urgency=medium
-
- * New upstream release candidate for Hammer stable release (LP: #1423601).
- - d/*.symbols: Refresh inline with upstream, removing common code
- symbols which don't form part of the public API.
- - d/p/*: Refresh and drop patches as required.
- * Resync with upstream packaging changes and enable new features:
- - d/control,ceph-common.install,librbd1.install: Move rbdnamer and
- associated udev rules into ceph-common package.
- - d/control,python-*: Split out rbd, rados and cephfs bindings into
- separate python packages, move some bits into ceph/ceph-common.
- - d/control: Move python-flask dependency to ceph package, only required
- for REST API.
- - d/control: Use google-perftools on arm64.
- - d/rules,control: Enable use of lttng for userspace tracing.
-
- -- James Page <james.page at ubuntu.com> Fri, 13 Mar 2015 07:42:45 +0000
-
-ceph (0.87-0ubuntu5) vivid; urgency=medium
-
- * d/p/fix-argparse-defaults.patch: Workaround behavioural change in
- argparse set_defaults in python 2.7.9 (LP: #1413321).
- * d/rules: Disable build and support for RocksDB over concerns around
- performance > 1TB in size.
-
- -- James Page <james.page at ubuntu.com> Thu, 22 Jan 2015 09:54:19 +0000
-
-ceph (0.87-0ubuntu4) vivid; urgency=medium
-
- * d/p/ceph-osd-prestart-path.patch: Fixup path for ceph-osd upstart
- configuration pre-start script.
-
- -- James Page <james.page at ubuntu.com> Tue, 13 Jan 2015 12:33:49 +0000
-
-ceph (0.87-0ubuntu3) vivid; urgency=medium
-
- * d/control: Re-order Recommends to prefer ntp over chrony for Ubuntu.
-
- -- James Page <james.page at ubuntu.com> Tue, 16 Dec 2014 14:59:31 +0000
-
-ceph (0.87-0ubuntu2) vivid; urgency=medium
-
- * d/rules: Limit rocksdb support to x86 + armhf, fixing FTBFS on
- unsupported and broken architectures.
-
- -- James Page <james.page at ubuntu.com> Mon, 08 Dec 2014 12:36:51 +0000
-
-ceph (0.87-0ubuntu1) vivid; urgency=medium
+ [ James Page ]
+ * Added new "modules.patch" to mark new erasure coding libraries as
+ modules, wildcard install.
[ Dmitry Smirnov ]
+ * Recommends: added "ntp" to list of time-daemon alternatives
+ (Closes: #767511).
+ * Introduced native systemd services (except "rbdmap"), (Closes: #769593).
+ * ceph-test: install forgotten files.
+ * Run post-build tests:
+ + updated "virtualenv-never-download.patch" to pass
+ "--system-site-packages" to virtualenv to prevent downloads.
+ + added new patches to disable network-dependent and failing tests.
+ * Patchworks:
+ - bug-9341.patch
+ + bug-10036.patch (to show OSD affinity in "ceph osd tree").
+ Thanks, Mykola Golub.
+ + bug-10059.patch
+ + 0latest-giant.patch (Last-Update: 2014-11-15).
+ + sleep-recover.patch
+ + tests-disable.patch (to disable tests that need cluster).
+ + tests-disable-ceph-disk.patch
+ + use_system_gtest.patch (commented)
+ as first attempt to build with system "libgtest-dev".
+ + use_system_jerasure.patch
+ * Build-Depends:
+ + libjerasure-dev (>= 2.0.0-2~)
+ + virtualenv
+ + valgrind [amd64 armhf i386 powerpc]
+ * rules: pass "--without-lttng" to explicitly disable "lttng" to avoid
+ auto-enable if found.
+ * rules: disabled bundled RocksDB:
+ RocksDB suppose to improve performance of keyvaluestore OSDs but the
+ latter slow down to nearly unusable state when filled over 1 TiB even with
+ RocksDB. Moreover KV backend is experimental and super dangerous -- I lost
+ cluster due to OSD poisoning caused by KV OSD which was plugged only
+ during limited time. LevelDB is good enough, for now I see no reason to
+ use RocksDB especially considering that it is not packaged separately.
+ * Removed myself from Uploaders.
+
+ -- Dmitry Smirnov <onlyjob at debian.org> Wed, 01 Apr 2015 11:47:38 +1100
+
+ceph (0.87-1) experimental; urgency=medium
+
* New major upstream release [October 2014].
+ new "libradosstriper*" binary packages.
* Patchworks (removed old patches, refreshed remaining ones).
diff --cc debian/control
index a49052d,37a2a4d..82daf15
--- a/debian/control
+++ b/debian/control
@@@ -7,50 -10,47 +7,50 @@@ Uploaders: Laszlo Boszormenyi (GCS) <gc
Homepage: http://ceph.com/
Vcs-Git: git://anonscm.debian.org/pkg-ceph/ceph.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ceph/ceph.git
- Build-Depends: debhelper (>= 9~), dh-systemd (>= 1.5),
- default-jdk,
- dh-autoreconf,
- dpkg-dev (>= 1.16.1~),
- javahelper,
- junit4,
- libaio-dev,
- libatomic-ops-dev,
- libblkid-dev,
- libboost-dev,
- libboost-program-options-dev,
- libboost-system-dev,
- libboost-thread-dev,
- libbabeltrace-dev,
- libbabeltrace-ctf-dev,
- libbz2-dev,
- libcurl4-gnutls-dev,
- libedit-dev,
- libexpat1-dev,
- libfcgi-dev,
- libfuse-dev,
- libgoogle-perftools-dev [i386 amd64 powerpc armhf ppc64el],
- # libgtest-dev (>= 1.6.0), cmake,
- libjerasure-dev (>= 2.0.0-2~),
- libkeyutils-dev,
- libleveldb-dev,
- libnss3-dev,
- libs3-dev,
- libsnappy-dev,
- libtool,
- # liblttng-ust-dev (>= 2.5.0) [amd64 armel armhf i386 mips mipsel powerpc s390x],
- libudev-dev,
- libxml2-dev,
- pkg-config,
- python-all (>= 2.6.6-3~),
- python-nose,
- uuid-dev,
- uuid-runtime,
- virtualenv,
- xfslibs-dev,
- yasm [amd64],
- zlib1g-dev
- # valgrind is only used in post-build tests, enable on available architectures
- ,valgrind [amd64 armhf i386 powerpc]
+ Build-Depends:
+ debhelper (>= 9~),
+ default-jdk,
+ dh-autoreconf,
+ dh-python,
+ dh-systemd (>= 1.5),
+ dpkg-dev (>= 1.16.1~),
+ javahelper,
+ junit4,
+ libaio-dev,
+ libatomic-ops-dev,
+ libbabeltrace-ctf-dev,
+ libbabeltrace-dev,
+ libblkid-dev,
+ libboost-dev,
+ libboost-program-options-dev,
+ libboost-system-dev,
+ libboost-thread-dev,
+ libbz2-dev,
+ libcurl4-gnutls-dev,
+ libedit-dev,
+ libexpat1-dev,
+ libfcgi-dev,
+ libfuse-dev,
+ libgoogle-perftools-dev [i386 amd64 powerpc armhf arm64 ppc64el],
++ libjerasure-dev (>= 2.0.0-2~),
+ libkeyutils-dev,
+ libleveldb-dev,
+ libnss3-dev,
+ libs3-dev,
+ libsnappy-dev,
+ libtool,
+ libudev-dev,
+ libxml2-dev,
+ pkg-config,
+ python-all (>= 2.6.6-3~),
+ python-nose,
+ uuid-dev,
+ uuid-runtime,
+ xfslibs-dev,
+ yasm [amd64],
- zlib1g-dev
++ zlib1g-dev,
++ valgrind [amd64 armhf i386 powerpc],
++ virtualenv
Build-Conflicts: libcrypto++-dev
Standards-Version: 3.9.6
X-Python-Version: >= 2.6
@@@ -58,21 -58,30 +58,30 @@@ XS-Testsuite: autopkgtes
Package: ceph
Architecture: linux-any
- Depends: binutils,
- ceph-common (= ${binary:Version}),
- cryptsetup-bin | cryptsetup,
- gdisk,
- hdparm | sdparm,
- parted,
- uuid-runtime,
- xfsprogs,
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
+ Depends:
+ binutils,
+ ceph-common (= ${binary:Version}),
+ cryptsetup-bin | cryptsetup,
+ gdisk,
+ hdparm | sdparm,
+ parted,
+ python-flask,
+ uuid-runtime,
+ xfsprogs,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Breaks: python-ceph (<< 0.93-0ubuntu1~)
++Breaks: python-ceph (<< 0.94.1-1~)
Conflicts: gceph, librgw-dev, librgw1, librgw1-dbg, obsync
- Replaces: gceph, librgw-dev, librgw1, librgw1-dbg, obsync
- Recommends: libcephfs1, librados2, librbd1, time-daemon | chrony | ntp
+ Replaces:
+ gceph,
+ librgw-dev,
+ librgw1,
+ librgw1-dbg,
+ obsync,
- python-ceph (<< 0.93-0ubuntu1~)
++ python-ceph (<< 0.94.1-1~)
+ Recommends: libcephfs1, librados2, librbd1, ntp | time-daemon | chrony
Suggests: logrotate
Description: distributed storage and file system
Ceph is a distributed storage system designed to provide excellent
@@@ -98,13 -107,25 +107,25 @@@ Description: debugging symbols for cep
Package: ceph-common
Architecture: linux-any
- Depends: librbd1 (= ${binary:Version}),
- python-ceph (= ${binary:Version}),
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
+ Depends:
+ librbd1 (= ${binary:Version}),
+ python-cephfs (= ${binary:Version}),
+ python-rados (= ${binary:Version}),
+ python-rbd (= ${binary:Version}),
+ python-requests,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
Conflicts: ceph-client-tools
- Replaces: ceph-client-tools
+ Breaks:
+ ceph (<< 0.93-0ubuntu3~),
- librbd1 (<< 0.93-0ubuntu1~),
- python-ceph (<< 0.93-0ubuntu1~)
++ librbd1 (<< 0.94.1-1~),
++ python-ceph (<< 0.94.1-1~)
+ Replaces:
+ ceph (<< 0.93-0ubuntu3~),
+ ceph-client-tools,
- librbd1 (<< 0.93-0ubuntu1~),
- python-ceph (<< 0.93-0ubuntu1~)
++ librbd1 (<< 0.94.1-1~),
++ python-ceph (<< 0.94.1-1~)
Suggests: ceph, ceph-mds
Description: common utilities to mount and interact with a ceph storage cluster
Ceph is a distributed storage and file system designed to provide
@@@ -462,22 -481,62 +481,62 @@@ Description: debugging symbols for ceph
This package contains the debugging symbols for ceph-test.
Package: python-ceph
+ Architecture: all
+ Section: python
+ Depends:
+ python-cephfs (>= ${binary:Version}),
+ python-rados (>= ${binary:Version}),
+ python-rbd (>= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
+ Description: Meta-package for python libraries for the Ceph libraries
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package is a metapackage for all python bindings.
+
+ Package: python-rados
Architecture: linux-any
Section: python
- Depends: libcephfs1 (= ${binary:Version}),
- librados2 (= ${binary:Version}),
- librbd1 (= ${binary:Version}),
- python-flask,
- python-requests,
- ${misc:Depends},
- ${python:Depends}
- Provides: ${python:Provides}
- Description: Python libraries for the Ceph distributed filesystem
- Ceph is a distributed storage and network file system designed to provide
- excellent performance, reliability, and scalability.
+ Depends: librados2 (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
-Replaces: python-ceph (<< 0.93-0ubuntu1~)
-Breaks: python-ceph (<< 0.93-0ubuntu1~)
++Replaces: python-ceph (<< 0.94.1-1~)
++Breaks: python-ceph (<< 0.94.1-1~)
+ Description: Python libraries for the Ceph librados library
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains Python libraries for interacting with Ceph's
+ RADOS object storage.
+
+ Package: python-rbd
+ Architecture: linux-any
+ Section: python
+ Depends: librbd1 (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
-Replaces: python-ceph (<< 0.93-0ubuntu1~)
-Breaks: python-ceph (<< 0.93-0ubuntu1~)
++Replaces: python-ceph (<< 0.94.1-1~)
++Breaks: python-ceph (<< 0.94.1-1~)
+ Description: Python libraries for the Ceph librbd library
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains Python libraries for interacting with Ceph's
+ RBD block device library.
+
+ Package: python-cephfs
+ Architecture: linux-any
+ Section: python
+ Depends: libcephfs1 (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
-Replaces: python-ceph (<< 0.93-0ubuntu1~)
-Breaks: python-ceph (<< 0.93-0ubuntu1~)
++Replaces: python-ceph (<< 0.94.1-1~)
++Breaks: python-ceph (<< 0.94.1-1~)
+ Description: Python libraries for the Ceph libcephfs library
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
.
This package contains Python libraries for interacting with Ceph's
- RADOS object storage, and RBD (RADOS block device).
+ CephFS file system client library.
Package: libcephfs-java
Architecture: all
diff --cc debian/patches/series
index a50b0d7,44e9de6..8670f49
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -10,8 -6,8 +6,11 @@@ rbdmap3-lazyumount.patc
arch.patch
modules.patch
sample.ceph.conf.patch
+tests-disable.patch
- tests-disable-ceph-disk.patch
+#use_system_gtest.patch
+use_system_jerasure.patch
virtualenv-never-download.patch
+ ceph-osd-prestart-path.patch
+ fix-argparse-defaults.patch
+ fix-cycles-arch.patch
+ vivid-does-systemd.patch
diff --cc debian/patches/tests-disable.patch
index 84957ce,0000000..09cc71d
mode 100644,000000..100644
--- a/debian/patches/tests-disable.patch
+++ b/debian/patches/tests-disable.patch
@@@ -1,56 -1,0 +1,52 @@@
+Last-Update: 2014-10-31
+Forwarded: no
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: disable tests that depend on network...
+
+--- a/src/test/Makefile.am
++++ b/src/test/Makefile.am
- @@ -230,8 +230,9 @@
-
++@@ -62,6 +62,7 @@ bin_DEBUGPROGRAMS += ceph_bench_log
+
+ ## Unit tests
+
++if WITH_CLUSTER_TESTS
+ check_SCRIPTS += \
- unittest_bufferlist.sh \
- test/encoding/check-generated.sh \
- test/mon/osd-pool-create.sh \
- @@ -243,8 +244,9 @@
++ test/ceph_objectstore_tool.py \
++ test/test-ceph-helpers.sh \
++@@ -80,6 +81,7 @@ check_SCRIPTS += \
+ test/osd/osd-bench.sh \
- test/ceph-disk.sh \
- test/mon/mon-handle-forward.sh \
- test/vstart_wrapped_tests.sh
- +endif
-
- EXTRA_DIST += \
- $(srcdir)/test/mon/mon-test-helpers.sh \
- $(srcdir)/test/osd/osd-test-helpers.sh \
- --- a/src/test/erasure-code/Makefile.am
- +++ b/src/test/erasure-code/Makefile.am
- @@ -1,6 +1,8 @@
- +if WITH_CLUSTER_TESTS
- check_SCRIPTS += \
- test/erasure-code/test-erasure-code.sh
++ test/osd/osd-copy-from.sh \
++ test/mon/mon-handle-forward.sh
++endif
+
- ceph_erasure_code_benchmark_SOURCES = \
- erasure-code/ErasureCode.cc \
- test/erasure-code/ceph_erasure_code_benchmark.cc
++ if ENABLE_ROOT_MAKE_CHECK
++ check_SCRIPTS += test/ceph-disk-root.sh
+--- a/configure.ac
++++ b/configure.ac
- @@ -951,8 +951,15 @@
- AC_LANG_POP([C++])
++@@ -1147,6 +1147,13 @@ AC_LANG_POP([C++])
+
+ AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1")
+
++AC_ARG_WITH([cluster-tests],
++ [AS_HELP_STRING([--with-cluster-tests], [enables cluster tests])],
++ [],
++ [with_cluster_tests=no]
++)
++AM_CONDITIONAL(WITH_CLUSTER_TESTS, [ test "$with_cluster_tests" = "yes" ])
++
+ AM_PATH_PYTHON([2.4],
+ [], [AC_MSG_FAILURE([Failed to find Python 2.4 or newer])])
+
- AC_CONFIG_HEADERS([src/acconfig.h])
++--- a/src/test/erasure-code/Makefile.am
+++++ b/src/test/erasure-code/Makefile.am
++@@ -1,8 +1,10 @@
++ if ENABLE_SERVER
++ if WITH_OSD
++
+++if WITH_CLUSTER_TESTS
++ check_SCRIPTS += \
++ test/erasure-code/test-erasure-code.sh
+++endif
++
++ noinst_HEADERS += \
++ test/erasure-code/ceph_erasure_code_benchmark.h
diff --cc debian/patches/use_system_jerasure.patch
index 7962d30,0000000..e1d0775
mode 100644,000000..100644
--- a/debian/patches/use_system_jerasure.patch
+++ b/debian/patches/use_system_jerasure.patch
@@@ -1,121 -1,0 +1,118 @@@
+Last-Update: 2014-12-09
+Forwarded: not-needed
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: use system "libjerasure" instead of bundled one.
+
+--- a/src/erasure-code/jerasure/Makefile.am
++++ b/src/erasure-code/jerasure/Makefile.am
- @@ -1,50 +1,22 @@
++@@ -1,40 +1,8 @@
+ # jerasure plugin
+ noinst_HEADERS += \
++- erasure-code/jerasure/gf-complete/include/gf_complete.h \
++- erasure-code/jerasure/gf-complete/include/gf_general.h \
++- erasure-code/jerasure/gf-complete/include/gf_int.h \
++- erasure-code/jerasure/gf-complete/include/gf_method.h \
++- erasure-code/jerasure/gf-complete/include/gf_rand.h \
++- erasure-code/jerasure/gf-complete/include/gf_w16.h \
++- erasure-code/jerasure/gf-complete/include/gf_w32.h \
++- erasure-code/jerasure/gf-complete/include/gf_w4.h \
++- erasure-code/jerasure/gf-complete/include/gf_w64.h \
++- erasure-code/jerasure/gf-complete/include/gf_w8.h \
+- erasure-code/jerasure/jerasure/include/cauchy.h \
+- erasure-code/jerasure/jerasure/include/galois.h \
+- erasure-code/jerasure/jerasure/include/jerasure.h \
+- erasure-code/jerasure/jerasure/include/liberation.h \
+- erasure-code/jerasure/jerasure/include/reed_sol.h \
- - erasure-code/jerasure/gf-complete/include/gf_int.h \
- - erasure-code/jerasure/gf-complete/include/gf_complete.h \
- - erasure-code/jerasure/gf-complete/include/gf_rand.h \
- - erasure-code/jerasure/gf-complete/include/gf_method.h \
- - erasure-code/jerasure/gf-complete/include/gf_general.h \
+ erasure-code/jerasure/ErasureCodeJerasure.h
+
+ jerasure_sources = \
- erasure-code/ErasureCode.cc \
++- erasure-code/ErasureCode.cc \
+- erasure-code/jerasure/jerasure/src/cauchy.c \
+- erasure-code/jerasure/jerasure/src/galois.c \
+- erasure-code/jerasure/jerasure/src/jerasure.c \
+- erasure-code/jerasure/jerasure/src/liberation.c \
+- erasure-code/jerasure/jerasure/src/reed_sol.c \
+- erasure-code/jerasure/gf-complete/src/gf_wgen.c \
+- erasure-code/jerasure/gf-complete/src/gf_method.c \
+- erasure-code/jerasure/gf-complete/src/gf_w16.c \
+- erasure-code/jerasure/gf-complete/src/gf.c \
+- erasure-code/jerasure/gf-complete/src/gf_w32.c \
+- erasure-code/jerasure/gf-complete/src/gf_w64.c \
+- erasure-code/jerasure/gf-complete/src/gf_w128.c \
+- erasure-code/jerasure/gf-complete/src/gf_general.c \
+- erasure-code/jerasure/gf-complete/src/gf_w4.c \
+- erasure-code/jerasure/gf-complete/src/gf_rand.c \
+- erasure-code/jerasure/gf-complete/src/gf_w8.c \
+ erasure-code/jerasure/ErasureCodePluginJerasure.cc \
+ erasure-code/jerasure/ErasureCodeJerasure.cc
+
- erasure-code/jerasure/ErasureCodePluginJerasure.cc: ./ceph_ver.h
++@@ -42,13 +10,11 @@ erasure-code/jerasure/ErasureCodePluginJ
+
+ libec_jerasure_generic_la_SOURCES = ${jerasure_sources}
- -libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} \
++ libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} \
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include
- +libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} \
++ -I$(includedir)/jerasure
+ libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include
++ -I$(includedir)/jerasure
+ libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
++libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_jerasure_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
-
- @@ -55,19 +27,17 @@
- ${INTEL_SSE_FLAGS} \
++@@ -85,17 +51,15 @@ libec_jerasure_sse3_la_CFLAGS = ${AM_CFL
+ ${INTEL_SSE2_FLAGS} \
+ ${INTEL_SSE3_FLAGS} \
+ ${INTEL_SSSE3_FLAGS} \
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include
++ -I$(includedir)/jerasure
+ libec_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
+ ${INTEL_SSE_FLAGS} \
+ ${INTEL_SSE2_FLAGS} \
+ ${INTEL_SSE3_FLAGS} \
+ ${INTEL_SSSE3_FLAGS} \
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include
++ -I$(includedir)/jerasure
+ libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
++libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_jerasure_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
-
- @@ -80,21 +50,19 @@
- ${INTEL_SSE3_FLAGS} \
++@@ -112,8 +76,7 @@ libec_jerasure_sse4_la_CFLAGS = ${AM_CFL
+ ${INTEL_SSSE3_FLAGS} \
+ ${INTEL_SSE4_1_FLAGS} \
+ ${INTEL_SSE4_2_FLAGS} \
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include
++ -I$(includedir)/jerasure
+ libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
+ ${INTEL_SSE_FLAGS} \
+ ${INTEL_SSE2_FLAGS} \
- ${INTEL_SSE3_FLAGS} \
++@@ -121,10 +84,9 @@ libec_jerasure_sse4_la_CXXFLAGS= ${AM_CX
+ ${INTEL_SSSE3_FLAGS} \
+ ${INTEL_SSE4_1_FLAGS} \
+ ${INTEL_SSE4_2_FLAGS} \
+- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
+- -I$(srcdir)/erasure-code/jerasure/jerasure/include
++ -I$(includedir)/jerasure
+ libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
++libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_jerasure_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
-
- @@ -104,9 +72,9 @@
- erasure-code/jerasure/ErasureCodePluginSelectJerasure.cc
++@@ -138,7 +100,7 @@ libec_jerasure_la_SOURCES = \
+ libec_jerasure_la_CFLAGS = ${AM_CFLAGS}
+ libec_jerasure_la_CXXFLAGS= ${AM_CXXFLAGS}
+ libec_jerasure_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
+-libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
++libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
+ if LINUX
+ libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list