[Pkg-ceph-commits] [ceph] 06/08: Merge tag 'upstream/10.2.9' into ubuntu/xenial
James Downing Page
jamespage at moszumanska.debian.org
Thu Feb 1 15:27:33 UTC 2018
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu/xenial
in repository ceph.
commit 255fb0060a4032fa11e5409784751244602357b7
Merge: 781a6e1 ead2a3c
Author: James Page <james.page at ubuntu.com>
Date: Tue Sep 19 12:17:32 2017 +0100
Merge tag 'upstream/10.2.9' into ubuntu/xenial
Upstream version 10.2.9
AUTHORS | 11 +
CMakeLists.txt | 2 +-
ChangeLog | 292 +++++++++++++-
ceph.spec | 11 +-
ceph.spec.in | 9 +-
configure | 20 +-
configure.ac | 2 +-
doc/Makefile | 6 +-
doc/cephfs/client-config-ref.rst | 214 ++++++++++
doc/cephfs/index.rst | 1 +
doc/man/8/crushtool.rst | 57 ++-
doc/man/8/rbdmap.rst | 95 ++++-
doc/radosgw/adminops.rst | 5 +-
doc/radosgw/multisite.rst | 5 +
man/ceph-authtool.8 | 2 +-
man/ceph-clsinfo.8 | 2 +-
man/ceph-conf.8 | 2 +-
man/ceph-create-keys.8 | 2 +-
man/ceph-debugpack.8 | 2 +-
man/ceph-dencoder.8 | 2 +-
man/ceph-deploy.8 | 2 +-
man/ceph-detect-init.8 | 2 +-
man/ceph-disk.8 | 2 +-
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 | 2 +-
man/cephfs.8 | 2 +-
man/crushtool.8 | 85 ++--
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-mirror.8 | 2 +-
man/rbd-nbd.8 | 2 +-
man/rbd-replay-many.8 | 2 +-
man/rbd-replay-prep.8 | 2 +-
man/rbd-replay.8 | 2 +-
man/rbd.8 | 2 +-
man/rbdmap.8 | 148 ++++++-
qa/suites/dummy/all/nop.yaml | 3 -
qa/suites/fs/recovery/tasks/quota.yaml | 10 +
qa/suites/rados/singleton-nomsgr/all/11429.yaml | 1 +
qa/suites/rados/singleton-nomsgr/all/16113.yaml | 1 +
.../singleton-nomsgr/all/lfn-upgrade-hammer.yaml | 1 +
.../singleton/all/ec-lost-unfound-upgrade.yaml | 2 +
.../thrash-erasure-code-isa/thrashers/default.yaml | 2 +
.../thrash-erasure-code-isa/thrashers/pggrow.yaml | 2 +
qa/suites/rados/thrash/thrashers/default.yaml | 2 +
qa/suites/rados/thrash/thrashers/pggrow.yaml | 2 +
.../firefly-client-x/basic/distros}/centos.yaml | 0
.../firefly-client-x/basic/distros/centos_7.2.yaml | 2 -
.../hammer-client-x/basic}/distros/centos.yaml | 0
.../hammer-client-x/basic/distros/centos_7.2.yaml | 2 -
.../basic/2-workload/rbd_api_tests.yaml | 2 +-
.../infernalis-client-x/basic}/distros/centos.yaml | 0
.../basic/distros/centos_7.2.yaml | 2 -
.../parallel/3-upgrade-sequence/upgrade-all.yaml | 1 +
.../3-upgrade-sequence/upgrade-osd-mds-mon.yaml | 1 +
.../1-hammer-install/hammer.yaml | 2 +
.../8-finish-upgrade/last-osds-and-monc.yaml | 1 +
.../1-hammer-install/hammer.yaml | 2 +
.../8-finish-upgrade/last-osds-and-monc.yaml | 1 +
.../stress-split/1-hammer-install/hammer.yaml | 2 +
.../8-finish-upgrade/last-osds-and-monc.yaml | 1 +
.../hammer-x/tiering/3-upgrade/upgrade.yaml | 1 +
.../hammer-x/v0-94-4-stop/v0-94-4-stop.yaml | 1 +
qa/suites/upgrade/hammer-x/v0-94-6-mon-overload/+ | 0
.../v0-94-6-mon-overload/distros/centos_7.3.yaml} | 0
.../v0-94-6-mon-overload/distros/ubuntu_14.04.yaml | 2 +
.../hammer-x/v0-94-6-mon-overload/ignore.yaml | 8 +
.../v0-94-6-mon-overload/v0-94-6-mon-overload.yaml | 65 ++++
.../point-to-point-x/point-to-point-upgrade.yaml | 36 +-
qa/tasks/ceph_manager.py | 56 ++-
qa/tasks/cephfs/mount.py | 35 +-
qa/tasks/cephfs/test_backtrace.py | 6 +-
qa/tasks/cephfs/test_data_scan.py | 19 +-
qa/tasks/cephfs/test_pool_perm.py | 22 +-
qa/tasks/cephfs/test_quota.py | 106 +++++
qa/tasks/cephfs/test_strays.py | 6 +-
qa/tasks/rados.py | 1 +
qa/tasks/swift.py | 266 +++++++++++++
qa/tasks/systemd.py | 142 +++++++
qa/tasks/util/rgw.py | 28 +-
qa/tasks/workunit.py | 119 +++---
qa/workunits/cephtool/test.sh | 3 +
qa/workunits/mon/crush_ops.sh | 9 +-
qa/workunits/rados/test-upgrade-v11.0.0.sh | 11 +-
qa/workunits/rbd/copy.sh | 3 +-
qa/workunits/rbd/rbd-nbd.sh | 4 -
qa/workunits/rbd/rbd_mirror.sh | 6 +-
src/.git_version | 4 +-
src/brag/client/ceph-brag | 5 +-
src/ceph-disk/ceph_disk/main.py | 234 ++++++-----
src/ceph_fuse.cc | 6 +-
src/ceph_mds.cc | 7 +-
src/ceph_mon.cc | 6 +-
src/ceph_osd.cc | 13 +-
src/ceph_syn.cc | 3 +-
src/civetweb/src/civetweb.c | 20 +-
src/client/Client.cc | 155 ++++++--
src/client/Client.h | 5 +-
src/cls/rgw/cls_rgw.cc | 13 +-
src/common/LogClient.cc | 12 +-
src/common/LogClient.h | 3 +-
src/common/ceph_fs.cc | 38 +-
src/common/config_opts.h | 25 +-
src/common/ipaddr.cc | 6 +-
src/common/pick_address.cc | 4 +-
src/global/global_init.cc | 23 +-
src/global/global_init.h | 9 +-
src/include/ceph_fs.h | 14 +
src/include/ipaddr.h | 2 +-
src/include/rados/rgw_file.h | 13 +-
src/librados-config.cc | 5 +-
src/libradosstriper/RadosStriperImpl.cc | 56 +--
src/librbd/ExclusiveLock.cc | 39 +-
src/librbd/ExclusiveLock.h | 4 +-
src/librbd/ImageState.cc | 29 +-
src/librbd/ImageState.h | 2 +
src/librbd/Journal.h | 2 +-
src/librbd/Operations.cc | 8 +-
src/librbd/exclusive_lock/AcquireRequest.cc | 53 +--
src/librbd/exclusive_lock/ReleaseRequest.cc | 35 +-
src/librbd/image_watcher/RewatchRequest.cc | 2 +-
src/librbd/internal.cc | 24 +-
src/librbd/librbd.cc | 14 +-
src/librbd/object_map/InvalidateRequest.cc | 4 -
src/librbd/operation/FlattenRequest.cc | 3 -
src/librbd/operation/RebuildObjectMapRequest.cc | 3 -
src/librbd/operation/ResizeRequest.cc | 3 -
src/librbd/operation/SnapshotCreateRequest.cc | 3 -
src/librbd/operation/SnapshotRemoveRequest.cc | 4 -
src/librbd/operation/SnapshotRenameRequest.cc | 4 -
src/log/Log.cc | 5 +
src/log/Log.h | 1 +
src/mds/CInode.cc | 17 +
src/mds/InoTable.cc | 12 +
src/mds/InoTable.h | 3 +
src/mds/Locker.cc | 39 +-
src/mds/Locker.h | 2 +
src/mds/MDCache.cc | 2 +
src/mds/MDCache.h | 4 +
src/mds/MDSContext.h | 4 +-
src/mds/MDSRank.cc | 42 +-
src/mds/MDSRank.h | 9 +-
src/mds/Server.cc | 56 ++-
src/mds/SessionMap.cc | 10 +
src/mds/SessionMap.h | 2 +
src/mds/StrayManager.cc | 24 +-
src/mds/StrayManager.h | 3 +
src/mon/AuthMonitor.cc | 15 +-
src/mon/AuthMonitor.h | 2 +-
src/mon/MDSMonitor.cc | 3 -
src/mon/MonClient.cc | 10 +-
src/mon/MonClient.h | 2 +-
src/mon/OSDMonitor.cc | 11 +-
src/msg/async/AsyncMessenger.cc | 3 +-
src/msg/async/net_handler.cc | 16 +
src/msg/async/net_handler.h | 1 +
src/msg/simple/Accepter.cc | 22 ++
src/msg/simple/Pipe.cc | 34 +-
src/os/ObjectMap.h | 18 +-
src/os/ObjectStore.h | 2 +
src/os/bluestore/bluefs_tool.cc | 3 +-
src/os/filestore/DBObjectMap.cc | 420 +++++++++++++-------
src/os/filestore/DBObjectMap.h | 60 ++-
src/os/filestore/FileStore.cc | 12 +-
src/os/filestore/HashIndex.cc | 11 +-
src/osd/OSD.cc | 50 ++-
src/osd/OSD.h | 15 +-
src/osd/OSDMap.cc | 1 -
src/osd/PG.cc | 226 +++++++----
src/osd/PG.h | 32 +-
src/osd/PGBackend.cc | 24 +-
src/osd/PGLog.cc | 21 +-
src/osd/PGLog.h | 6 +-
src/osd/ReplicatedBackend.cc | 6 +
src/osd/ReplicatedPG.cc | 100 +++--
src/osd/ReplicatedPG.h | 132 ++++++-
src/osd/osd_types.cc | 34 +-
src/osd/osd_types.h | 14 +-
src/osdc/Journaler.cc | 26 +-
src/osdc/Journaler.h | 13 +-
src/osdc/ObjectCacher.cc | 2 +-
src/osdc/Objecter.cc | 9 +-
src/pybind/cephfs/cephfs.pyx | 25 +-
src/pybind/rbd/rbd.pyx | 16 +-
src/rbd_replay/rbd-replay.cc | 3 +-
src/rbdmap | 110 ++++--
src/rgw/librgw.cc | 10 +-
src/rgw/rgw_acl_swift.cc | 1 +
src/rgw/rgw_admin.cc | 216 +++++------
src/rgw/rgw_bucket.cc | 124 +++++-
src/rgw/rgw_bucket.h | 4 +
src/rgw/rgw_common.h | 3 +-
src/rgw/rgw_cr_rest.h | 4 +-
src/rgw/rgw_data_sync.cc | 40 +-
src/rgw/rgw_data_sync.h | 11 +-
src/rgw/rgw_file.cc | 134 ++++++-
src/rgw/rgw_file.h | 211 ++++++++--
src/rgw/rgw_http_client.cc | 5 +-
src/rgw/rgw_http_client.h | 5 +-
src/rgw/rgw_lib.h | 2 +
src/rgw/rgw_main.cc | 11 +-
src/rgw/rgw_object_expirer.cc | 5 +-
src/rgw/rgw_op.cc | 42 +-
src/rgw/rgw_op.h | 28 ++
src/rgw/rgw_rados.cc | 103 +++--
src/rgw/rgw_rados.h | 1 +
src/rgw/rgw_rest_client.cc | 4 +-
src/rgw/rgw_rest_client.h | 23 +-
src/rgw/rgw_rest_config.cc | 16 +
src/rgw/rgw_rest_config.h | 18 +
src/rgw/rgw_rest_conn.cc | 65 ++--
src/rgw/rgw_rest_conn.h | 39 +-
src/rgw/rgw_rest_s3.cc | 62 ++-
src/rgw/rgw_rest_s3.h | 9 +
src/rgw/rgw_rest_swift.cc | 9 +-
src/rgw/rgw_rest_user.cc | 12 +-
src/rgw/rgw_swift.cc | 13 +-
src/rgw/rgw_sync.cc | 77 ++--
src/rgw/rgw_token.cc | 3 +-
src/rgw/rgw_user.cc | 17 +-
src/test/ObjectMap/CMakeLists.txt | 1 +
src/test/ObjectMap/test_keyvaluedb_iterators.cc | 2 +-
src/test/ObjectMap/test_object_map.cc | 430 +++++++++++++++++++--
src/test/TestSignalHandlers.cc | 3 +-
src/test/TestTimers.cc | 3 +-
src/test/admin_socket.cc | 16 +-
src/test/bench/small_io_bench_dumb.cc | 2 +-
src/test/bench/small_io_bench_fs.cc | 2 +-
src/test/bench/tp_bench.cc | 2 +-
src/test/bench_log.cc | 3 +-
src/test/centos-6/ceph.spec.in | 9 +-
src/test/centos-7/ceph.spec.in | 9 +-
src/test/ceph_crypto.cc | 19 +-
src/test/cli/radosgw-admin/help.t | 8 +-
src/test/common/Throttle.cc | 14 +-
src/test/common/get_command_descriptions.cc | 3 +-
src/test/common/test_async_compressor.cc | 2 +-
src/test/common/test_shared_cache.cc | 14 +-
src/test/common/test_sharedptr_registry.cc | 14 +-
src/test/compressor/test_compression_plugin.cc | 9 +-
.../compressor/test_compression_plugin_snappy.cc | 9 +-
.../compressor/test_compression_plugin_zlib.cc | 9 +-
src/test/compressor/test_compression_snappy.cc | 18 +-
src/test/compressor/test_compression_zlib.cc | 18 +-
src/test/crush/CrushWrapper.cc | 3 +-
src/test/crush/crush.cc | 17 +-
src/test/crypto_init.cc | 5 +-
src/test/erasure-code/TestErasureCode.cc | 19 +-
src/test/erasure-code/TestErasureCodeExample.cc | 17 +-
src/test/erasure-code/TestErasureCodeIsa.cc | 18 +-
src/test/erasure-code/TestErasureCodeJerasure.cc | 20 +-
src/test/erasure-code/TestErasureCodeLrc.cc | 20 +-
src/test/erasure-code/TestErasureCodePlugin.cc | 19 +-
src/test/erasure-code/TestErasureCodePluginIsa.cc | 17 +-
.../erasure-code/TestErasureCodePluginJerasure.cc | 19 +-
src/test/erasure-code/TestErasureCodePluginLrc.cc | 20 +-
src/test/erasure-code/TestErasureCodePluginShec.cc | 20 +-
src/test/erasure-code/TestErasureCodeShec.cc | 17 +-
src/test/erasure-code/TestErasureCodeShec_all.cc | 3 +-
.../erasure-code/TestErasureCodeShec_arguments.cc | 3 +-
.../erasure-code/TestErasureCodeShec_thread.cc | 19 +-
src/test/erasure-code/ceph_erasure_code.cc | 3 +-
.../erasure-code/ceph_erasure_code_benchmark.cc | 2 +-
.../erasure-code/ceph_erasure_code_benchmark.h | 1 +
.../ceph_erasure_code_non_regression.cc | 8 +-
src/test/fedora-21/ceph.spec.in | 9 +-
src/test/filestore/TestFileStore.cc | 3 +-
src/test/journal/test_main.cc | 4 +-
src/test/libcephfs/test.cc | 2 +-
src/test/librados/list.cc | 19 +-
src/test/librados/misc.cc | 33 +-
src/test/librados/tier.cc | 18 +-
src/test/librados/tmap_migrate.cc | 5 +-
src/test/librados_test_stub/LibradosTestStub.cc | 10 +-
src/test/librbd/mock/MockExclusiveLock.h | 2 -
.../object_map/test_mock_InvalidateRequest.cc | 9 -
.../librbd/object_map/test_mock_ResizeRequest.cc | 2 -
.../object_map/test_mock_SnapshotRemoveRequest.cc | 3 -
.../test_mock_SnapshotRollbackRequest.cc | 3 -
.../librbd/object_map/test_mock_UpdateRequest.cc | 3 -
.../librbd/operation/test_mock_ResizeRequest.cc | 3 -
.../operation/test_mock_SnapshotCreateRequest.cc | 6 -
src/test/librbd/test_librbd.cc | 234 ++++++++++-
src/test/librgw_file.cc | 6 +-
src/test/librgw_file_gp.cc | 3 +-
src/test/librgw_file_nfsns.cc | 8 +-
src/test/mds/TestMDSAuthCaps.cc | 18 +-
src/test/messenger/simple_client.cc | 5 +-
src/test/messenger/simple_server.cc | 5 +-
src/test/messenger/xio_client.cc | 5 +-
src/test/mon/PGMap.cc | 17 +-
src/test/mon/test-mon-msg.cc | 7 +-
src/test/mon/test_mon_workloadgen.cc | 6 +-
src/test/msgr/perf_msgr_client.cc | 3 +-
src/test/msgr/perf_msgr_server.cc | 3 +-
src/test/msgr/test_async_driver.cc | 13 +-
src/test/msgr/test_msgr.cc | 2 +-
.../objectstore/ObjectStoreTransactionBenchmark.cc | 3 +-
src/test/objectstore/TestRocksdbOptionParse.cc | 14 +-
src/test/objectstore/chain_xattr.cc | 3 +-
src/test/objectstore/store_test.cc | 7 +-
src/test/objectstore/test_bluefs.cc | 8 +-
src/test/objectstore/test_idempotent.cc | 3 +-
src/test/objectstore/test_idempotent_sequence.cc | 6 +-
src/test/objectstore/test_kv.cc | 3 +-
src/test/objectstore/workload_generator.cc | 6 +-
src/test/objectstore_bench.cc | 3 +-
src/test/opensuse-13.2/ceph.spec.in | 9 +-
src/test/os/TestLFNIndex.cc | 3 +-
src/test/osd/TestOSDMap.cc | 6 +-
src/test/osd/TestOSDScrub.cc | 15 +-
src/test/osd/TestPGLog.cc | 15 +-
src/test/osd/osd-scrub-repair.sh | 106 ++---
src/test/osdc/object_cacher_stress.cc | 3 +-
src/test/perf_counters.cc | 5 +-
src/test/perf_local.cc | 3 +-
src/test/rbd_mirror/random_write.cc | 17 +-
src/test/rgw/test_rgw_period_history.cc | 3 +-
src/test/signals.cc | 1 +
src/test/test_arch.cc | 16 +-
src/test/test_cors.cc | 5 +-
src/test/test_filejournal.cc | 3 +-
src/test/test_ipaddr.cc | 60 +--
src/test/test_mutate.cc | 3 +-
src/test/test_rgw_admin_log.cc | 3 +-
src/test/test_rgw_admin_meta.cc | 3 +-
src/test/test_rgw_admin_opstate.cc | 3 +-
src/test/test_snap_mapper.cc | 16 +-
src/test/test_striper.cc | 19 +-
src/test/test_trans.cc | 3 +-
src/test/test_workqueue.cc | 18 +-
src/test/testkeys.cc | 3 +-
src/test/unit.h | 17 +-
src/test/xattr_bench.cc | 3 +-
src/tools/ceph-client-debug.cc | 5 +-
src/tools/ceph_authtool.cc | 5 +-
src/tools/ceph_conf.cc | 6 +
src/tools/ceph_kvstore_tool.cc | 2 +-
src/tools/ceph_monstore_tool.cc | 2 +-
src/tools/ceph_objectstore_tool.cc | 67 ++--
src/tools/ceph_osdomap_tool.cc | 53 ++-
src/tools/cephfs/DataScan.cc | 4 +
src/tools/cephfs/cephfs-data-scan.cc | 3 +-
src/tools/cephfs/cephfs-journal-tool.cc | 3 +-
src/tools/cephfs/cephfs-table-tool.cc | 3 +-
src/tools/crushtool.cc | 90 ++---
src/tools/monmaptool.cc | 5 +-
src/tools/osdmaptool.cc | 5 +-
src/tools/rados/RadosImport.cc | 6 +-
src/tools/rados/rados.cc | 3 +-
src/tools/rbd/action/MirrorPool.cc | 13 +
src/tools/rbd/action/Rename.cc | 2 +-
src/tools/rbd/rbd.cc | 3 +-
src/tools/rbd_mirror/main.cc | 7 +-
src/tools/rbd_nbd/rbd-nbd.cc | 76 +++-
systemd/ceph-osd at .service | 2 +-
systemd/rbdmap.service | 2 +-
371 files changed, 5828 insertions(+), 2334 deletions(-)
--
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