]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Yuri Weinstein [Fri, 21 Feb 2020 16:56:01 +0000 (08:56 -0800)]
Merge pull request #33306 from smithfarm/wip-43575-mimic
mimic: rgw: fix a bug that bucket instance obj can't be removed after resharding completed
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 16:55:31 +0000 (08:55 -0800)]
Merge pull request #33305 from smithfarm/wip-43480-mimic
mimic: rgw: change the "rgw admin status" 'num_shards' output to signed int
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 16:54:42 +0000 (08:54 -0800)]
Merge pull request #33300 from smithfarm/wip-42732-mimic
mimic: rgw: auto-clean reshard queue entries for non-existent buckets
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 16:12:49 +0000 (08:12 -0800)]
Merge pull request #33314 from smithfarm/wip-42992-mimic
mimic: qa: update krbd_blkroset.t and add krbd_get_features.t
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Fri, 21 Feb 2020 16:12:17 +0000 (08:12 -0800)]
Merge pull request #33316 from smithfarm/wip-43242-mimic
mimic: qa: krbd_exclusive_option.sh: update for recent kernel changes
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Thu, 20 Feb 2020 19:53:38 +0000 (11:53 -0800)]
Merge pull request #33318 from smithfarm/wip-43507-mimic
mimic: rbd: creating thick-provision image progress percent info exceeds 100%
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 20 Feb 2020 19:53:10 +0000 (11:53 -0800)]
Merge pull request #33315 from smithfarm/wip-43238-mimic
mimic: librbd: fix rbd_open_by_id, rbd_open_by_id_read_only
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 20 Feb 2020 19:52:35 +0000 (11:52 -0800)]
Merge pull request #32952 from shyukri/wip-43829-mimic
mimic: librbd: don't call refresh from mirror::GetInfoRequest state machine
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 20 Feb 2020 19:52:03 +0000 (11:52 -0800)]
Merge pull request #32714 from smithfarm/wip-43625-mimic
mimic: nautilus: rbd-mirror: fix 'rbd mirror status' asok command output
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Thu, 20 Feb 2020 19:51:28 +0000 (11:51 -0800)]
Merge pull request #32470 from zhengchengyao/diff_mimic
mimic: rbd: librbd: diff iterate with fast-diff now correctly includes parent
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Thu, 20 Feb 2020 19:50:28 +0000 (11:50 -0800)]
Merge pull request #31520 from trociny/wip-42727-mimic
mimic: rbd-mirror: clone v2 mirroring improvements
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Fri, 14 Feb 2020 12:26:59 +0000 (13:26 +0100)]
Merge pull request #32782 from idryomov/wip-doc-fs-authorize-fix-mimic
mimic: doc/cephfs/client-auth: description and example are inconsistent
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Xiangdong Mu [Wed, 16 Oct 2019 06:20:40 +0000 (14:20 +0800)]
rbd:the progress percent info exceeds 100%
Signed-off-by: Xiangdong Mu <muxiangdong@inspur.com>
(cherry picked from commit
4877c8a12181ec9cbc1c1e59bea3a615e0367588 )
Ilya Dryomov [Wed, 4 Dec 2019 18:08:46 +0000 (19:08 +0100)]
qa: kernel.sh: unlock before rolling back
"rbd snap rollback" expects an unlocked image, but we may get there
locked if object map is enabled (or if lock_on_read is specified in
rbd_default_map_options).
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
3aae140353a4b27dfe6e2d2ac7a49cdcdbbe5ffe )
Ilya Dryomov [Wed, 4 Dec 2019 14:26:54 +0000 (15:26 +0100)]
qa: krbd_exclusive_option.sh: update for recent kernel changes
Since 5.3:
- a plain "rbd map" acquires the lock, so it's not different from
"rbd map -o exclusive" in this regard
- if the lock is held by the exclusive peer, I/O is failed right away
instead of blocking
- lock_timeout option is respected only by "rbd map" and not by I/O
Since 5.5:
- if the mapping is read-only, the lock isn't acquired
Added blacklisting test case, dropped lock_timeout test case.
Fixes: https://tracker.ceph.com/issues/43127
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
50933b863a1d239bbca0a25663c0dbe7ab8963ce )
yangjun [Sun, 8 Dec 2019 01:09:53 +0000 (09:09 +0800)]
librbd: fix rbd_open_by_id, rbd_open_by_id_read_only
These methods incorrectly delete ImageCtx on error, resulting
in double-free heap corruption.
Fixes: https://tracker.ceph.com/issues/43178
Signed-off-by: yangjun <yangjun@cmss.chinamobile.com>
(cherry picked from commit
3457192c24a66ba499a7c9b1747bc29c79b34636 )
Conflicts:
src/librbd/librbd.cc
Ilya Dryomov [Tue, 19 Nov 2019 15:31:35 +0000 (16:31 +0100)]
qa: add krbd_get_features.t test
Run it together with krbd_blkroset.t.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
80528fcb6cf808fbf1ae9744911cb0ef46075a68 )
Ilya Dryomov [Tue, 19 Nov 2019 15:05:37 +0000 (16:05 +0100)]
qa: krbd_blkroset.t: update for read-only changes
If an image is mapped read-only, setting its partition(s) to read-write
via BLKROSET is no longer allowed.
Add read-only OSD caps test cases.
Fixes: https://tracker.ceph.com/issues/42915
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
366a369c8d2dedf356d6848ccdc25a7693502f20 )
zhang Shaowen [Fri, 8 Nov 2019 09:50:23 +0000 (17:50 +0800)]
rgw: fix a bug that bucket instance obj can't be removed after resharding completed.
Fixes: https://tracker.ceph.com/issues/42691
Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit
03039d9630e65088b525e9637dfc6f8f2c0a2702 )
Conflicts:
src/rgw/rgw_reshard.cc
- in master, *store has type "rgw::sal::RGWRadosStore", while in nautilus
it has type "RGWRados", but this line appears to be merely incidental
to the patch
Mark Kogan [Thu, 13 Dec 2018 14:29:31 +0000 (09:29 -0500)]
rgw: change the 'rgw admin status" nun_shards output to signed int
Fixes: http://tracker.ceph.com/issues/37645
Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit
9bdc324cb6667244bd32ee09760f91819383b30d )
J. Eric Ivancich [Fri, 1 Nov 2019 18:17:53 +0000 (14:17 -0400)]
rgw: auto-clean reshard queue entries for non-existent buckets
It is possible for a bucket to be added to the reshard queue and then
to be removed before its entry in the reshard queue is processed. When
this is now encountered, processing of the reshard queue errors out.
This fix recognizes when the reshard queue entry refers to a
non-existent bucket and remove the entry from the reshard queue,
allowing processing of the queue to continue.
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit
304ad8803292e92911e86b84c39a6c2ff0d0121b )
Conflicts:
src/rgw/rgw_reshard.cc
- omitted cosmetic change in get_bucket_info arg list
Jan Fajerski [Tue, 11 Feb 2020 15:34:10 +0000 (16:34 +0100)]
Merge pull request #32871 from shyukri/wip-43118-mimic
mimic: ceph-volume: import mock.mock instead of unittest.mock (py2)
Jan Fajerski [Tue, 11 Feb 2020 12:30:43 +0000 (13:30 +0100)]
Merge pull request #32865 from shyukri/wip-43463-mimic
mimic: ceph-volume/lvm/activate.py: clarify error message: fsid refers to osd_fsid
Jan Fajerski [Tue, 11 Feb 2020 10:48:46 +0000 (11:48 +0100)]
Merge pull request #32875 from shyukri/wip-43322-mimic
mimic: ceph-volume: use correct extents if using db-devices and >1 osds_per_device
Jan Fajerski [Tue, 11 Feb 2020 10:45:41 +0000 (11:45 +0100)]
Merge pull request #32861 from shyukri/wip-43282-mimic
mimic: ceph-volume: util: look for executable in $PATH
Jan Fajerski [Mon, 10 Feb 2020 08:45:31 +0000 (09:45 +0100)]
Merge pull request #32866 from shyukri/wip-42966-mimic
mimic: ceph-volume: check if we run in an selinux environment
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Jan Fajerski [Mon, 10 Feb 2020 08:44:37 +0000 (09:44 +0100)]
Merge pull request #32867 from shyukri/wip-42972-mimic
mimic: ceph-volume: check if we run in an selinux environment, now also in py2
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Sage Weil [Fri, 7 Feb 2020 19:53:34 +0000 (13:53 -0600)]
Merge PR #33130 into mimic
* refs/pull/33130/head:
mimic: common/config: parse --log-early but ignore it
Sage Weil [Fri, 7 Feb 2020 17:48:02 +0000 (11:48 -0600)]
mimic: common/config: parse --log-early but ignore it
Ideally we woudl backport
933d5084cb66f299a7bf60f0a2a6382c0bd3cb2f , but
it does not apply cleanly to mimic. Among other things, we modifies
behavior that changed in
cd6a5b9c40779956629803f222c365bdb291a169 and
the related commits, which is non-trivial and not worth backporting.
We want this in mimic anyway because ceph_manager.py is now passing it
for all of the raw_cluster_cmds, and it would be even more awkward to
make that behavior conditional on version.
Fixes: https://tracker.ceph.com/issues/43946
Signed-off-by: Sage Weil <sage@redhat.com>
Jan Fajerski [Fri, 7 Feb 2020 17:33:39 +0000 (18:33 +0100)]
Merge pull request #33124 from jan--f/wip-42897-mimic
mimic: ceph-volume: make get_devices fs location independent
Jan Fajerski [Fri, 7 Feb 2020 15:11:56 +0000 (16:11 +0100)]
Merge pull request #32528 from jan--f/wip-42704-mimic
mimic: ceph-volume: reject disks smaller then 5GB in inventory
Jan Fajerski [Fri, 7 Feb 2020 14:09:05 +0000 (15:09 +0100)]
Merge pull request #32557 from shyukri/wip-43023-mimic
mimic: ceph-volume: minor clean-up of "simple scan" subcommand help
Jan Fajerski [Fri, 7 Feb 2020 14:08:26 +0000 (15:08 +0100)]
Merge pull request #32559 from shyukri/wip-43276-mimic
mimic: ceph-volume/test: patch VolumeGroups
Jan Fajerski [Mon, 11 Nov 2019 13:35:43 +0000 (14:35 +0100)]
ceph-volume: refactor tests for refactored get_devices
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
4749f4c59dc4edb1fd689e18e8d9f358f95cb945 )
Jan Fajerski [Fri, 8 Nov 2019 15:36:30 +0000 (16:36 +0100)]
ceph-volume: refactor get_devices, don't use os.path.realpath
Fixes: https://tracker.ceph.com/issues/42777
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
b35e8c485f73b5b65e0be29444eb06172d6df3e3 )
Jan Fajerski [Mon, 15 Jul 2019 08:33:45 +0000 (10:33 +0200)]
ceph-volume: reject disks smaller then 5GB in inventory
Volumes smaller than 5GB won't be created anyway. This also guards
against drives with size 0, as can happen in mdraid setups.
Fixes: http://tracker.ceph.com/issues/40776
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
34bd75a942daff305789c9ccd378f99e05ae1434 )
Mykola Golub [Mon, 20 Jan 2020 13:42:47 +0000 (13:42 +0000)]
librbd: don't call refresh from mirror::GetInfoRequest state machine
Fixes: https://tracker.ceph.com/issues/43589
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
da46798ab3f56a639cc7a0b885778e8f75505b53 )
Conflicts:
src/librbd/api/Mirror.cc
- C_ImageGetInfo ctor takes only two arguments in nautilus
- nautilus does not have LambdaContext as a class; use FunctionContext
instead
(cherry picked from commit
a1e0d623d5026baec9d1e6ed83201c3fb326fc10 )
Fabian Niepelt [Wed, 11 Dec 2019 13:19:14 +0000 (14:19 +0100)]
ceph-volume: use correct extents when using db-devices and >1 osds_per_device
Actual data size depending on osds_per_device needs to be calculated here. Otherwise, if osds_per_device is greater than 1, ceph-volume will allocate 100% of the device to the first osd and then fail to create the LV for the second because the volume group is already full.
Fixes: https://tracker.ceph.com/issues/39442
Signed-off-by: Fabian Niepelt <f.niepelt@mittwald.de>
(cherry picked from commit
ecde6cd619605003706f545b0b5ad4e2e8932f28 )
Conflicts:
src/ceph-volume/ceph_volume/devices/lvm/strategies/bluestore.py
Jan Fajerski [Fri, 22 Nov 2019 15:57:11 +0000 (16:57 +0100)]
ceph-volume: import mock.mock instead of unittest.mock (py2)
Fixes: bb4de1a3fc238eaf9f717dc59c6bdf338ef6d657
Fixes: https://tracker.ceph.com/issues/42970
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
c1bd09f2591d983f1988e3dadcf3c65c59afb15d )
Conflicts:
src/ceph-volume/ceph_volume/tests/api/test_lvm.py
Jan Fajerski [Fri, 22 Nov 2019 14:51:00 +0000 (15:51 +0100)]
ceph-volume: python2 raises OSError on Popen with missing binary.
For compatibility alias FileNotFoundError to OSError.
Fixes: 72b79f71fa84fe0d56b2fd1745f5bb130380cc38
Fixes: https://tracker.ceph.com/issues/42967
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
12c5f89ddb51a1db9399e03591e1db6c429b9c9e )
Jan Fajerski [Fri, 22 Nov 2019 14:49:41 +0000 (15:49 +0100)]
ceph-volume: py2 compatibility for selinux test
Fixes: af30c7f956380beb3bc4021d60b9229a82bda4e2
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
114aa57df28107c2d14caacdfb3f0423b244075d )
Jan Fajerski [Fri, 22 Nov 2019 09:46:05 +0000 (10:46 +0100)]
ceph-volume: don't assume SELinux
Expect selinux related binaries to not be present.
Fixes: 33c8a64a54d9ea8962091caf8564cea3f603c5f5
Fixes: https://tracker.ceph.com/issues/42957
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
72b79f71fa84fe0d56b2fd1745f5bb130380cc38 )
Jan Fajerski [Fri, 22 Nov 2019 10:09:22 +0000 (11:09 +0100)]
ceph-volume: fix test test_selinuxenabled_doesnt_exist
Popen does not open a shell by default, so A FileNotFoundError is
raised instead of returning a 127 return code.
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
af30c7f956380beb3bc4021d60b9229a82bda4e2 )
Yaniv Kaul [Thu, 19 Dec 2019 14:54:58 +0000 (16:54 +0200)]
lvm/activate.py: clarify error message: fsid refers to osd_fsid
Users complained[1] the error message isn't clear, and they thought
it referred to the cluster fsid instead of the osd_fsid.
Made it clearer.
[1] rook/rook#4547
Fixes: https://tracker.ceph.com/issues/43442
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
(cherry picked from commit
ff3ba9200a6b5856fbdf4372fe292a7b94dd2539 )
Shyukri Shyukriev [Thu, 21 Nov 2019 14:04:02 +0000 (15:04 +0100)]
ceph-volume: util: look for executable in $PATH
Fixes: https://tracker.ceph.com/issues/36728
Fallback to predefined paths for backward compatibility.
Alter test involved for partial match in warning
Signed-off-by: Shyukri Shyukriev <shshyukriev@suse.com>
(cherry picked from commit
a8577085dc52b0f214d9568c29a9605d1a826a45 )
Ilya Dryomov [Tue, 21 Jan 2020 18:41:47 +0000 (19:41 +0100)]
doc/cephfs/client-auth: description and example are inconsistent
According to the path restriction example, the filesystem name
should be cephfs_a, not cephfs. Converge on cephfs_a to avoid it
being confused with with the pool tag, which is always cephfs.
This was introduced in
160c4bfeb811 ("mon/AuthMonitor: Use new osd
auth caps for ceph fs authorize").
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
267c00012a6562daba385186908598f348db059a )
Conflicts:
doc/cephfs/client-auth.rst [ commit
e7a7cf429ef3 ("doc:
filesystem to file system") not in mimic ]
Jan Fajerski [Tue, 21 Jan 2020 14:08:16 +0000 (15:08 +0100)]
Merge pull request #32544 from jan--f/c-v-backport-pr27282
mimic: ceph-volume: add utility functions
Yuri Weinstein [Mon, 20 Jan 2020 20:01:50 +0000 (12:01 -0800)]
Merge pull request #32598 from trociny/wip-43498-mimic
mimic: rbd-mirror: make logrotate work
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Mon, 20 Jan 2020 20:01:23 +0000 (12:01 -0800)]
Merge pull request #32361 from dzafman/wip-41255-mimic
mimic: osd: backfill_toofull seen on cluster where the most full OSD is at 1%
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 20 Jan 2020 20:00:16 +0000 (12:00 -0800)]
Merge pull request #31957 from dzafman/wip-balancer3-mimic
mimic: mgr: Release GIL and Balancer fixes
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 20 Jan 2020 19:58:49 +0000 (11:58 -0800)]
Merge pull request #31847 from smithfarm/wip-42990-mimic
mimic: tests: kernel.sh: update for read-only changes
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jan Fajerski [Mon, 20 Jan 2020 10:23:21 +0000 (11:23 +0100)]
Merge pull request #31557 from jan--f/wip-42765-mimic
mimic: mgr/prometheus: assign a value to osd_dev_node when obj_store is not filestore or bluestore
Mykola Golub [Mon, 30 Dec 2019 15:44:32 +0000 (17:44 +0200)]
rbd-mirror: fix 'rbd mirror status' asok command output
This was broken by
def50d04796 , and implicitly fixed during
refactoring in the master (octopus) by
adf1486e46c , hence it is a
direct commit to nautilus branch.
Fixes: https://tracker.ceph.com/issues/43429
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
0a0fcc7da4573e8b3c82440226747a2cc377496b )
Mykola Golub [Tue, 31 Dec 2019 10:01:31 +0000 (10:01 +0000)]
logrotate: also sighup rbd-mirror
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
86424fc3c895995d1d45f067c7852e6dce993027 )
Conflicts:
src/cephadm/cephadm (does not exist)
Mykola Golub [Tue, 31 Dec 2019 09:57:15 +0000 (09:57 +0000)]
rbd-mirror: reopen all contexts logs on SIGHUP
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
9ddf111506611a596c713ffe861a41aeda05e7a5 )
Conflicts:
src/tools/rbd_mirror/Mirror.cc (std::lock_guard vs Mutex::Locker, ceph_abort_msgf does not exist)
src/tools/rbd_mirror/PoolReplayer.cc (std::lock_guard vs Mutex::Locker)
Mykola Golub [Sun, 5 Jan 2020 09:10:24 +0000 (09:10 +0000)]
rbd-mirror: delay local/remote rados initialization until context created
We rely on that if a rados ref is initialized it contains the
valid context.
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
f3b49191771d2a3a20a7f55a14e0a7482ee96172 )
David Zafman [Sat, 14 Dec 2019 01:43:44 +0000 (17:43 -0800)]
mgr: Change default upmap_max_deviation to 5
Fixes: https://tracker.ceph.com/issues/43312
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
b0a1b758d012dfea40db3feca1a841c96f79defe )
Conflicts:
src/pybind/mgr/balancer/module.py (default isn't in COMMANDS section)
qa/standalone/mgr/balancer.sh (setting upmap_max_deviations to 1 differ)
David Zafman [Wed, 18 Dec 2019 19:27:02 +0000 (11:27 -0800)]
osdmaptool: Add --upmap-active to simulate active upmap balancing
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
621acf8ce7f48253e9d2189a9a2ee432fa1d3ba1 )
Conflicts:
src/test/cli/osdmaptool/help.t (some options not present)
src/tools/osdmaptool.cc (ceph_assert is assert here)
David Zafman [Wed, 18 Dec 2019 03:38:51 +0000 (19:38 -0800)]
doc: Add upmap options to osdmaptool man page and give example
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
184e9d1ae3b5bcc332d5fe3330d46a5cb8fcacd6 )
David Zafman [Wed, 18 Dec 2019 01:35:14 +0000 (17:35 -0800)]
tools: osdmaptool document non-upmap options that were missing
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
e42a6ccb1819be4988e3ed7bd78fcf513f8d1589 )
Conflicts:
doc/man/8/osdmaptool.rst (missing other options not part of this)
Jan Fajerski [Tue, 3 Dec 2019 15:42:18 +0000 (16:42 +0100)]
ceph-volume/test: patch VolumeGroups
In ceph_volume/tests/devices/lvm/strategies/test_bluestore.py the test
TestMixedType.test_filter_all_data_devs must patch VolumeGroups.
Fixes: https://tracker.ceph.com/issues/43107
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
5e115fd3763b182afc8d3f9f34f7a95a19c1d9d4 )
Michael Fritch [Fri, 22 Nov 2019 18:56:29 +0000 (11:56 -0700)]
ceph-volume: minor clean-up of `simple scan` subcommand help
Fixes: https://tracker.ceph.com/issues/43017
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
0d7b61d20423aeba842e0685428c42aa9000a88a )
Mohamad Gebai [Tue, 2 Apr 2019 10:51:14 +0000 (06:51 -0400)]
ceph-volume: add test for create_lv using a PV
Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit
90d296b302e74b59fc67c395b4d08537e2d37a1e )
Mohamad Gebai [Tue, 2 Apr 2019 10:44:10 +0000 (06:44 -0400)]
ceph-volume: add tests for tags
Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit
c88a6a8ad38410c60ea4945b46da6b3d458c0ff6 )
Mohamad Gebai [Mon, 1 Apr 2019 23:27:41 +0000 (19:27 -0400)]
ceph-volume: add tests for reduce_vg()
Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit
1f07776615b7bba5eacf34a8c9fa62c06a57eb4b )
Mohamad Gebai [Mon, 1 Apr 2019 23:24:42 +0000 (19:24 -0400)]
ceph-volume: add tests for size_from_human_readable()
Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit
6e3b5306140a433667d1be95df2eba0b57d95ae9 )
Mohamad Gebai [Sun, 31 Mar 2019 17:06:43 +0000 (13:06 -0400)]
ceph-volume: add function to convert from a readable string to Size
Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit
50428062175623d561be01a8124e010a61221845 )
Jan Fajerski [Wed, 8 Jan 2020 08:59:28 +0000 (09:59 +0100)]
Merge pull request #32530 from jan--f/wip-42754-mimic
mimic: ceph-volume: allow to skip restorecon calls
Jan Fajerski [Wed, 8 Jan 2020 08:56:04 +0000 (09:56 +0100)]
Merge pull request #32529 from jan--f/wip-42752-mimic
mimic: ceph-volume: add proper size attribute to partitions
Alfredo Deza [Tue, 5 Nov 2019 16:51:35 +0000 (11:51 -0500)]
ceph-volume tests validate restorecon skip calls
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
01e7a14fdc48d6c328502d1fea3069dbb3098b1b )
Alfredo Deza [Tue, 5 Nov 2019 16:51:16 +0000 (11:51 -0500)]
ceph-volume util.system allow skipping restorecon calls
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
33c8a64a54d9ea8962091caf8564cea3f603c5f5 )
Jan Fajerski [Fri, 8 Nov 2019 16:54:00 +0000 (17:54 +0100)]
ceph-volume: add proper size attribute to partitions
Fixes: https://tracker.ceph.com/issues/42710
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
26f14d1511087e386f30541af2daf26c664576f3 )
Jan Fajerski [Tue, 7 Jan 2020 15:34:02 +0000 (16:34 +0100)]
Merge pull request #31552 from jan--f/wip-42740-mimic
mimic: ceph-volume: use fsync for dd command
Rishabh Dave [Fri, 8 Nov 2019 07:04:27 +0000 (12:34 +0530)]
ceph-volume: use fsync for dd command
fsync makes sure that data and metadata is actually written to device
being zapped before finishing.
Fixes: https://tracker.ceph.com/issues/39156
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
060f54960c3d2d800b28525ba8774a60578f67a8 )
Jan Fajerski [Tue, 7 Jan 2020 08:46:45 +0000 (09:46 +0100)]
Merge pull request #31407 from smithfarm/wip-42533-mimic
mimic: ceph-volume: rearrange api/lvm.py
Jan Fajerski [Tue, 7 Jan 2020 08:46:29 +0000 (09:46 +0100)]
Merge pull request #31406 from smithfarm/wip-42534-mimic
mimic: ceph-volume: mokeypatch calls to lvm related binaries
Jason Dillaman [Mon, 23 Dec 2019 16:34:07 +0000 (11:34 -0500)]
librbd: diff iterate with fast-diff now correctly includes parent
When whole-object and include-parent options are enabled, the
diff will now include the parent image diffs. Previously, the
parent image diffs were not included when fast-diff was enabled
but was included when fast-diff was disabled.
Fixes: https://tracker.ceph.com/issues/42248
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
b61f83b )
David Zafman [Fri, 23 Aug 2019 15:54:28 +0000 (08:54 -0700)]
osd: Rename backfill reservation reject names to reflect too full use
The only reason for a reject is in a too full condition. Now that we
have two types of revoke, let's make this clearer.
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
0115595c1d1366cb3633e9dc6730496b9e5cf5c4 )
Conflicts:
src/osd/PeeringEvent.h
- file does not exist in nautilus due to refactoring: made the changes manually to src/osd/PGPeeringEvent.h
src/osd/PeeringState.cc
src/osd/PeeringState.h
- files do not exist in nautilus due to refactoring: made the changes manually to src/osd/PG.{cc,h}
by doing:
s/RejectRemoteReservation/RejectTooFullRemoteReservation/g
s/RemoteReservationRejected/RemoteReservationRejectedTooFull/g
David Zafman [Thu, 22 Aug 2019 17:30:01 +0000 (10:30 -0700)]
osd: Rename MBackfillReserve::TOOFULL to what it does in particular (revoke)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
7810ee584cc0fe9ca1b819d2a807dfc7cd13d292 )
Conflicts:
src/osd/PeeringState.cc
- file does not exist in nautilus due to refactoring: made the changes manually
to src/osd/PG.cc
David Zafman [Fri, 23 Aug 2019 15:52:39 +0000 (08:52 -0700)]
osd: Don't set backfill_toofull in RemoteReservationRevoked path
We shouldn't set backfill_toofull when a revoke occurs in the non-toofull
case.
Fixes: https://tracker.ceph.com/issues/41255
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
fa569ecfecc43ce685b29e0456f62cb085788f25 )
Conflicts:
src/osd/PeeringState.cc
- file does not exist in nautilus due to refactoring: made the changes manually
to src/osd/PG.cc
- no "DECLARE_LOCALS" in nautilus
Yuri Weinstein [Wed, 18 Dec 2019 19:40:14 +0000 (11:40 -0800)]
Merge pull request #32214 from smithfarm/wip-43235-mimic
mimic: tests: radosgw-admin: remove dependency on bunch package
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Wed, 18 Dec 2019 11:22:44 +0000 (12:22 +0100)]
Merge pull request #32255 from ideepika/wip-43315-mimic
mimic: doc: wrong datatype describing crush_rule
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Tue, 17 Dec 2019 20:21:45 +0000 (12:21 -0800)]
Merge pull request #32228 from alimaredia/wip-s3-tests-branch-name-refactor-mimic
mimic: update s3-test download code for s3-test tasks
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Ali Maredia [Mon, 25 Nov 2019 02:30:03 +0000 (21:30 -0500)]
mimic: update s3-test download code for s3-test tasks
Fixes: https://tracker.ceph.com/issues/43077
- Ensure the download code for all tasks running
s3-tests is consistent.
- Simplify download code to only use the config
variable 'force-branch' for the branch being
cloned.
- Make ceph-mimic the force-branch for all
suites using s3-tests.
- Add force-branch to suites running s3readwrite
& s3roundtrip tasks
Signed-off-by: Ali Maredia <amaredia@redhat.com>
Kefu Chai [Sat, 27 Jul 2019 13:35:37 +0000 (21:35 +0800)]
doc/rados/operations: crush_rule is a name
like
```
ceph osd pool set <pool-name> crush_rule <rule-name>
```
where `<rule-name>` is a string instead of a number.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
3ed3de6c964ba998d5b18ceb997d1a6dffe355db )
Neha Ojha [Fri, 13 Dec 2019 19:12:05 +0000 (11:12 -0800)]
Merge pull request #32249 from neha-ojha/wip-32197-mimic
mimic: doc/_templates/page.html: redirect to etherpad
Reviewed-by: Sage Weil <sage@redhat.com>
Neha [Thu, 12 Dec 2019 04:21:04 +0000 (04:21 +0000)]
doc/_templates/page.html: redirect to etherpad
This simplifies things for users who are not able to add cards to
https://github.com/ceph/ceph/projects/4 due to insufficient permissions.
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
066981dedbca161fba85d368d86c8ca15bfe0fac )
Jenkins Build Slave User [Thu, 12 Dec 2019 21:09:43 +0000 (21:09 +0000)]
13.2.8
Yehuda Sadeh [Sat, 7 Dec 2019 09:12:19 +0000 (01:12 -0800)]
qa: radosgw-admin: remove dependency on bunch package
Fixes: https://tracker.ceph.com/issues/43184
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
1bf21326aa7f8eaafd7049b44eb73aeb36bcc5d7 )
David Zafman [Thu, 5 Dec 2019 17:52:04 +0000 (09:52 -0800)]
release note: Add pending release notes for already merged code
Follow on to https://github.com/ceph/ceph/pull/31774
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
65d03bae8b4f50cc3cbaa50640eaeab4cabd711f )
Yuri Weinstein [Sat, 7 Dec 2019 20:59:20 +0000 (12:59 -0800)]
Merge pull request #32087 from yuriw/wip-yuriw-p2p-mimic
qa/tests: added missing ponit release versions
Yuri Weinstein [Fri, 6 Dec 2019 15:30:33 +0000 (07:30 -0800)]
qa/tests: added missing pnoit release versions
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Thu, 5 Dec 2019 20:37:51 +0000 (12:37 -0800)]
Merge pull request #32033 from cbodley/wip-qa-swift-mimic
qa/rgw: add missing force-branch: ceph-mimic for swift tasks
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Thu, 5 Dec 2019 20:15:57 +0000 (12:15 -0800)]
Merge pull request #32000 from smithfarm/wip-43119-mimic
mimic: osd: fix sending incremental map messages (more)
Reviewed-by: Neha Ojha <nojha@redhat.com>
Casey Bodley [Thu, 5 Dec 2019 16:21:49 +0000 (11:21 -0500)]
qa/rgw: add missing force-branch: ceph-mimic for swift tasks
Signed-off-by: Casey Bodley <cbodley@redhat.com>
David Zafman [Sat, 18 Aug 2018 00:25:38 +0000 (17:25 -0700)]
test: Fix test to use -gt instead of creating an empty file "0"
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
d0b260c272cf2732437c838c80ab380b4bb8d433 )
David Zafman [Tue, 3 Dec 2019 18:13:46 +0000 (10:13 -0800)]
test balancer: Backport specific fixes
Add "ceph balancer sleep" command to set balancer sleep_interval for testing
Remove unavailable "ceph balancer pool" part of testing
Remove setting of nonexistant osd_pool_default_pg_autoscale_mode
Improve balancer module log message
Fix log message test (no pg merging)
Pool balancing isn't grouped by rule, so results different here
Signed-off-by: David Zafman <dzafman@redhat.com>
Noah Watkins [Fri, 17 Aug 2018 22:21:57 +0000 (15:21 -0700)]
qa/standalone/ceph-helpers.sh: fix mgr module path
callers of get_python_path were not passing in a $1 parameter, so
ceph_lib was an empty string resulting in an invalid path to the built
cython modules. assume this is called from the `lib` parent directory.
pass path to the manager modules when starting ceph-mgr.
Signed-off-by: Noah Watkins <nwatkins@redhat.com>
(cherry picked from commit
7d3fa9bda3b0160c872e388c9f75cd1cabf9d4b5 )
Sage Weil [Fri, 15 Feb 2019 14:43:23 +0000 (08:43 -0600)]
osd: do not send peers really old maps
We may receive a message that sat in a queue for a while with a low
priority and is tagged with an older epoch. Don't send a bunch of old
maps that we have already sent the peer.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
fa58979c2ddf2f4aa68386d04a2dddae0cf38c7a )
Sage Weil [Fri, 15 Feb 2019 14:28:07 +0000 (08:28 -0600)]
osd: build_incremental_map_msg: recover if we are missing an incremental
If we are building a history and are missing an incremental, continue with
a full map in its place.
Generally speaking, an OSD should *always* have a full map stored, but
may not have the corresponding incremental for various reasons.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
b43ee7b58b7bed07dcd29e11a2519b08ed271b41 )