[Pkg-ceph-commits] [ceph] 33/59: Merge tag 'upstream/12.1.2' into ubuntu/artful

James Downing Page jamespage at moszumanska.debian.org
Thu Feb 1 15:27:55 UTC 2018


This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu/artful
in repository ceph.

commit 43f78c3ec97a2989ec5f290919543eee8f02d328
Merge: 456227b 6f3bd8b
Author: James Page <james.page at ubuntu.com>
Date:   Mon Aug 7 10:11:55 2017 +0000

    Merge tag 'upstream/12.1.2' into ubuntu/artful
    
    Upstream version 12.1.2

 .mailmap                                           |    3 +
 .organizationmap                                   |   10 +-
 AUTHORS                                            |    2 +-
 CMakeLists.txt                                     |    2 +-
 PendingReleaseNotes                                |   37 +
 README.md                                          |   10 +-
 SubmittingPatches.rst                              |   20 +-
 alpine/APKBUILD                                    |    6 +-
 ceph.spec                                          |   43 +-
 ceph.spec.in                                       |   37 +-
 do_cmake.sh                                        |    2 +-
 doc/cephfs/administration.rst                      |   10 +-
 doc/cephfs/disaster-recovery.rst                   |   25 +-
 doc/cephfs/experimental-features.rst               |    2 +-
 doc/cephfs/journaler.rst                           |    2 +-
 doc/cephfs/mantle.rst                              |    6 +-
 doc/cephfs/multimds.rst                            |    5 +-
 doc/cephfs/troubleshooting.rst                     |   12 +-
 doc/dev/ceph-disk.rst                              |   61 +
 doc/dev/config.rst                                 |   69 +-
 doc/dev/development-workflow.rst                   |    7 +-
 doc/dev/documenting.rst                            |   26 +-
 doc/dev/index.rst                                  |   20 +-
 doc/dev/perf_counters.rst                          |    2 +-
 doc/dev/quick_guide.rst                            |   29 +-
 doc/install/install-ceph-gateway.rst               |    6 +-
 doc/install/manual-deployment.rst                  |  125 +-
 doc/install/manual-freebsd-deployment.rst          |    2 +-
 doc/man/8/ceph-create-keys.rst                     |    2 +-
 doc/man/8/ceph-rest-api.rst                        |    2 +-
 doc/man/8/ceph.rst                                 |  119 +-
 doc/man/8/rados.rst                                |    4 +-
 doc/man/8/rbd.rst                                  |   79 +-
 doc/man/8/rbdmap.rst                               |    2 +-
 doc/mgr/administrator.rst                          |   15 +-
 doc/mgr/dashboard.rst                              |    8 +-
 doc/mgr/index.rst                                  |    7 +-
 doc/mgr/prometheus.rst                             |   50 +
 doc/mgr/restful.rst                                |   16 +-
 doc/mgr/zabbix.rst                                 |   20 +-
 doc/rados/api/librados.rst                         |    2 +-
 doc/rados/configuration/ceph-conf.rst              |   98 +
 doc/rados/configuration/mon-config-ref.rst         |    6 +-
 doc/rados/configuration/ms-ref.rst                 |    4 +-
 doc/rados/configuration/network-config-ref.rst     |    4 +-
 doc/rados/configuration/osd-config-ref.rst         |  313 +-
 doc/rados/deployment/ceph-deploy-keys.rst          |    2 +-
 doc/rados/operations/add-or-rm-mons.rst            |    4 +-
 doc/rados/operations/add-or-rm-osds.rst            |   72 +-
 doc/rados/operations/control.rst                   |   14 +-
 doc/rados/operations/crush-map-edits.rst           |  654 +++
 doc/rados/operations/crush-map.rst                 | 1157 ++--
 doc/rados/operations/health-checks.rst             |  545 ++
 doc/rados/operations/index.rst                     |    3 +
 doc/rados/operations/monitoring-osd-pg.rst         |   18 +-
 doc/rados/operations/monitoring.rst                |  215 +-
 doc/rados/operations/pg-repair.rst                 |    4 +
 doc/rados/operations/pg-states.rst                 |    6 +
 doc/rados/operations/placement-groups.rst          |   32 +-
 doc/rados/operations/pools.rst                     |   25 +-
 doc/rados/operations/upmap.rst                     |   75 +
 doc/rados/operations/user-management.rst           |   56 +-
 doc/rados/troubleshooting/troubleshooting-mon.rst  |   16 +-
 doc/rados/troubleshooting/troubleshooting-osd.rst  |    6 +-
 doc/rados/troubleshooting/troubleshooting-pg.rst   |    6 +-
 doc/radosgw/multitenancy.rst                       |    4 +-
 doc/radosgw/s3/bucketops.rst                       |    4 +-
 doc/radosgw/s3/perl.rst                            |    4 +-
 doc/radosgw/swift/containerops.rst                 |    2 +-
 doc/radosgw/swift/objectops.rst                    |    2 +-
 doc/rbd/librbdpy.rst                               |    2 +-
 doc/rbd/libvirt.rst                                |   16 +-
 doc/rbd/rados-rbd-cmds.rst                         |  116 +-
 doc/rbd/rbd-cloudstack.rst                         |    7 +-
 doc/rbd/rbd-openstack.rst                          |   26 +-
 doc/release-notes.rst                              |  114 +-
 doc/releases.rst                                   |   12 +-
 doc/start/documenting-ceph.rst                     |    4 +-
 doc/start/hardware-recommendations.rst             |    2 +-
 doc/start/index.rst                                |    2 +-
 doc/start/quick-ceph-deploy.rst                    |    4 +-
 doc/start/quick-rbd.rst                            |   13 +-
 doc/start/quick-start-preflight.rst                |    2 +-
 install-deps.sh                                    |   20 +-
 .../overrides/whitelist_wrongly_marked_down.yaml   |    2 +-
 qa/machine_types/schedule_subset.sh                |    3 +
 qa/objectstore/bluestore.yaml                      |   18 +
 qa/objectstore/filestore-xfs.yaml                  |    8 +
 qa/overrides/whitelist_wrongly_marked_down.yaml    |    2 +-
 qa/run-standalone.sh                               |   25 +
 qa/standalone/README                               |   18 +
 qa/{workunits => standalone}/ceph-helpers.sh       |  195 +-
 .../standalone}/crush/crush-choose-args.sh         |   17 +-
 qa/standalone/crush/crush-classes.sh               |  252 +
 .../erasure-code/test-erasure-code-plugins.sh      |   40 +-
 .../standalone}/erasure-code/test-erasure-code.sh  |   10 +-
 .../standalone}/erasure-code/test-erasure-eio.sh   |   11 +-
 .../standalone/misc}/rados-striper.sh              |   22 +-
 .../standalone/misc}/test-ceph-helpers.sh          |    3 +-
 {src/test => qa/standalone}/mon/misc.sh            |    4 +-
 {src/test => qa/standalone}/mon/mkfs.sh            |   20 +-
 {src/test => qa/standalone}/mon/mon-bind.sh        |   19 +-
 .../test => qa/standalone}/mon/mon-created-time.sh |    5 +-
 .../standalone}/mon/mon-handle-forward.sh          |   17 +-
 {src/test => qa/standalone}/mon/mon-ping.sh        |    3 +-
 {src/test => qa/standalone}/mon/mon-scrub.sh       |    3 +-
 {src/test => qa/standalone}/mon/osd-crush.sh       |   14 +-
 .../standalone}/mon/osd-erasure-code-profile.sh    |   15 +-
 {src/test => qa/standalone}/mon/osd-pool-create.sh |   20 +-
 {src/test => qa/standalone}/mon/test_pool_quota.sh |   11 +-
 {src/test => qa/standalone}/osd/osd-bench.sh       |    3 +-
 {src/test => qa/standalone}/osd/osd-config.sh      |   21 +-
 {src/test => qa/standalone}/osd/osd-copy-from.sh   |    4 +-
 {src/test => qa/standalone}/osd/osd-dup.sh         |    3 +-
 .../standalone}/osd/osd-fast-mark-down.sh          |   31 +-
 {src/test => qa/standalone}/osd/osd-markdown.sh    |    5 +-
 {src/test => qa/standalone}/osd/osd-reactivate.sh  |    3 +-
 {src/test => qa/standalone}/osd/osd-reuse-id.sh    |    5 +-
 .../standalone/scrub}/osd-scrub-repair.sh          |   47 +-
 .../osd => qa/standalone/scrub}/osd-scrub-snaps.sh |    5 +-
 qa/suites/big/rados-thrash/thrashers/default.yaml  |    2 +-
 qa/suites/ceph-deploy/basic/ceph-deploy-overrides  |    1 -
 .../ceph-deploy-overrides/ceph_deploy_dmcrypt.yaml |    0
 .../disable_diff_journal_disk.yaml                 |    0
 .../enable_diff_journal_disk.yaml                  |    0
 .../enable_dmcrypt_diff_journal_disk.yaml          |    0
 qa/suites/ceph-deploy/basic/config_options         |    1 -
 .../basic}/config_options/cephdeploy_conf.yaml     |    0
 .../ceph-deploy/basic/objectstore/bluestore.yaml   |    1 +
 .../basic/objectstore/filestore-xfs.yaml           |    1 +
 .../fs/basic_functional/tasks/client-recovery.yaml |    2 +-
 qa/suites/fs/basic_functional/tasks/data-scan.yaml |    1 +
 .../kcephfs/recovery/tasks/client-recovery.yaml    |    2 +-
 qa/suites/kcephfs/thrash/thrashers/default.yaml    |    2 +-
 qa/suites/krbd/thrash/ceph/ceph.yaml               |    3 +
 .../thrash/thrashers/backoff.yaml}                 |    4 +
 qa/suites/krbd/thrash/thrashers/default.yaml       |    7 -
 qa/suites/krbd/thrash/thrashers/mon-thrasher.yaml  |    2 -
 .../thrash/thrashers/pggrow.yaml}                  |    4 +-
 .../thrash/thrashers/upmap.yaml}                   |   13 +-
 qa/suites/krbd/thrash/thrashosds-health.yaml       |    1 +
 qa/suites/krbd/thrash/workloads/rbd_fio.yaml       |    6 +-
 .../rbd_workunit_suites_iozone.yaml.disabled       |    8 -
 .../powercycle/osd/tasks/rados_api_tests.yaml      |    1 +
 qa/suites/powercycle/osd/whitelist_health.yaml     |    4 +
 qa/suites/rados/basic/tasks/rados_api_tests.yaml   |    3 +-
 qa/suites/rados/basic/tasks/rados_python.yaml      |    2 +-
 .../basic/tasks/rados_workunit_loadgen_big.yaml    |    4 +-
 .../basic/tasks/rados_workunit_loadgen_mix.yaml    |    4 +-
 .../tasks/rados_workunit_loadgen_mostlyread.yaml   |    4 +-
 qa/suites/rados/basic/tasks/repair_test.yaml       |    2 +-
 qa/suites/rados/basic/tasks/rgw_snaps.yaml         |   16 +-
 .../rados/monthrash/msgr-failures/mon-delay.yaml   |    2 +
 .../monthrash/workloads/pool-create-delete.yaml    |    2 +
 .../rados/monthrash/workloads/rados_5925.yaml      |    5 +
 .../rados/monthrash/workloads/rados_api_tests.yaml |    1 +
 .../monthrash/workloads/rados_mon_workunits.yaml   |    2 +-
 qa/suites/rados/rest/mgr-restful.yaml              |    4 +-
 .../rados/singleton-bluestore/all/cephtool.yaml    |    2 +-
 .../singleton-nomsgr/all/export-after-evict.yaml   |    1 +
 .../rados/singleton-nomsgr/all/full-tiering.yaml   |    1 +
 .../singleton-nomsgr/all/health-warnings.yaml      |    2 +-
 .../all/multi-backfill-reject.yaml                 |    1 +
 qa/suites/rados/singleton/all/admin-socket.yaml    |    1 +
 qa/suites/rados/singleton/all/dump-stuck.yaml      |    2 +-
 ...-rados.yaml => erasure-code-nonregression.yaml} |   12 +-
 qa/suites/rados/singleton/all/mon-thrasher.yaml    |   30 -
 qa/suites/rados/singleton/all/osd-backfill.yaml    |    2 +-
 .../singleton/all/osd-recovery-incomplete.yaml     |    2 +-
 qa/suites/rados/singleton/all/osd-recovery.yaml    |    2 +-
 .../singleton/all/pg-removal-interruption.yaml     |    3 +-
 qa/suites/rados/singleton/all/radostool.yaml       |    3 +-
 qa/suites/rados/singleton/all/random-eio.yaml      |    2 +
 qa/suites/rados/singleton/all/rest-api.yaml        |    2 +-
 .../all/test_envlibrados_for_rocksdb.yaml          |    3 +
 qa/suites/rados/singleton/all/thrash-eio.yaml      |    2 +-
 .../singleton/all/thrash-rados/thrash-rados.yaml   |    2 +-
 .../all/thrash_cache_writeback_proxy_none.yaml     |    3 +-
 qa/suites/rados/singleton/msgr-failures/many.yaml  |    2 +
 .../thrash-rados.yaml => standalone/crush.yaml}    |   13 +-
 .../erasure-code.yaml}                             |   13 +-
 .../thrash-rados.yaml => standalone/misc.yaml}     |   13 +-
 .../thrash-rados.yaml => standalone/mon.yaml}      |   13 +-
 .../thrash-rados.yaml => standalone/osd.yaml}      |   13 +-
 .../thrash-rados.yaml => standalone/scrub.yaml}    |   13 +-
 .../thrash-erasure-code-big/thrashers/default.yaml |    2 +-
 .../thrashers/fastread.yaml                        |    2 +-
 .../thrash-erasure-code-big/thrashers/mapgap.yaml  |    2 +-
 .../thrashers/morepggrow.yaml                      |    2 +-
 .../thrash-erasure-code-big/thrashers/pggrow.yaml  |    2 +-
 .../thrashers/default.yaml                         |    2 +-
 .../thrash-erasure-code/thrashers/default.yaml     |    2 +-
 .../thrash-erasure-code/thrashers/fastread.yaml    |    2 +-
 .../thrash-erasure-code/thrashers/mapgap.yaml      |    2 +-
 .../thrash-erasure-code/thrashers/morepggrow.yaml  |    2 +-
 .../thrash-erasure-code/thrashers/pggrow.yaml      |    2 +-
 .../rados/thrash/d-require-luminous/at-end.yaml    |    7 +
 qa/suites/rados/thrash/thrashers/default.yaml      |    2 +-
 qa/suites/rados/thrash/thrashers/mapgap.yaml       |    2 +-
 qa/suites/rados/thrash/thrashers/morepggrow.yaml   |    2 +-
 qa/suites/rados/thrash/thrashers/pggrow.yaml       |    2 +-
 .../rados/thrash/workloads/cache-agent-big.yaml    |    1 +
 .../rados/thrash/workloads/cache-agent-small.yaml  |    1 +
 .../workloads/cache-pool-snaps-readproxy.yaml      |    1 +
 .../rados/thrash/workloads/cache-pool-snaps.yaml   |    1 +
 qa/suites/rados/thrash/workloads/cache-snaps.yaml  |    1 +
 qa/suites/rados/thrash/workloads/cache.yaml        |    1 +
 .../rados/thrash/workloads/rados_api_tests.yaml    |    1 +
 .../2-partial-upgrade/firsthalf.yaml               |    2 +
 .../jewel-x-singleton/3-thrash/default.yaml        |    3 +-
 .../rados/verify/d-thrash/default/default.yaml     |    2 +-
 qa/suites/rados/verify/tasks/mon_recovery.yaml     |    1 +
 qa/suites/rados/verify/tasks/rados_api_tests.yaml  |    1 +
 qa/suites/rbd/cli/pool/ec-data-pool.yaml           |    1 +
 qa/suites/rbd/cli/pool/replicated-data-pool.yaml   |    1 +
 qa/suites/rbd/librbd/msgr-failures/few.yaml        |    2 +-
 .../rbd/librbd/pool/replicated-data-pool.yaml      |    1 +
 .../workloads/rbd-mirror-ha-workunit.yaml          |    5 +
 .../rbd/mirror/rbd-mirror/one-per-cluster.yaml     |    5 +
 qa/suites/rbd/qemu/msgr-failures/few.yaml          |    2 +-
 qa/suites/rbd/qemu/pool/ec-cache-pool.yaml         |    1 +
 qa/suites/rbd/qemu/pool/ec-data-pool.yaml          |    1 +
 qa/suites/rbd/qemu/pool/replicated-data-pool.yaml  |    1 +
 qa/suites/rbd/thrash/thrashers/cache.yaml          |    2 +-
 qa/suites/rbd/thrash/thrashers/default.yaml        |    2 +-
 qa/suites/rest/basic/tasks/rest_test.yaml          |    2 +-
 qa/suites/smoke/basic/tasks/mon_thrash.yaml        |    1 +
 qa/suites/smoke/basic/tasks/rados_api_tests.yaml   |    3 +-
 qa/suites/smoke/basic/tasks/rados_bench.yaml       |    2 +-
 qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml |    3 +-
 qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml    |    2 +-
 qa/suites/smoke/basic/tasks/rados_python.yaml      |    2 +-
 qa/suites/stress/thrash/thrashers/default.yaml     |    2 +-
 qa/suites/stress/thrash/thrashers/fast.yaml        |    2 +-
 qa/suites/stress/thrash/thrashers/more-down.yaml   |    2 +-
 .../hammer-jewel-x/parallel/0-cluster/start.yaml   |    1 +
 .../hammer-jewel-x/tiering/0-cluster/start.yaml    |    1 +
 .../0-create-base-tier/create-ec-pool.yaml         |    1 +
 .../0-create-base-tier/create-replicated-pool.yaml |    1 +
 .../jewel-x/parallel/1-jewel-install/jewel.yaml    |    4 +
 .../point-to-point-x/point-to-point-upgrade.yaml   |    4 +-
 .../3-thrash/default.yaml                          |    2 +
 .../thrashosds-health.yaml                         |    1 +
 .../jewel-x/stress-split/3-thrash/default.yaml     |    2 +
 .../jewel-x/stress-split/thrashosds-health.yaml    |    1 +
 .../upgrade/kraken-x/parallel/0-cluster/start.yaml |    2 +
 .../3-thrash/default.yaml                          |    2 +
 .../kraken-x/stress-split/3-thrash/default.yaml    |    2 +
 qa/tasks/ceph.py                                   |   77 +-
 qa/tasks/ceph_deploy.py                            |    9 +
 qa/tasks/ceph_manager.py                           |  123 +-
 qa/tasks/cephfs/cephfs_test_case.py                |    6 +-
 qa/tasks/cephfs/fuse_mount.py                      |    9 +
 qa/tasks/cephfs/kernel_mount.py                    |   12 +-
 qa/tasks/cephfs/test_client_limits.py              |    8 +-
 qa/tasks/cephfs/test_failover.py                   |    6 +-
 qa/tasks/cephfs/test_strays.py                     |    9 +-
 qa/tasks/dump_stuck.py                             |    1 +
 qa/tasks/mds_thrash.py                             |    4 +-
 qa/tasks/rbd_fio.py                                |   70 +-
 qa/tasks/reg11184.py                               |    7 +-
 qa/tasks/repair_test.py                            |    4 +-
 qa/tasks/thrashosds.py                             |    2 +-
 qa/tasks/vstart_runner.py                          |    2 +-
 qa/tasks/workunit.py                               |   29 +-
 qa/workunits/ceph-disk/ceph-disk-test.py           |    6 +-
 qa/workunits/ceph-disk/ceph-disk.sh                |    6 +-
 qa/workunits/ceph-helpers-root.sh                  |    1 +
 qa/workunits/cephtool/test.sh                      |  144 +-
 .../erasure-code/encode-decode-non-regression.sh   |    1 -
 qa/workunits/mon/auth_caps.sh                      |    2 +-
 qa/workunits/mon/caps.py                           |    6 +-
 qa/workunits/mon/caps.sh                           |    8 +-
 qa/workunits/mon/crush_ops.sh                      |   33 +-
 qa/workunits/mon/rbd_snaps_ops.sh                  |    2 +
 qa/workunits/mon/workloadgen.sh                    |  169 -
 qa/workunits/rados/test_alloc_hint.sh              |    2 +
 qa/workunits/rados/test_cache_pool.sh              |    2 +
 qa/workunits/rados/test_health_warnings.sh         |    2 -
 qa/workunits/rados/test_pool_quota.sh              |    2 +
 qa/workunits/rbd/cli_generic.sh                    |    1 +
 qa/workunits/rbd/journal.sh                        |    2 +-
 qa/workunits/rbd/krbd_data_pool.sh                 |    4 +
 qa/workunits/rbd/permissions.sh                    |    2 +
 qa/workunits/rbd/rbd-nbd.sh                        |    2 +-
 qa/workunits/rbd/rbd_mirror.sh                     |   24 +-
 qa/workunits/rbd/rbd_mirror_helpers.sh             |   34 +-
 qa/workunits/rbd/run_devstack_tempest.sh           |    5 +
 qa/workunits/rbd/test_admin_socket.sh              |    2 +-
 qa/workunits/rbd/verify_pool.sh                    |    1 +
 run-make-check.sh                                  |    5 +-
 src/.git_version                                   |    4 +-
 src/CMakeLists.txt                                 |   12 +-
 src/auth/AuthSessionHandler.cc                     |   11 -
 src/auth/AuthSessionHandler.h                      |   18 +-
 src/auth/cephx/CephxSessionHandler.cc              |    7 -
 src/brag/client/ceph-brag                          |    4 +-
 src/ceph-disk/ceph_disk/main.py                    |  362 +-
 src/ceph-disk/tests/ceph-disk.sh                   |  165 +-
 src/ceph-disk/tests/test_main.py                   |   35 +-
 src/ceph-disk/tests/test_prepare.py                |   36 +-
 src/ceph.in                                        |   28 +-
 src/ceph_fuse.cc                                   |    6 +-
 src/ceph_mgr.cc                                    |    2 +-
 src/ceph_mon.cc                                    |    6 +-
 src/ceph_syn.cc                                    |   10 +-
 src/client/Client.cc                               |   30 +-
 src/client/SyntheticClient.cc                      |   10 +-
 src/client/SyntheticClient.h                       |    1 +
 src/cls/journal/cls_journal.cc                     |   22 +-
 src/cls/log/cls_log.cc                             |   26 +-
 src/cls/lua/cls_lua.cc                             |    6 +-
 src/cls/rbd/cls_rbd.cc                             |  134 +-
 src/cls/rbd/cls_rbd_client.cc                      |    8 +-
 src/cls/rbd/cls_rbd_client.h                       |    4 +-
 src/cls/refcount/cls_refcount.cc                   |   24 +-
 src/cls/rgw/cls_rgw.cc                             |  588 +-
 src/cls/rgw/cls_rgw_client.cc                      |   26 +
 src/cls/rgw/cls_rgw_client.h                       |   16 +
 src/cls/rgw/cls_rgw_ops.h                          |    9 +-
 src/cls/rgw/cls_rgw_types.cc                       |   10 +
 src/cls/rgw/cls_rgw_types.h                        |   11 +-
 src/cls/statelog/cls_statelog.cc                   |   16 +-
 src/cls/timeindex/cls_timeindex.cc                 |   22 +-
 src/cls/user/cls_user.cc                           |   19 +-
 src/common/OutputDataSocket.cc                     |    3 +-
 src/common/Throttle.cc                             |   73 +-
 src/common/Throttle.h                              |    6 +
 src/common/TrackedOp.cc                            |   34 +-
 src/common/TrackedOp.h                             |   16 +-
 src/common/WorkQueue.cc                            |    8 +-
 src/common/buffer.cc                               |    9 +-
 src/common/ceph_context.cc                         |   30 +-
 src/common/ceph_context.h                          |    5 +-
 src/common/cmdparse.cc                             |   22 +-
 src/common/cmdparse.h                              |    3 +-
 src/common/cohort_lru.h                            |    4 +-
 src/common/common_init.cc                          |   48 +-
 src/common/config.cc                               |  664 ++-
 src/common/config.h                                |  205 +-
 src/common/config_opts.h                           | 1800 -------
 src/common/config_validators.cc                    |   88 -
 src/common/config_validators.h                     |   21 -
 src/common/dout.h                                  |    9 +-
 src/common/legacy_config_opts.h                    | 1713 ++++++
 src/common/options.cc                              | 5673 ++++++++++++++++++++
 src/common/options.h                               |  268 +
 src/common/perf_counters.h                         |    6 +-
 src/common/subsys.h                                |   78 +
 src/compressor/Compressor.cc                       |    2 +-
 src/crush/CrushCompiler.cc                         |   36 +-
 src/crush/CrushTester.cc                           |    4 +-
 src/crush/CrushTreeDumper.h                        |   78 +-
 src/crush/CrushWrapper.cc                          |  607 ++-
 src/crush/CrushWrapper.h                           |  255 +-
 src/crush/grammar.h                                |    2 +-
 src/crush/mapper.c                                 |    3 +-
 src/erasure-code/lrc/ErasureCodeLrc.cc             |    8 +-
 src/include/CMakeLists.txt                         |    8 +-
 src/include/assert.h                               |   24 +-
 src/include/ceph_features.h                        |   15 +-
 src/include/coredumpctl.h                          |   10 +-
 src/include/encoding.h                             |   16 -
 src/include/int_types.h                            |   12 +
 src/include/rados.h                                |    2 +
 src/include/rados/librados.h                       |   97 +-
 src/include/rados/librados.hpp                     |   15 +
 src/include/rados/rgw_file.h                       |   10 +-
 src/include/rbd/librbd.h                           |   11 +
 src/include/rbd/librbd.hpp                         |    5 +
 src/include/uuid.h                                 |    3 +
 src/key_value_store/cls_kvs.cc                     |   16 +-
 src/kv/LevelDBStore.cc                             |    2 +-
 src/kv/RocksDBStore.cc                             |   60 +-
 src/kv/RocksDBStore.h                              |    4 +-
 src/libcephd/CMakeLists.txt                        |   13 +-
 src/librados/IoCtxImpl.cc                          |  165 +
 src/librados/IoCtxImpl.h                           |   15 +
 src/librados/RadosClient.cc                        |   28 +-
 src/librados/RadosClient.h                         |    5 +
 src/librados/librados.cc                           |  206 +-
 src/libradosstriper/RadosStriperImpl.cc            |   10 +-
 src/librbd/ImageCtx.cc                             |    3 +
 src/librbd/api/Mirror.cc                           |    2 +-
 src/librbd/cache/ImageCache.h                      |    6 +
 src/librbd/cache/ImageWriteback.cc                 |   21 +
 src/librbd/cache/ImageWriteback.h                  |    6 +-
 src/librbd/cache/PassthroughImageCache.cc          |   16 +
 src/librbd/cache/PassthroughImageCache.h           |    4 +
 src/librbd/image/CloneRequest.cc                   |    5 +-
 src/librbd/image/CreateRequest.cc                  |    3 +-
 src/librbd/image/OpenRequest.cc                    |    8 +-
 src/librbd/internal.cc                             |   43 +-
 src/librbd/internal.h                              |    4 +
 src/librbd/io/AioCompletion.cc                     |    2 +
 src/librbd/io/ImageRequest.cc                      |  140 +-
 src/librbd/io/ImageRequest.h                       |   62 +-
 src/librbd/io/ImageRequestWQ.cc                    |   73 +
 src/librbd/io/ImageRequestWQ.h                     |    7 +
 src/librbd/io/ObjectRequest.cc                     |   84 +
 src/librbd/io/ObjectRequest.h                      |   54 +-
 src/librbd/io/Types.h                              |    1 +
 src/librbd/journal/Replay.cc                       |   50 +-
 src/librbd/journal/Replay.h                        |   17 +-
 src/librbd/journal/Types.cc                        |   29 +
 src/librbd/journal/Types.h                         |  104 +-
 src/librbd/librbd.cc                               |   94 +
 src/log/SubsystemMap.h                             |    2 +-
 src/mds/CInode.cc                                  |   26 +-
 src/mds/FSMap.cc                                   |    6 +
 src/mds/Locker.cc                                  |   19 +-
 src/mds/Locker.h                                   |    2 +-
 src/mds/MDCache.cc                                 |   31 +-
 src/mds/MDLog.cc                                   |    6 +-
 src/mds/MDSDaemon.cc                               |   89 +-
 src/mds/MDSMap.h                                   |    7 +-
 src/mds/MDSRank.cc                                 |   10 +-
 src/mds/MDSRank.h                                  |    1 +
 src/mds/Migrator.cc                                |  148 +-
 src/mds/PurgeQueue.cc                              |   18 +-
 src/mds/PurgeQueue.h                               |    1 +
 src/mds/Server.cc                                  |   16 +-
 src/mds/StrayManager.cc                            |   25 +-
 src/mds/events/EFragment.h                         |    4 +-
 src/mds/events/EImportStart.h                      |    2 +-
 src/mds/events/EMetaBlob.h                         |    4 +-
 src/mds/events/ESession.h                          |    4 +-
 src/messages/MMgrBeacon.h                          |   33 +-
 src/messages/MOSDForceRecovery.h                   |   83 +
 src/messages/MOSDPGInfo.h                          |    4 +-
 src/messages/MOSDPGLog.h                           |    1 +
 src/messages/MOSDPGNotify.h                        |    4 +-
 src/messages/MOSDPGQuery.h                         |    4 +-
 src/messages/MOSDPGRecoveryDelete.h                |   90 +
 src/messages/MOSDPGRecoveryDeleteReply.h           |   60 +
 src/messages/MOSDPGRemove.h                        |    4 +-
 src/messages/MOSDPing.h                            |    7 +-
 src/messages/MOSDRepOp.h                           |    1 +
 src/messages/MOSDRepOpReply.h                      |    1 +
 src/mgr/DaemonServer.cc                            |  261 +-
 src/mgr/DaemonServer.h                             |    8 +-
 src/mgr/DaemonState.cc                             |    3 +-
 src/mgr/DaemonState.h                              |    2 +
 src/mgr/Mgr.cc                                     |   18 +-
 src/mgr/Mgr.h                                      |    4 +-
 src/mgr/MgrClient.cc                               |    9 +-
 src/mgr/MgrCommands.h                              |   21 +-
 src/mgr/MgrPyModule.cc                             |    4 +
 src/mgr/MgrPyModule.h                              |    9 +
 src/mgr/MgrStandby.cc                              |   30 +-
 src/mgr/MgrStandby.h                               |    2 +
 src/mgr/PyModules.cc                               |  103 +-
 src/mgr/PyModules.h                                |   18 +-
 src/mgr/PyState.cc                                 |  121 +-
 src/mgr/ServiceMap.h                               |   15 +-
 src/mgr/mgr_commands.cc                            |   14 +
 src/mgr/mgr_commands.h                             |    9 +
 src/mon/AuthMonitor.cc                             |    5 +-
 src/mon/CMakeLists.txt                             |    3 +-
 src/mon/ConfigKeyService.cc                        |    6 +-
 src/mon/FSCommands.cc                              |   72 +-
 src/mon/FSCommands.h                               |    7 +-
 src/mon/HealthMonitor.cc                           |   82 +-
 src/mon/HealthMonitor.h                            |    1 -
 src/mon/LogMonitor.cc                              |    9 +-
 src/mon/MDSMonitor.cc                              |  102 +-
 src/mon/MDSMonitor.h                               |    5 +-
 src/mon/MgrMap.h                                   |   23 +
 src/mon/MgrMonitor.cc                              |  190 +-
 src/mon/MgrMonitor.h                               |   21 +
 src/mon/MonCap.cc                                  |  154 +-
 src/mon/MonCap.h                                   |   14 +-
 src/mon/MonClient.cc                               |   31 +-
 src/mon/MonClient.h                                |    1 +
 src/mon/MonCommand.h                               |  127 +
 src/mon/MonCommands.h                              |  122 +-
 src/mon/Monitor.cc                                 |  142 +-
 src/mon/Monitor.h                                  |  103 +-
 src/mon/OSDMonitor.cc                              |  944 +++-
 src/mon/OSDMonitor.h                               |   12 +-
 src/mon/PGMap.cc                                   |  211 +-
 src/mon/PGMonitor.cc                               |   10 +
 src/mon/PaxosService.cc                            |    2 +-
 src/mon/health_check.h                             |    3 +
 src/mrgw.sh                                        |    1 +
 src/msg/Message.cc                                 |   12 +
 src/msg/Message.h                                  |    3 +
 src/msg/async/AsyncConnection.cc                   |   13 +-
 src/msg/async/Stack.h                              |    2 +-
 src/msg/simple/Pipe.cc                             |    4 +-
 src/objclass/class_api.cc                          |   11 +-
 src/objclass/objclass.h                            |    9 +-
 src/os/CMakeLists.txt                              |    4 +-
 src/os/bluestore/BlockDevice.h                     |    2 +-
 src/os/bluestore/BlueFS.cc                         |    2 +-
 src/os/bluestore/BlueFS.h                          |    2 +-
 src/os/bluestore/BlueStore.cc                      |   42 +-
 src/os/bluestore/BlueStore.h                       |    6 +-
 src/os/bluestore/KernelDevice.h                    |    2 +-
 src/os/bluestore/PMEMDevice.h                      |    2 +-
 src/os/bluestore/StupidAllocator.cc                |    2 +-
 src/os/{fs => bluestore}/aio.cc                    |    0
 src/os/{fs => bluestore}/aio.h                     |    0
 src/os/bluestore/bluestore_tool.cc                 |  106 +-
 src/os/filestore/FileStore.h                       |    4 +-
 src/os/filestore/HashIndex.cc                      |    1 +
 src/os/memstore/PageSet.h                          |    2 +-
 src/osd/ECBackend.cc                               |   32 +-
 src/osd/ECBackend.h                                |    2 +-
 src/osd/OSD.cc                                     |  270 +-
 src/osd/OSD.h                                      |   12 +-
 src/osd/OSDCap.cc                                  |  282 +-
 src/osd/OSDCap.h                                   |   91 +-
 src/osd/OSDMap.cc                                  |  124 +-
 src/osd/OSDMap.h                                   |   12 +-
 src/osd/OpRequest.cc                               |   33 +-
 src/osd/OpRequest.h                                |    2 +
 src/osd/PG.cc                                      |  156 +-
 src/osd/PG.h                                       |   28 +-
 src/osd/PGBackend.cc                               |  140 +
 src/osd/PGBackend.h                                |   26 +-
 src/osd/PGLog.cc                                   |  287 +-
 src/osd/PGLog.h                                    |  351 +-
 src/osd/PrimaryLogPG.cc                            | 1073 ++--
 src/osd/PrimaryLogPG.h                             |   72 +-
 src/osd/ReplicatedBackend.cc                       |   11 +-
 src/osd/ReplicatedBackend.h                        |    2 +-
 src/osd/osd_types.cc                               |  131 +-
 src/osd/osd_types.h                                |  263 +-
 src/osdc/CMakeLists.txt                            |    8 +-
 src/osdc/Objecter.cc                               |   35 +-
 src/osdc/Objecter.h                                |    1 +
 src/pybind/CMakeLists.txt                          |    2 +-
 src/pybind/mgr/dashboard/README.rst                |    2 +-
 src/pybind/mgr/dashboard/base.html                 |  136 +-
 src/pybind/mgr/dashboard/module.py                 |  336 +-
 src/pybind/mgr/dashboard/osd_perf.html             |    4 +-
 src/pybind/mgr/dashboard/osds.html                 |  105 +
 src/pybind/mgr/dashboard/rbd_iscsi.html            |  104 +
 src/pybind/mgr/dashboard/rbd_iscsi.py              |   54 +
 src/pybind/mgr/dashboard/rbd_ls.py                 |   26 +
 src/pybind/mgr/dashboard/rbd_mirroring.html        |  220 +
 src/pybind/mgr/dashboard/rbd_mirroring.py          |  331 ++
 .../mgr/dashboard/{rbd.html => rbd_pool.html}      |   22 +-
 src/pybind/mgr/dashboard/servers.html              |   13 -
 src/pybind/mgr/mgr_module.py                       |   36 +
 src/pybind/mgr/prometheus/__init__.py              |    2 +
 src/pybind/mgr/prometheus/module.py                |  251 +
 src/pybind/mgr/restful/api/__init__.py             |    2 +-
 src/pybind/mgr/restful/module.py                   |    2 +-
 src/pybind/mgr/status/module.py                    |    2 +-
 src/pybind/mgr/zabbix/module.py                    |    6 +-
 src/pybind/rados/rados.pyx                         |  151 +-
 src/pybind/rbd/rbd.pyx                             |   26 +-
 src/rgw/librgw.cc                                  |    2 +-
 src/rgw/rgw_admin.cc                               |  100 +-
 src/rgw/rgw_auth_s3.cc                             |    2 -
 src/rgw/rgw_bucket.cc                              |   34 +-
 src/rgw/rgw_common.cc                              |   44 +-
 src/rgw/rgw_common.h                               |    9 +-
 src/rgw/rgw_cr_rados.cc                            |    2 -
 src/rgw/rgw_cr_rados.h                             |    1 -
 src/rgw/rgw_data_sync.cc                           |   66 +-
 src/rgw/rgw_file.cc                                |   19 +-
 src/rgw/rgw_file.h                                 |    8 +
 src/rgw/rgw_gc.cc                                  |    2 +-
 src/rgw/rgw_iam_policy.cc                          |   58 +-
 src/rgw/rgw_iam_policy.h                           |   17 +-
 src/rgw/rgw_iam_policy_keywords.gperf              |    1 +
 src/rgw/rgw_json_enc.cc                            |    2 +
 src/rgw/rgw_keystone.h                             |    6 +-
 src/rgw/rgw_lc.cc                                  |    8 +-
 src/rgw/rgw_loadgen.cc                             |    4 +-
 src/rgw/rgw_log.cc                                 |    2 +-
 src/rgw/rgw_op.cc                                  |   88 +-
 src/rgw/rgw_op.h                                   |    1 +
 src/rgw/rgw_policy_s3.cc                           |    2 +-
 src/rgw/rgw_quota.cc                               |   35 +-
 src/rgw/rgw_rados.cc                               |  249 +-
 src/rgw/rgw_rados.h                                |   29 +-
 src/rgw/rgw_reshard.cc                             |   19 +-
 src/rgw/rgw_rest_client.cc                         |    5 +-
 src/rgw/rgw_rest_conn.cc                           |   10 +-
 src/rgw/rgw_rest_log.cc                            |    3 +-
 src/rgw/rgw_rest_log.h                             |    3 +-
 src/rgw/rgw_rest_s3.cc                             |   43 +-
 src/rgw/rgw_rest_swift.cc                          |    3 +-
 src/rgw/rgw_user.cc                                |   36 +
 src/rgw/rgw_user.h                                 |    7 +-
 src/rgw/rgw_website.h                              |   33 +-
 src/script/ceph-debug-docker.sh                    |  114 +
 src/script/ceph-release-notes                      |  178 +-
 src/stop.sh                                        |    4 +-
 src/test/CMakeLists.txt                            |   11 +-
 src/test/ceph_objectstore_tool.py                  |    8 +-
 src/test/cephtool-test-mds.sh                      |   24 -
 src/test/cephtool-test-mon.sh                      |   26 -
 src/test/cephtool-test-osd.sh                      |   24 -
 src/test/cephtool-test-rados.sh                    |   21 -
 src/test/cli/crushtool/add-item.t                  |   14 +-
 src/test/cli/crushtool/arg-order-checks.t          |   76 +-
 src/test/cli/crushtool/build.t                     |    2 +-
 .../cli/crushtool/check-overlapped-rules.crushmap  |  Bin 0 -> 727 bytes
 src/test/cli/crushtool/check-overlapped-rules.t    |    5 +-
 src/test/cli/crushtool/choose-args.crush           |    2 +-
 src/test/cli/crushtool/choose-args.t               |    2 +-
 src/test/cli/crushtool/device-class.crush          |    6 +-
 src/test/cli/crushtool/multitype.after             |    6 +-
 src/test/cli/crushtool/need_tree_order.crush       |    2 +-
 src/test/cli/crushtool/rules.t                     |    8 +-
 src/test/cli/crushtool/set-choose.crushmap.txt     |   12 +-
 src/test/cli/crushtool/simple.template.adj.three   |    6 +-
 src/test/cli/crushtool/simple.template.adj.two     |    6 +-
 src/test/cli/crushtool/simple.template.five        |    6 +-
 src/test/cli/crushtool/simple.template.four        |    6 +-
 .../crushtool/simple.template.multitree.reweighted |    6 +-
 src/test/cli/crushtool/simple.template.two         |    6 +-
 src/test/cli/crushtool/straw2.txt                  |    2 +-
 src/test/cli/crushtool/tree.template.final         |    6 +-
 src/test/cli/osdmaptool/clobber.t                  |    4 +-
 src/test/cli/osdmaptool/create-print.t             |    6 +-
 src/test/cli/osdmaptool/create-racks.t             |    6 +-
 src/test/cli/osdmaptool/tree.t                     |   94 +-
 src/test/cli/radosgw-admin/help.t                  |    6 +-
 src/test/cli/rbd/help.t                            |   35 +-
 src/test/cls_rbd/test_cls_rbd.cc                   |   35 +-
 src/test/cls_refcount/test_cls_refcount.cc         |  101 +
 src/test/common/Throttle.cc                        |   96 +-
 src/test/common/get_command_descriptions.cc        |   14 +-
 src/test/common/test_config.cc                     |   74 +-
 src/test/compressor/test_compression.cc            |   10 +-
 src/test/crush/CMakeLists.txt                      |    2 -
 src/test/crush/CrushWrapper.cc                     |   82 +-
 .../crush-choose-args-expected-one-more-0.txt      |    8 +-
 .../crush-choose-args-expected-one-more-3.txt      |    2 +-
 src/test/crush/crush-classes.sh                    |  157 -
 src/test/crush/crush.cc                            |    4 +-
 src/test/crush/crush_weights.sh                    |    1 -
 src/test/daemon_config.cc                          |   46 +-
 src/test/encoding/check-generated.sh               |    2 +-
 src/test/encoding/types.h                          |    8 +-
 src/test/erasure-code/CMakeLists.txt               |    4 -
 src/test/erasure-code/TestErasureCodeShec_all.cc   |    2 +-
 .../erasure-code/TestErasureCodeShec_arguments.cc  |    2 +-
 src/test/erasure-code/ceph_erasure_code.cc         |    2 +-
 .../ceph_erasure_code_non_regression.cc            |    2 +-
 src/test/libcephfs_config.cc                       |    8 +-
 src/test/librados/aio.cc                           |    1 +
 src/test/librados/io.cc                            |  115 +
 src/test/librados/librados_config.cc               |    8 +-
 src/test/librados/misc.cc                          |  129 +-
 src/test/librados/service.cc                       |   57 +
 src/test/librados/test.cc                          |   22 +
 src/test/librados/tier.cc                          |    7 +
 src/test/librados/watch_notify.cc                  |   16 +
 src/test/librados_test_stub/LibradosTestStub.cc    |   94 +-
 .../librados_test_stub/MockTestMemRadosClient.h    |   18 +
 src/test/librados_test_stub/TestIoCtxImpl.h        |    7 +
 src/test/librados_test_stub/TestMemIoCtxImpl.cc    |   51 +-
 src/test/librados_test_stub/TestMemIoCtxImpl.h     |    7 +
 src/test/librados_test_stub/TestMemRadosClient.h   |    9 +
 src/test/librados_test_stub/TestRadosClient.h      |    5 +
 src/test/libradosstriper/CMakeLists.txt            |    2 -
 src/test/librbd/fsx.cc                             |  119 +-
 src/test/librbd/io/test_mock_ImageRequest.cc       |   53 +
 src/test/librbd/journal/test_mock_Replay.cc        |   85 +
 src/test/librbd/mock/cache/MockImageCache.h        |   12 +
 src/test/librbd/test_librbd.cc                     |  121 +
 src/test/librbd/test_support.cc                    |    7 +
 src/test/mgr/mgr-dashboard-smoke.sh                |    4 +-
 src/test/mon/CMakeLists.txt                        |   13 -
 src/test/mon/moncap.cc                             |   22 +
 src/test/mon/osd-crush-tree.rng                    |   68 -
 src/test/mon/run_test.sh                           |  139 -
 src/test/multi_stress_watch.cc                     |    6 +
 src/test/objectstore/Allocator_test.cc             |   17 +
 src/test/objectstore/store_test_fixture.h          |    2 +-
 src/test/osd/CMakeLists.txt                        |   17 +-
 src/test/osd/TestPGLog.cc                          |  926 +++-
 src/test/osd/TestRados.cc                          |    4 +-
 src/test/osd/osdcap.cc                             |   29 +
 src/test/osd/types.cc                              |   78 +-
 src/test/pybind/test_ceph_argparse.py              |    3 -
 src/test/pybind/test_rados.py                      |   32 +
 .../image_replayer/test_mock_BootstrapRequest.cc   |    1 -
 src/test/rbd_mirror/test_ClusterWatcher.cc         |   27 +-
 src/test/rbd_mirror/test_ImageDeleter.cc           |  179 +-
 src/test/rbd_mirror/test_ImageReplayer.cc          |   31 +-
 src/test/rbd_mirror/test_PoolWatcher.cc            |    1 +
 src/test/rbd_mirror/test_fixture.cc                |    8 +
 src/test/rbd_mirror/test_mock_ImageReplayer.cc     |   72 +-
 src/test/rbd_mirror/test_mock_InstanceReplayer.cc  |   46 +-
 src/test/rgw/rgw_multi/tests.py                    |  105 +
 src/test/smoke.sh                                  |   63 +
 src/test/system/rados_open_pools_parallel.cc       |    3 +-
 src/test/system/st_rados_watch.cc                  |    5 +-
 src/test/test_crush_bucket.sh                      |    2 +-
 src/test/test_mutate.cc                            |    2 +
 src/test/test_pidfile.sh                           |    7 +-
 src/test/test_pool_create.sh                       |    2 +-
 src/test/unit.cc                                   |    4 +-
 src/test/vstart_wrapper.sh                         |    3 +-
 src/tools/ceph_objectstore_tool.cc                 |    6 +-
 src/tools/cephfs/JournalTool.cc                    |   61 +
 src/tools/rbd/CMakeLists.txt                       |    1 +
 src/tools/rbd/action/Export.cc                     |    2 +-
 src/tools/rbd/action/Import.cc                     |    4 +-
 src/tools/rbd/action/MergeDiff.cc                  |    2 +-
 src/tools/rbd/action/MirrorPool.cc                 |   17 +-
 src/tools/rbd/action/Pool.cc                       |   60 +
 src/tools/rbd/action/Snap.cc                       |    4 +-
 src/tools/rbd/action/Trash.cc                      |    6 +-
 src/tools/rbd_mirror/CMakeLists.txt                |    4 +-
 src/tools/rbd_mirror/ClusterWatcher.cc             |   49 +-
 src/tools/rbd_mirror/ClusterWatcher.h              |   16 +-
 src/tools/rbd_mirror/ImageDeleter.cc               |  133 +-
 src/tools/rbd_mirror/ImageDeleter.h                |   26 +-
 src/tools/rbd_mirror/ImageReplayer.cc              |   70 +-
 src/tools/rbd_mirror/ImageReplayer.h               |   43 +-
 src/tools/rbd_mirror/InstanceReplayer.cc           |   77 +-
 src/tools/rbd_mirror/InstanceReplayer.h            |   21 +-
 src/tools/rbd_mirror/Instances.cc                  |    2 +-
 src/tools/rbd_mirror/LeaderWatcher.cc              |    3 +-
 src/tools/rbd_mirror/Mirror.cc                     |   54 +-
 src/tools/rbd_mirror/Mirror.h                      |    4 +-
 src/tools/rbd_mirror/PoolReplayer.cc               |  150 +-
 src/tools/rbd_mirror/PoolReplayer.h                |   27 +-
 src/tools/rbd_mirror/PoolWatcher.h                 |    5 +
 src/tools/rbd_mirror/ServiceDaemon.cc              |  251 +
 src/tools/rbd_mirror/ServiceDaemon.h               |   86 +
 .../rbd_mirror/image_replayer/BootstrapRequest.cc  |   21 +-
 .../rbd_mirror/image_replayer/BootstrapRequest.h   |    4 +-
 src/tools/rbd_mirror/image_replayer/Types.h        |   21 +
 src/tools/rbd_mirror/service_daemon/Types.cc       |   29 +
 src/tools/rbd_mirror/service_daemon/Types.h        |   33 +
 src/tracing/CMakeLists.txt                         |    7 +-
 src/tracing/librbd.tp                              |   65 +
 src/vstart.sh                                      |   35 +-
 738 files changed, 28272 insertions(+), 9407 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