[Pkg-ceph-commits] [ceph] 02/10: Merge tag 'upstream/12.2.1' into ubuntu/bionic
James Downing Page
jamespage at moszumanska.debian.org
Thu Feb 1 15:28:08 UTC 2018
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu/bionic
in repository ceph.
commit 24b84ce5a1cb651bfd50aed17c1ea3e6bdab2829
Merge: 7c071b4 3c5ef2e
Author: James Page <james.page at ubuntu.com>
Date: Mon Oct 30 11:22:54 2017 +0000
Merge tag 'upstream/12.2.1' into ubuntu/bionic
Upstream version 12.2.1
CMakeLists.txt | 2 +-
PendingReleaseNotes | 16 +
alpine/APKBUILD | 6 +-
ceph.spec | 12 +-
ceph.spec.in | 6 +-
doc/cephfs/health-messages.rst | 28 +-
doc/cephfs/mds-config-ref.rst | 23 +-
doc/images/esx_iscsi_chap.png | Bin 0 -> 19668 bytes
doc/images/esx_iscsi_conf.png | Bin 0 -> 58300 bytes
doc/images/esx_iscsi_disc.png | Bin 0 -> 16505 bytes
doc/images/esx_iscsi_general.png | Bin 0 -> 9136 bytes
doc/images/esx_iscsi_rescan.png | Bin 0 -> 62103 bytes
doc/images/esx_iscsi_select_device.png | Bin 0 -> 63316 bytes
doc/images/esx_iscsi_select_mru.png | Bin 0 -> 18346 bytes
doc/images/win2016_iscsi_advanced_window.png | Bin 0 -> 21371 bytes
doc/images/win2016_iscsi_connect_to_target.png | Bin 0 -> 6956 bytes
doc/images/win2016_iscsi_devices_mpio.png | Bin 0 -> 10913 bytes
doc/images/win2016_iscsi_discovery_tab.png | Bin 0 -> 21808 bytes
doc/images/win2016_iscsi_target_tab.png | Bin 0 -> 20594 bytes
doc/images/win2016_iscsi_target_tab2.png | Bin 0 -> 22340 bytes
doc/images/win2016_mpclaim_output.png | Bin 0 -> 18464 bytes
doc/images/win2016_mpio_set_failover_only.png | Bin 0 -> 13334 bytes
doc/man/8/ceph.rst | 2 +-
doc/rbd/index.rst | 14 +-
doc/rbd/iscsi-initiator-esx.rst | 36 ++
doc/rbd/iscsi-initiator-rhel.rst | 90 ++++
doc/rbd/iscsi-initiator-win.rst | 100 +++++
doc/rbd/iscsi-initiators.rst | 10 +
doc/rbd/iscsi-monitoring.rst | 103 +++++
doc/rbd/iscsi-overview.rst | 50 +++
doc/rbd/iscsi-requirements.rst | 49 +++
doc/rbd/iscsi-target-ansible.rst | 343 +++++++++++++++
doc/rbd/iscsi-target-cli.rst | 163 +++++++
doc/rbd/iscsi-targets.rst | 27 ++
.../{bluestore.yaml => bluestore-bitmap.yaml} | 7 +-
qa/objectstore/bluestore-comp.yaml | 3 +-
qa/objectstore/bluestore.yaml | 6 +-
qa/run_xfstests.sh | 284 ++-----------
qa/run_xfstests_krbd.sh | 91 ----
qa/standalone/crush/crush-classes.sh | 1 +
qa/standalone/mon/osd-pool-df.sh | 75 ++++
qa/standalone/mon/test_pool_quota.sh | 2 +-
.../tasks/{data-scan.yaml => alternate-pool.yaml} | 4 +-
.../fs/basic_functional/tasks/client-limits.yaml | 2 +
qa/suites/fs/basic_functional/tasks/data-scan.yaml | 1 +
.../fs/multiclient/tasks/cephfs_misc_tests.yaml | 1 +
qa/suites/kcephfs/recovery/tasks/auto-repair.yaml | 1 +
.../kcephfs/recovery/tasks/client-limits.yaml | 3 +
.../kcephfs/recovery/tasks/client-recovery.yaml | 1 +
qa/suites/kcephfs/recovery/tasks/data-scan.yaml | 1 +
qa/suites/kcephfs/recovery/tasks/failover.yaml | 7 +-
qa/suites/kcephfs/recovery/whitelist_health.yaml | 1 +
qa/suites/kcephfs/thrash/thrashosds-health.yaml | 1 +
qa/suites/kcephfs/thrash/whitelist_health.yaml | 1 +
qa/suites/krbd/singleton/tasks/rbd_xfstests.yaml | 23 +-
.../rados/thrash/d-require-luminous/at-end.yaml | 2 +
qa/suites/rbd/cli/pool/ec-data-pool.yaml | 4 -
qa/suites/rbd/librbd/pool/ec-data-pool.yaml | 4 -
.../workloads/dynamic_features_no_cache.yaml | 4 +-
qa/suites/rbd/mirror/cluster/2-node.yaml | 8 +-
qa/suites/rbd/qemu/pool/ec-data-pool.yaml | 4 -
qa/suites/rgw/multisite/overrides.yaml | 2 +
qa/suites/upgrade/luminous-x/parallel/% | 0
qa/suites/upgrade/luminous-x/parallel/0-cluster/+ | 0
.../luminous-x/parallel/0-cluster/openstack.yaml | 4 +
.../luminous-x/parallel/0-cluster/start.yaml | 39 ++
.../parallel/1-ceph-install/luminous.yaml | 43 ++
qa/suites/upgrade/luminous-x/parallel/2-workload/+ | 0
.../luminous-x/parallel/2-workload/blogbench.yaml | 14 +
.../parallel/2-workload/ec-rados-default.yaml | 24 ++
.../luminous-x/parallel/2-workload/rados_api.yaml | 11 +
.../parallel/2-workload/rados_loadgenbig.yaml | 11 +
.../parallel/2-workload/test_rbd_api.yaml | 11 +
.../parallel/2-workload/test_rbd_python.yaml | 11 +
.../parallel/3-upgrade-sequence/upgrade-all.yaml | 16 +
.../3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 35 ++
.../upgrade/luminous-x/parallel/5-final-workload/+ | 0
.../parallel/5-final-workload/blogbench.yaml | 13 +
.../5-final-workload/rados-snaps-few-objects.yaml | 17 +
.../5-final-workload/rados_loadgenmix.yaml | 9 +
.../5-final-workload/rados_mon_thrash.yaml | 18 +
.../parallel/5-final-workload/rbd_cls.yaml | 9 +
.../5-final-workload/rbd_import_export.yaml | 11 +
.../parallel/5-final-workload/rgw_swift.yaml | 13 +
qa/suites/upgrade/luminous-x/parallel/distros | 1 +
qa/suites/upgrade/luminous-x/parallel/objectstore | 1 +
.../upgrade/luminous-x/stress-split-erasure-code/% | 0
.../luminous-x/stress-split-erasure-code/0-cluster | 1 +
.../stress-split-erasure-code/2-partial-upgrade | 1 +
.../3-thrash/default.yaml | 25 ++
.../stress-split-erasure-code/4-ec-workload.yaml | 22 +
.../5-finish-upgrade.yaml | 1 +
.../7-final-workload.yaml | 35 ++
.../luminous-x/stress-split-erasure-code/distros | 1 +
.../stress-split-erasure-code/objectstore | 1 +
.../thrashosds-health.yaml | 1 +
qa/suites/upgrade/luminous-x/stress-split/% | 0
.../upgrade/luminous-x/stress-split/0-cluster/+ | 0
.../stress-split/0-cluster/openstack.yaml | 6 +
.../luminous-x/stress-split/0-cluster/start.yaml | 29 ++
.../stress-split/1-ceph-install/luminous.yaml | 17 +
.../stress-split/2-partial-upgrade/firsthalf.yaml | 12 +
.../luminous-x/stress-split/3-thrash/default.yaml | 25 ++
.../upgrade/luminous-x/stress-split/4-workload/+ | 0
.../stress-split/4-workload/radosbench.yaml | 40 ++
.../stress-split/4-workload/rbd-cls.yaml | 10 +
.../stress-split/4-workload/rbd-import-export.yaml | 12 +
.../stress-split/4-workload/rbd_api.yaml | 10 +
.../stress-split/4-workload/readwrite.yaml | 16 +
.../stress-split/4-workload/snaps-few-objects.yaml | 18 +
.../luminous-x/stress-split/5-finish-upgrade.yaml | 9 +
.../luminous-x/stress-split/7-final-workload/+ | 0
.../stress-split/7-final-workload/rbd-python.yaml | 10 +
.../stress-split/7-final-workload/rgw-swift.yaml | 11 +
.../7-final-workload/snaps-many-objects.yaml | 16 +
qa/suites/upgrade/luminous-x/stress-split/distros | 1 +
.../stress-split/objectstore/bluestore.yaml | 1 +
.../stress-split/objectstore/filestore-xfs.yaml | 1 +
.../luminous-x/stress-split/thrashosds-health.yaml | 1 +
qa/tasks/ceph.py | 2 +-
qa/tasks/ceph_manager.py | 1 +
qa/tasks/ceph_test_case.py | 1 +
qa/tasks/cephfs/cephfs_test_case.py | 21 +-
qa/tasks/cephfs/filesystem.py | 65 ++-
qa/tasks/cephfs/test_client_limits.py | 8 +-
qa/tasks/cephfs/test_client_recovery.py | 21 +-
qa/tasks/cephfs/test_data_scan.py | 86 +---
qa/tasks/cephfs/test_misc.py | 6 +-
qa/tasks/cephfs/test_recovery_pool.py | 220 ++++++++++
qa/tasks/mgr/test_failover.py | 10 +
qa/tasks/radosgw_admin.py | 425 +++++++++++++++---
qa/tasks/rbd.py | 20 +-
qa/tasks/rgw.py | 2 +-
qa/tasks/util/rados.py | 6 +-
qa/tasks/vstart_runner.py | 24 +-
qa/workunits/cephtool/test.sh | 3 +
qa/workunits/mon/crush_ops.sh | 2 +
qa/workunits/rbd/import_export.sh | 8 +-
selinux/ceph.te | 6 +-
src/.git_version | 4 +-
src/CMakeLists.txt | 9 +-
.../ceph_volume/devices/lvm/activate.py | 23 +-
src/ceph-volume/ceph_volume/devices/lvm/api.py | 264 ++++++++++--
src/ceph-volume/ceph_volume/devices/lvm/prepare.py | 42 +-
src/ceph-volume/ceph_volume/devices/lvm/trigger.py | 2 +-
src/ceph-volume/ceph_volume/exceptions.py | 10 +
src/ceph-volume/ceph_volume/tests/conftest.py | 26 ++
.../ceph_volume/tests/devices/lvm/test_activate.py | 34 ++
.../ceph_volume/tests/devices/lvm/test_api.py | 98 +++++
.../ceph_volume/tests/devices/lvm/test_trigger.py | 6 +
.../ceph_volume/tests/functional/Vagrantfile | 32 +-
.../tests/functional/centos7/create/group_vars/all | 10 +-
.../ceph_volume/tests/functional/tox.ini | 2 +-
.../tests/functional/xenial/create/group_vars/all | 10 +-
src/ceph-volume/ceph_volume/util/disk.py | 24 ++
src/ceph.in | 41 +-
src/ceph_release | 2 +-
src/client/Client.cc | 473 +++++++++++++++++++--
src/client/Client.h | 1 -
src/client/fuse_ll.cc | 2 +-
src/cls/rbd/cls_rbd.cc | 32 +-
src/common/Formatter.cc | 4 +
src/common/Formatter.h | 6 +
src/common/LogClient.h | 18 +
src/common/admin_socket.cc | 3 +-
src/common/cohort_lru.h | 2 +-
src/common/legacy_config_opts.h | 108 -----
src/common/options.cc | 182 ++++----
src/common/util.cc | 16 +
src/crush/CrushWrapper.h | 15 +-
src/include/alloc_ptr.h | 91 ++++
src/include/btree_interval_set.h | 43 +-
src/include/compact_map.h | 6 +
src/include/counter.h | 16 +-
src/include/encoding.h | 6 +-
src/include/interval_set.h | 18 +-
src/include/lru.h | 322 +++++---------
src/include/mempool.h | 7 +
src/include/rados.h | 4 +-
src/include/util.h | 2 +
src/include/xlist.h | 4 +-
src/librbd/ImageCtx.cc | 82 ++--
src/librbd/ImageCtx.h | 1 +
src/librbd/ImageState.cc | 2 +-
src/librbd/ImageWatcher.cc | 3 +-
src/librbd/Journal.cc | 2 +-
src/librbd/image/CreateRequest.cc | 16 +-
src/librbd/internal.cc | 13 +-
src/librbd/io/ImageRequestWQ.cc | 12 +-
src/librbd/operation/ObjectMapIterate.cc | 2 +-
src/mds/Beacon.cc | 8 +-
src/mds/CDentry.cc | 2 +
src/mds/CDentry.h | 7 +-
src/mds/CDir.cc | 21 +-
src/mds/CDir.h | 1 +
src/mds/CInode.cc | 8 +-
src/mds/CInode.h | 1 +
src/mds/FSMap.cc | 2 +-
src/mds/Locker.cc | 16 +-
src/mds/MDCache.cc | 263 ++++++------
src/mds/MDCache.h | 41 +-
src/mds/MDLog.cc | 2 +-
src/mds/MDSCacheObject.cc | 10 +-
src/mds/MDSCacheObject.h | 109 +++--
src/mds/MDSDaemon.cc | 6 +
src/mds/MDSRank.cc | 8 +
src/mds/Migrator.cc | 36 +-
src/mds/Server.cc | 79 ++--
src/mds/Server.h | 2 +-
src/mds/SessionMap.cc | 2 +-
src/mds/SessionMap.h | 2 +-
src/mds/SimpleLock.h | 7 +-
src/messages/MOSDPGRecoveryDelete.h | 14 +-
src/messages/MOSDPGRecoveryDeleteReply.h | 14 +-
src/mgr/PyFormatter.h | 2 +-
src/mgr/PyState.cc | 4 +-
src/mon/CreatingPGs.h | 1 +
src/mon/MDSMonitor.cc | 9 +-
src/mon/MgrMonitor.cc | 13 +-
src/mon/MgrMonitor.h | 11 +-
src/mon/MgrStatMonitor.h | 4 +
src/mon/MonCommands.h | 6 +
src/mon/MonOpRequest.h | 2 +-
src/mon/Monitor.cc | 133 ++++--
src/mon/Monitor.h | 20 +
src/mon/OSDMonitor.cc | 120 +++++-
src/mon/PGMap.cc | 4 +-
src/mon/PGMap.h | 9 +
src/os/bluestore/BlueFS.cc | 9 +-
src/os/bluestore/BlueStore.cc | 54 ++-
src/os/bluestore/BlueStore.h | 3 +-
src/os/bluestore/StupidAllocator.cc | 17 +-
src/os/bluestore/StupidAllocator.h | 9 +-
src/os/bluestore/aio.cc | 18 +-
src/os/bluestore/bluestore_types.cc | 2 +-
src/osd/OSD.cc | 41 +-
src/osd/OSD.h | 5 +
src/osd/OSDMap.cc | 35 +-
src/osd/PG.cc | 17 +-
src/osd/PGLog.cc | 126 ++++--
src/osd/PGLog.h | 44 +-
src/osd/PrimaryLogPG.cc | 7 +-
src/osd/osd_types.h | 10 +
src/pybind/mgr/dashboard/base.html | 7 +-
src/pybind/mgr/dashboard/health.html | 16 +-
src/pybind/mgr/dashboard/module.py | 4 +-
src/rgw/rgw_admin.cc | 29 +-
src/rgw/rgw_asio_frontend.cc | 4 +-
src/rgw/rgw_bucket.cc | 43 +-
src/rgw/rgw_civetweb_frontend.cc | 4 +-
src/rgw/rgw_client_io.h | 4 +-
src/rgw/rgw_client_io_filters.h | 67 ++-
src/rgw/rgw_common.h | 1 +
src/rgw/rgw_crypt.cc | 6 +
src/rgw/rgw_data_sync.cc | 18 +-
src/rgw/rgw_fcgi_process.cc | 4 +-
src/rgw/rgw_formats.h | 1 +
src/rgw/rgw_lc.cc | 9 +-
src/rgw/rgw_lc.h | 56 ++-
src/rgw/rgw_lc_s3.cc | 47 +-
src/rgw/rgw_lc_s3.h | 28 +-
src/rgw/rgw_loadgen_process.cc | 2 +-
src/rgw/rgw_log.cc | 5 +
src/rgw/rgw_metadata.cc | 40 +-
src/rgw/rgw_metadata.h | 7 +-
src/rgw/rgw_op.cc | 2 +
src/rgw/rgw_op.h | 1 +
src/rgw/rgw_quota.cc | 6 +-
src/rgw/rgw_rados.cc | 127 +++++-
src/rgw/rgw_rados.h | 34 +-
src/rgw/rgw_rest_client.cc | 2 +-
src/rgw/rgw_rest_conn.cc | 5 +-
src/rgw/rgw_rest_conn.h | 2 +-
src/rgw/rgw_rest_metadata.cc | 40 +-
src/rgw/rgw_rest_s3.cc | 10 +
src/rgw/rgw_sync.cc | 87 ++--
src/rgw/rgw_user.cc | 22 +-
src/rocksdb/CMakeLists.txt | 2 +-
src/rocksdb/util/crc32c.cc | 14 +-
src/test/cli-integration/rbd/formatted-output.t | 4 +-
src/test/cli/rbd/help.t | 32 +-
src/test/cls_rbd/test_cls_rbd.cc | 3 +-
src/test/common/test_lru.cc | 131 +++---
src/test/libcephfs/test.cc | 33 +-
src/test/librbd/journal/test_Entries.cc | 4 +-
src/test/librbd/journal/test_Replay.cc | 14 +-
.../managed_lock/test_mock_AcquireRequest.cc | 5 +-
src/test/librbd/mock/MockImageCtx.h | 4 +-
src/test/librbd/test_MirroringWatcher.cc | 17 +-
src/test/librbd/test_internal.cc | 2 +-
src/test/mon/PGMap.cc | 6 +-
src/test/osd/TestPGLog.cc | 126 +++---
src/test/rbd_mirror/test_mock_LeaderWatcher.cc | 4 +-
src/test/rgw/rgw_multi/tests.py | 42 ++
src/tools/ceph_objectstore_tool.cc | 14 +-
src/tools/rbd/ArgumentTypes.cc | 2 +-
src/tools/rbd/Utils.cc | 10 +-
src/tools/rbd/action/DiskUsage.cc | 2 +-
src/tools/rbd/action/Export.cc | 6 +-
src/tools/rbd/action/ImageMeta.cc | 78 ++--
src/tools/rbd/action/Import.cc | 8 +-
src/tools/rbd/action/Kernel.cc | 3 +-
src/tools/rbd/action/List.cc | 4 +-
src/tools/rbd/action/MirrorPool.cc | 3 +-
src/tools/rbd_mirror/ImageDeleter.cc | 3 +-
src/tools/rbd_mirror/ImageReplayer.cc | 9 +-
src/tools/rbd_mirror/ImageSyncThrottler.cc | 6 +-
src/tools/rbd_mirror/InstanceReplayer.cc | 3 +-
src/tools/rbd_mirror/InstanceWatcher.cc | 2 +-
src/tools/rbd_mirror/Instances.cc | 6 +-
src/tools/rbd_mirror/LeaderWatcher.cc | 12 +-
src/tools/rbd_mirror/Mirror.cc | 2 +-
src/tools/rbd_mirror/PoolReplayer.cc | 4 +-
src/tools/rbd_mirror/Threads.cc | 6 +-
.../rbd_mirror/image_sync/ImageCopyRequest.cc | 5 +-
src/tools/rbd_nbd/rbd-nbd.cc | 22 +-
316 files changed, 6070 insertions(+), 2077 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