]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Tom Barron [Tue, 30 Oct 2018 19:09:54 +0000 (15:09 -0400)]
ceph-volume-client: allow setting mode of CephFS volumes
volume groups, snapshots, and snapshot groups.
Signed-off-by: Tom Barron <tpb@dyncloud.net>
(cherry picked from commit
f5906585f3a7df823b904e86ba0a11ea81327e10 )
Alfredo Deza [Tue, 4 Dec 2018 12:06:40 +0000 (07:06 -0500)]
Merge pull request #25350 from alfredodeza/luminous-c-v-inventory-add-device_id
luminous ceph-volume add device_id to inventory listing
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Jan Fajerski [Wed, 28 Nov 2018 09:21:36 +0000 (10:21 +0100)]
ceph-volume: add test for disk.udevadm_property
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
58316e3f826f8bb91b375589aa3676b664ce3984 )
Jan Fajerski [Wed, 21 Nov 2018 12:20:45 +0000 (13:20 +0100)]
ceph-volume: add device_id field to inventory output
This intends to mimic the C++ implementation in src/common/blkdev.cc.
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
41da5e9a4334628db09e3166eaceff79b9b6c7e0 )
Yuri Weinstein [Fri, 30 Nov 2018 16:14:46 +0000 (08:14 -0800)]
Merge pull request #24914 from smithfarm/wip-36429-luminous
luminous: tests: rbd: move OpenStack devstack test to rocky release
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Fri, 30 Nov 2018 16:14:17 +0000 (08:14 -0800)]
Merge pull request #24917 from smithfarm/wip-36554-luminous
luminous: rbd: [rbd-mirror] periodic mirror status timer might fail to be scheduled
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Fri, 30 Nov 2018 16:13:29 +0000 (08:13 -0800)]
Merge pull request #24975 from dillaman/wip-36568-luminous
luminous: qa/tasks/qemu: use unique clone directory to avoid race with workunit
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Fri, 30 Nov 2018 16:12:33 +0000 (08:12 -0800)]
Merge pull request #25006 from dillaman/wip-36407-luminous
luminous: rbd: pybind: added missing RBD_FLAG_FAST_DIFF_INVALID constant
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Yuri Weinstein [Fri, 30 Nov 2018 16:10:34 +0000 (08:10 -0800)]
Merge pull request #25253 from pdvian/wip-37364-luminous
luminous:librbd: fix missing unblock_writes if shrink is not allowed
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 29 Nov 2018 02:45:51 +0000 (18:45 -0800)]
Merge pull request #25030 from smithfarm/wip-36464-luminous
luminous: core: mgr crash on scrub of unconnected osd
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Thu, 29 Nov 2018 02:45:06 +0000 (18:45 -0800)]
Merge pull request #24648 from liewegas/wip-warning-fixes-luminous
luminous: common: shut up some warnings
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Thu, 29 Nov 2018 01:16:57 +0000 (17:16 -0800)]
Merge pull request #25025 from smithfarm/wip-36556-luminous
luminous: osd: RBD client IOPS pool stats are incorrect (2x higher; includes IO hints as an op)
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 29 Nov 2018 01:16:18 +0000 (17:16 -0800)]
Merge pull request #25028 from smithfarm/wip-36646-luminous
luminous: tests: librados api aio tests race condition
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Thu, 29 Nov 2018 01:15:12 +0000 (17:15 -0800)]
Merge pull request #25032 from smithfarm/wip-36575-luminous
luminous: cephfs: mgr/status: fix fs status subcommand did not show standby-replay MDS' perf info
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Yuri Weinstein [Thu, 29 Nov 2018 01:14:35 +0000 (17:14 -0800)]
Merge pull request #25035 from smithfarm/wip-36636-luminous
luminous: osd: race condition opening heartbeat connection
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Yuri Weinstein [Thu, 29 Nov 2018 01:14:06 +0000 (17:14 -0800)]
Merge pull request #25074 from jonsger/wip-36657-luminous
luminous: core: Objecter: add ignore cache flag if got redirect reply
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Yuri Weinstein [Thu, 29 Nov 2018 01:13:03 +0000 (17:13 -0800)]
Merge pull request #25184 from smithfarm/wip-25201-luminous
luminous: mgr: Module 'influx' has failed
Reviewed-by: Wido den Hollander <wido@widodh.nl>
Yuri Weinstein [Thu, 29 Nov 2018 01:09:24 +0000 (17:09 -0800)]
Merge pull request #24501 from dzafman/wip-remove-luminous
luminous: core: enable the pg deletion process to be throttled
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Thu, 29 Nov 2018 01:07:42 +0000 (17:07 -0800)]
Merge pull request #24649 from liewegas/wip-pr-23273-luminous
luminous: os/bluestore: handle spurious read errors
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Yuri Weinstein [Thu, 29 Nov 2018 01:06:53 +0000 (17:06 -0800)]
Merge pull request #24705 from smithfarm/wip-36145-luminous
luminous: fsck: cid is improperly matched to oid
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Yuri Weinstein [Thu, 29 Nov 2018 01:05:31 +0000 (17:05 -0800)]
Merge pull request #24833 from trociny/wip-36630-luminous
luminous: osd: potential deadlock in PG::_scan_snaps when repairing snap mapper
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Thu, 29 Nov 2018 01:04:49 +0000 (17:04 -0800)]
Merge pull request #24989 from jonsger/wip-36638-luminous
luminous: core: bluestore: rename does not old ref to replacement onode at old name
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Yuri Weinstein [Thu, 29 Nov 2018 01:03:53 +0000 (17:03 -0800)]
Merge pull request #24992 from jonsger/wip-26943-luminous
luminous: os/bluestore/BlueStore.cc: 1025: FAILED assert(buffer_bytes >= b->length) from ObjectStore/StoreTest.ColSplitTest2/2
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Yuri Weinstein [Thu, 29 Nov 2018 01:03:00 +0000 (17:03 -0800)]
Merge pull request #25018 from smithfarm/wip-36436-luminous
luminous: core: rados rm --force-full is blocked when cluster is in full status
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Noah Watkins [Wed, 28 Nov 2018 18:59:43 +0000 (10:59 -0800)]
Merge pull request #25267 from noahdesu/luminous-docs
luminous: doc: show edit on github links and version warnings
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Neha Ojha [Fri, 19 Oct 2018 20:26:53 +0000 (13:26 -0700)]
doc/_templates/page.html: add link to report doc bugs
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
de30c4d3c5927bb58b49b44b391647e397e1fe4f )
Noah Watkins [Mon, 1 Oct 2018 23:54:19 +0000 (16:54 -0700)]
luminous: doc: show edit on github links and version warnings
backport of #24452 that adds edit on
github links to documentation and notification banners that display
warnings when old documentation is being viewed.
this is not a cherry-pick: it removes from the original patch the
dynamic generation of the releases schedule from a yaml database file.
backporting this portion requires modifying the patch to deal with a
different file / directory structure [in luminous] with no real added value.
Signed-off-by: Noah Watkins <nwatkins@redhat.com>
Nathan Cutler [Tue, 27 Nov 2018 21:32:10 +0000 (22:32 +0100)]
Merge pull request #25049 from gregsfortytwo/luminous-readable-failures
luminous: test: make readable.sh fail if it doesn't run anything
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 27 Nov 2018 21:03:56 +0000 (22:03 +0100)]
Merge pull request #25001 from MrStupnikov/luminous-docfix-1358
luminous: doc: Put command template into literal block
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 27 Nov 2018 20:55:22 +0000 (21:55 +0100)]
Merge pull request #24752 from joscollin/wip-36309-luminous
luminous: doc: Fix typo error on cephfs/fuse/
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>
Nathan Cutler [Tue, 27 Nov 2018 20:31:42 +0000 (21:31 +0100)]
Merge pull request #24434 from joscollin/wip-36312-luminous
luminous: doc: fix broken fstab url in cephfs/fuse
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Jenkins Build Slave User [Mon, 26 Nov 2018 19:35:58 +0000 (19:35 +0000)]
12.2.10
runsisi [Mon, 12 Nov 2018 12:01:32 +0000 (20:01 +0800)]
librbd: fix missing unblock_writes if shrink is not allowed
Fixes: http://tracker.ceph.com/issues/36778
Signed-off-by: runsisi <luo.runbing@zte.com.cn>
(cherry picked from commit
3899bee9f5ea2c4b19fb1266a8b59f6e04e99926 )
Yuri Weinstein [Tue, 20 Nov 2018 17:19:43 +0000 (09:19 -0800)]
Merge pull request #25170 from badone/wip-luminous-ceph_ansible-specify-branch-stable-3.2
luminous: qa/ceph-ansible: Specify stable-3.2 branch
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Nathan Cutler [Tue, 20 Nov 2018 12:45:11 +0000 (13:45 +0100)]
mgr: Ignore daemon if no metadata was returned
It can happen that the Mgr does not return any metadata for a given
daemon as it might not be available at that moment.
None is returned by the get_metadata() method at that moment and both
the Influx and Telegraf module should then ignore the daemon in their
statistics and continue on to the next daemon.
Signed-off-by: Wido den Hollander <wido@42on.com>
(manual cherry-pick of
02569c88341a6dcc8aee5626f10ac2927c2cf064 )
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Brad Hubbard [Sun, 18 Nov 2018 23:37:02 +0000 (09:37 +1000)]
qa/ceph-ansible: Specify stable-3.2 branch
Ceph-ansible no longer supports luminous post stable-3.2.
Fixes: https://tracker.ceph.com/issues/37331
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
Yuri Weinstein [Tue, 20 Nov 2018 02:00:59 +0000 (18:00 -0800)]
Merge pull request #25162 from yuriw/wip-yuriw-ceph-ansible-ver-luminous
qa/tests: clean up
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Yuri Weinstein [Tue, 20 Nov 2018 01:53:50 +0000 (17:53 -0800)]
qa/tests: clean up
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Sage Weil [Wed, 17 Oct 2018 22:12:34 +0000 (17:12 -0500)]
os/bluestore: handle spurious read errors
Some kernels (4.9+) sometime fail to return data when reading
from a block device under memory pressure. This patch retries
the read if the checksum verification fails, tests show that
the first retried read succeeds in ~99.5% of the cases, so
3 attempts are made by default before giving up on the data.
Works-around: http://tracker.ceph.com/issues/22464
Signed-off-by: Paul Emmerich <paul.emmerich@croit.io>
(cherry picked from commit
cffcbc73aaaa874829d5fc9091af3042b887f9a7 )
Conflicts:
src/common/legacy_config_opts.h
- adjacent options
src/common/options.cc
- no RUNTIME flag in luminous
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h
- adjacent perfcounter
src/test/objectstore/store_test.cc
- adjacent tests, no #ifdef
- g_conf, not g_conf()
- no create_new_collection
- queue_transaction etc take osr, not ch
Alexey Stupnikov [Thu, 8 Nov 2018 19:44:33 +0000 (20:44 +0100)]
luminous: doc: put command template into literal block
``ceph-deploy osd create --data {device} {ceph-node}`` command
is not displayed properly because of missing double colons.
Signed-off-by: Alexey Stupnikov <aleksey.stupnikov@gmail.com>
(cherry picked from commit
bff5a2122fd2a059c6576f36d7d1505c8d747776 )
Alfredo Deza [Fri, 16 Nov 2018 18:02:56 +0000 (13:02 -0500)]
Merge pull request #25134 from alfredodeza/luminous-c-v-dont-duplicated-rejected-reasons
luminous ceph-volume: rename Device property valid to available
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Jan Fajerski [Fri, 16 Nov 2018 08:27:34 +0000 (09:27 +0100)]
c-v device test: rename valid to available
Update test to reflect
8a80990471108b0920d1d8aa1239733ae2b20e9c
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
047dc1c157e44642fa83873f02674b146e6d9028 )
Jan Fajerski [Fri, 16 Nov 2018 08:24:37 +0000 (09:24 +0100)]
inventory test: rename valid to available
Fixes test to reflect
8a80990471108b0920d1d8aa1239733ae2b20e9c
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
d895f97bb021c765f3c4d2d091b23bd0eef19f71 )
Jan Fajerski [Fri, 16 Nov 2018 08:22:06 +0000 (09:22 +0100)]
ceph-volume: rename Device property valid to available
This flag is used in the inventory reporting and available is deemed more
appropriate. Furthermore this fixes a bug where rejected_reasons
accumulated duplicate entries.
Fixes: http://tracker.ceph.com/issues/36701
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
8a80990471108b0920d1d8aa1239733ae2b20e9c )
Alfredo Deza [Fri, 16 Nov 2018 15:22:15 +0000 (10:22 -0500)]
Merge pull request #25131 from alfredodeza/luminous-c-v-inventory-doc
luminous doc: add ceph-volume inventory sections
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Jan Fajerski [Wed, 14 Nov 2018 13:09:37 +0000 (14:09 +0100)]
doc: add ceph-volume inventory sections
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
dfc0e1d9a69f6f9ffb1d3e0b0ec33a75827c36e0 )
Andrew Schoen [Thu, 15 Nov 2018 17:23:29 +0000 (11:23 -0600)]
Merge pull request #25117 from alfredodeza/luminous-rm26953
luminous ceph-volume: allow to specify --cluster-fsid instead of reading from ceph.conf
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Wed, 3 Oct 2018 19:21:03 +0000 (15:21 -0400)]
ceph-volume tests.lvm verify get_cluster_fsid can read from args or ceph.conf
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
02ea6dc0663cdaf764fdb1a1a5b31a736b854e6e )
Alfredo Deza [Wed, 3 Oct 2018 17:32:05 +0000 (13:32 -0400)]
ceph-volume lvm.prepare consume the value from --cluster-fsid if available
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
a92883e60f3f2206a11b43762b3afcb84b05f07e )
Alfredo Deza [Wed, 3 Oct 2018 17:31:43 +0000 (13:31 -0400)]
ceph-volume lvm.common add the --cluster-fsid flag
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
15546ae6991c244197537d81092875b12613e20b )
Alfredo Deza [Wed, 14 Nov 2018 23:17:29 +0000 (18:17 -0500)]
Merge pull request #25104 from alfredodeza/luminous-rm-27062
luminous ceph-volume: reject devices that have existing GPT headers
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Wed, 14 Nov 2018 21:34:27 +0000 (16:34 -0500)]
Merge pull request #25101 from alfredodeza/luminous-bz1644828
luminous ceph-volume: remove LVs when using zap --destroy
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Wed, 14 Nov 2018 16:35:32 +0000 (10:35 -0600)]
ceph-volume: update tests after removing the LVPath arg validator
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: rm#27062
(cherry picked from commit
0cb95ace88a731f7c30adf3f2286691fa3b2c49c )
Andrew Schoen [Tue, 13 Nov 2018 19:02:39 +0000 (13:02 -0600)]
ceph-volume: return lvs as vg/lv from ValidDevice if as_string is True
All code in prepare and activate expect lvs to be in that format.
Eventually we can refactor all that to use the Device class as well.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: rm#27062
(cherry picked from commit
fdf7f3c575299b6be0ac40fb6eee5106cea010c9 )
Andrew Schoen [Tue, 13 Nov 2018 18:40:45 +0000 (12:40 -0600)]
ceph-volume: adds lv_name property to Device class
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: rm#27062
(cherry picked from commit
cc0317efac5a3a25edcdb48af2a63a969c2ac43a )
Andrew Schoen [Tue, 13 Nov 2018 18:28:23 +0000 (12:28 -0600)]
ceph-volume: combine the LVPath arg validator with ValidDevice
This combines the two arg validators and makes both batch and
prepare/active both use ValidDevice.
This will also allow us to use lvs with a full path, like
/dev/vg/lv instead of always enforcing vg/lv.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: rm#27062
(cherry picked from commit
d6a5a7606c3a0c1f1624c5784abb02bb1a4e1620 )
Andrew Schoen [Tue, 13 Nov 2018 18:27:19 +0000 (12:27 -0600)]
ceph-volume: adds has_gpt_headers property to Device class
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: rm#27062
(cherry picked from commit
568a0ce5be0161541772ceacb9b81652f51659f5 )
Andrew Schoen [Tue, 13 Nov 2018 15:35:21 +0000 (09:35 -0600)]
ceph-volume: add PTTYPE to blkid parser
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
Resolves: rm#27062
(cherry picked from commit
3d86d2dda9fae87e143e5212d5f354a22f02909d )
Alfredo Deza [Tue, 13 Nov 2018 22:06:03 +0000 (17:06 -0500)]
ceph-volume tests update tests to handle new SystemExit exceptions in main
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
27d0a915d4a7f56aafc603a949b4e4c36772d236 )
Alfredo Deza [Tue, 13 Nov 2018 22:05:31 +0000 (17:05 -0500)]
ceph-volume tests.api verify that Volume object can be removed
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
9527cffbe335043f7c5a60162138dfe093ae51da )
Alfredo Deza [Tue, 13 Nov 2018 21:56:02 +0000 (16:56 -0500)]
ceph-volume api.lvm allow passing a Volume object to remove_lv
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
e7daa71604f4d08ace1125bb63dcfe909796d3ab )
Alfredo Deza [Tue, 13 Nov 2018 21:05:32 +0000 (16:05 -0500)]
ceph-volume tests.functional.lvm test full removal of LVs
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
4656bf0e333a50e0fca5fd0612cdda98ab5d70f9 )
Alfredo Deza [Tue, 13 Nov 2018 13:32:16 +0000 (08:32 -0500)]
ceph-volume main raise sys.exit to prevent garbage in help
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
f695d1716e9fc6252dd713eb8fb08c28b1284611 )
Alfredo Deza [Tue, 13 Nov 2018 13:30:23 +0000 (08:30 -0500)]
ceph-volume lvm.zap remove vgs|lvs when --destroy is used
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
677cbbb059185fe2808746b36bd3f988ff2af41c )
David Zafman [Tue, 9 Oct 2018 20:24:38 +0000 (13:24 -0700)]
osd: New configuration option osd_delete_sleep
Causes the remove_wq thread to sleep the specified number
of seconds between transactions.
Fixes: http://tracker.ceph.com/issues/36321
Signed-off-by: David Zafman <dzafman@redhat.com>
This backport is not cherry-picked from master since the remove
threadpool was folded into the main op queue post-luminous, so the
code is almost entirely different.
David Zafman [Tue, 9 Oct 2018 16:11:29 +0000 (09:11 -0700)]
osd: Separate removal and recovery thread pools
The name "disk_tp" was misleading because it was only used for
removal and recovery.
Signed-off-by: David Zafman <dzafman@redhat.com>
This backport is not cherry-picked from master since the remove
threadpool was folded into the main op queue post-luminous, so the
code is almost entirely different.
Andrew Schoen [Tue, 13 Nov 2018 16:12:35 +0000 (10:12 -0600)]
Merge pull request #25067 from alfredodeza/luminous-rm36768
luminous ceph-volume: patch Device when testing
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Iain Buclaw [Thu, 11 Oct 2018 17:47:38 +0000 (19:47 +0200)]
Objecter: add ignore cache flag if got redirect reply
Similar to fix for https://tracker.ceph.com/issues/23296
Fixes: https://tracker.ceph.com/issues/36406
Signed-off-by: Iain Buclaw <iain.buclaw@sociomantic.com>
(cherry picked from commit
c9df14b8fc29708e91e745231e67db7fca382de7 )
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>
Alfredo Deza [Mon, 12 Nov 2018 17:57:26 +0000 (12:57 -0500)]
ceph-volume tests patch Device() by splitting parametrized method
This was causing failures on systems where there is no LVM or where the
device names don't match. Patching is always recommended to avoid
conflicts with the system testing
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
82d96f876484c9668e2fc4726057691ba2c50f06 )
Alfredo Deza [Mon, 12 Nov 2018 17:56:42 +0000 (12:56 -0500)]
ceph-volume tests inventory should patch before using .get_devices()
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
7ee7a59910c9837659419c235f669a53cc9f613c )
Andrew Schoen [Mon, 12 Nov 2018 16:15:08 +0000 (10:15 -0600)]
Merge pull request #25012 from alfredodeza/luminous-rm36470
luminous ceph-volume enable --no-systemd flag for simple sub-command
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Mon, 12 Nov 2018 13:37:52 +0000 (08:37 -0500)]
Merge pull request #25014 from alfredodeza/luminous-ceph-volume-inventory
luminous ceph-volume: add inventory command
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Greg Farnum [Mon, 29 Oct 2018 18:15:46 +0000 (11:15 -0700)]
test: make readable.sh fail if it doesn't run anything
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit
66239633880952bc29a64f15a42b3cd20e856957 )
Mykola Golub [Tue, 30 Oct 2018 08:36:58 +0000 (10:36 +0200)]
osd: potential deadlock in PG::_scan_snaps when repairing snap mapper
Using apply_transaction when holding the pg lock is not safe.
It was fixed in master (mimic) during os, osd refactoring, and this
commit is a partial backport of
907b6281e99ece3677dd7b012cf4955731db6120 .
Fixes: http://tracker.ceph.com/issues/36630
Signed-off-by: Mykola Golub <mgolub@suse.com>
Sage Weil [Mon, 29 Oct 2018 01:21:53 +0000 (20:21 -0500)]
osd: fix heartbeat_reset unlock
Fixes
51d8e2457d73c709bfa4f706793696b3ce704ff9 , which moved to lock_guard
but didn't remove the unlock call on this exit path.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
1a0e2f7e1518d57bc07176f4297315a7c9a3c139 )
Conflicts:
src/osd/OSD.cc
- luminous has a s->put() call that was subsequently removed
Sage Weil [Fri, 26 Oct 2018 15:39:28 +0000 (10:39 -0500)]
osd: take heartbeat_lock before checking for session
When we open a connection, there is a short window before we attach
the session. If a fault happens quickly, we won't get the reset, and
will persistently fail to send osd pings.
Move the lock up to avoid this. Note that we should rarely really see
connections without sessions here anyway (except when this specific
race happens), so this should have no negative impact (by taking the lock
when we weren't before).
Fixes: http://tracker.ceph.com/issues/36602
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
51d8e2457d73c709bfa4f706793696b3ce704ff9 )
Conflicts:
src/osd/OSD.cc
- use Mutex::Locker instead of std::lock_guard (latter is a C++17ism)
Zhi Zhang [Thu, 11 Oct 2018 09:12:52 +0000 (17:12 +0800)]
mgr/status: fix fs status subcommand did not show standby-replay MDS' perf info
Fixes: http://tracker.ceph.com/issues/36399
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
(cherry picked from commit
56eabfd81456cfd20ea32e70d55d680610be4de4 )
Conflicts:
src/mds/MDLog.cc
- mimic does not have
48a33f6f068
Sage Weil [Fri, 21 Sep 2018 14:10:22 +0000 (09:10 -0500)]
mgr/DaemonServer: add missing return
Fixes: http://tracker.ceph.com/issues/36110
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
28debec0f366dd6ead8ae2e263a6683c71f86d4c )
Josh Durgin [Tue, 23 Oct 2018 20:19:51 +0000 (16:19 -0400)]
test/librados/aio: remove unused callbacks
That callbacks are called is covered by many other tests.
These particular m_safe and m_complete fields were unused.
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit
b148a231b44b5ee88da3e4894e79bd44faddce46 )
Conflicts:
src/test/librados/aio.cc
- master has make_scope_guard() calls that are absent in luminous
Josh Durgin [Tue, 23 Oct 2018 20:06:02 +0000 (16:06 -0400)]
test/librados/aio: wait for all completions properly
Using global semaphores was error-prone and unnecessary. Unbalanced
usage resulted in a race like:
aio_write object foo -> dropped on full OSD
aio_read object foo -> -ENOENT
The intent of the test was to wait for the write to complete, so
do that explicitly for each aio test and remove the semaphores.
Fixes: http://tracker.ceph.com/issues/24587
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit
75a776c0eb1abd3093cafd095326682175495a6b )
Jason Dillaman [Fri, 13 Jul 2018 13:48:56 +0000 (09:48 -0400)]
osd: do not treat an IO hint as an IOP for PG stats
Fixes: http://tracker.ceph.com/issues/24909
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
d304d618b7297862b96cf7a6a5f9984f764c9e3f )
Yang Honggang [Tue, 25 Sep 2018 10:19:40 +0000 (18:19 +0800)]
tools/rados/rados.cc: fix rados rm --force-full blocking problem
Fixes: https://tracker.ceph.com/issues/36177
Signed-off-by: Yang Honggang <yanghonggang@umcloud.com>
(cherry picked from commit
3d2b99405ebb120d7c3fc1b2710cdfac4a59441a )
Conflicts:
src/tools/rados/rados.cc
- trivial resolution
Jan Fajerski [Wed, 31 Oct 2018 13:59:05 +0000 (14:59 +0100)]
ceph-volume: add inventory command
The inventory command provides information about a nodes disk inventory.
Existing logical volumes on a disk or one of its partitions are scanned
and reported.
The output can be formatted as plain text or json.
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
57adfc6bb8abd9fc84b1378d5f69a16994d19e11 )
Alfredo Deza [Thu, 8 Nov 2018 19:14:17 +0000 (14:14 -0500)]
ceph-volume tests ensure activate behavior with systemd disabling
Signed-off-by: Alfredo Deza <alfredo@deza.pe>
(cherry picked from commit
3e80118ccaccaa61e92b01f4f389d6056401d8a7 )
Alfredo Deza [Thu, 8 Nov 2018 19:13:52 +0000 (14:13 -0500)]
ceph-volume simple.activate factor out systemd interactions for easier testing
Signed-off-by: Alfredo Deza <alfredo@deza.pe>
(cherry picked from commit
18ddd962116b5359af770088535f502797ac79c4 )
Alfredo Deza [Thu, 8 Nov 2018 14:14:24 +0000 (09:14 -0500)]
ceph-volume simple.trigger replace systemd with from_trigger keyword argument
Signed-off-by: Alfredo Deza <alfredo@deza.pe>
(cherry picked from commit
9526587403b76fa5397ae80b63328e3a59765c2e )
Alfredo Deza [Thu, 8 Nov 2018 14:13:31 +0000 (09:13 -0500)]
ceph-volume simple.activate allow a --no-systemd flag to skip systemctl actions
Signed-off-by: Alfredo Deza <alfredo@deza.pe>
(cherry picked from commit
4d9ad0d3d4bedd5efa95653fbb86607f0b469174 )
Alfredo Deza [Fri, 9 Nov 2018 14:07:22 +0000 (09:07 -0500)]
Merge pull request #24981 from alfredodeza/luminous-bz1644265
luminous ceph-volume util.encryption robust blkid+lsblk detection of lockbox
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Jason Dillaman [Fri, 9 Nov 2018 14:05:16 +0000 (09:05 -0500)]
pybind/rbd: added missing RBD_FLAG_FAST_DIFF_INVALID constant
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(derived from commit
36d3b17dc8c9af0d62ada4b9b0e4af58ec825b46 )
Sage Weil [Mon, 13 Aug 2018 17:10:31 +0000 (12:10 -0500)]
os/bluestore: fix split vs finish_write race
In _tcx_finish(), we were looking at the right Cache for the collection,
and then calling finish_write with that Cache and taking the lock. This
could race with a split_cache() such that after we got the lock the
collection was not on a different cache. This would in turn lead to a
failed assertion later on in _rm_buffer when the sharedblob was trimmed.
Fixes: http://tracker.ceph.com/issues/24439
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
f21f1f14f2d2a465ba072118bd8e32271bf8906e )
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>
Sage Weil [Sun, 21 Oct 2018 23:33:57 +0000 (18:33 -0500)]
os/bluestore: show compress and buffered from WriteContext
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
90c3c2032cd903505ed706aa5406b1536de03d4a )
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>
Sage Weil [Sat, 20 Oct 2018 20:16:50 +0000 (15:16 -0500)]
os/bluestore: fix rename race with trim on replacement onode at old name
- rename from foo to bar
- foo onode is moved to bar in onode_map
- keys removed at position foo as part of txc
- new onode for foo is installed at foo in map
...
- cache trims foo
...
- new txn B does get_onode on foo, reads old foo (now bar) onode into foo ***
- txn A commits
-> onode cache has foo with stale bar content
Fix by holding a ref to the replacement foo onode so that get_onode cannot
read stale metadata out of kvdb before txn A commits.
Fixes: http://tracker.ceph.com/issues/36541
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
6e14a50e20c18d5f851d34d6979148128c12a279 )
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>
Alfredo Deza [Fri, 2 Nov 2018 19:03:45 +0000 (15:03 -0400)]
ceph-volume util.encryption robust blkid+lsblk detection of lockbox
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
fc3e6ea3d9200e0fe2a3aa2576fcd45db223c277 )
Jason Dillaman [Mon, 22 Oct 2018 14:44:40 +0000 (10:44 -0400)]
qa/tasks/qemu: use unique clone directory to avoid race with workunit
If there is a workunit task associated with the same client, the two
tasks will attempt to clone the suite repo to the same directory.
Worse, if it's parallel tasks, the two clones will clobber each
other.
Fixes: http://tracker.ceph.com/issues/36542
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
5d56014c61b107dcb5d05c2221c2e844324f304c )
Alfredo Deza [Wed, 7 Nov 2018 11:46:32 +0000 (06:46 -0500)]
Merge pull request #24960 from alfredodeza/luminous-rm36672
luminous ceph-volume tests install ceph-ansible's requirements.txt dependencies
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Tue, 6 Nov 2018 21:46:05 +0000 (15:46 -0600)]
Merge pull request #24958 from alfredodeza/luminous-rm36704
luminous: ceph-volume tests.systemd update imports for systemd module
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Thu, 1 Nov 2018 12:48:28 +0000 (08:48 -0400)]
ceph-volume tests install ceph-ansible's requirements.txt dependencies
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
52ddb69813c5849506db5f850a3f2532ff1124b5 )
Alfredo Deza [Tue, 6 Nov 2018 14:45:08 +0000 (09:45 -0500)]
ceph-volume tests.systemd update imports for systemd module
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
a63a6c86a03738bf50fa71a490951343a83afff6 )
Alfredo Deza [Tue, 6 Nov 2018 14:44:39 +0000 (09:44 -0500)]
ceph-volume systemd import main so console_scripts work for executable
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
280e2baab27cc061d2d5e456f098cd3405f36873 )
Andrew Schoen [Tue, 6 Nov 2018 21:05:48 +0000 (15:05 -0600)]
Merge pull request #24827 from alfredodeza/luminous-rm36246
luminous ceph-volume util.encryption don't push stderr to terminal
Reviewed-by: Andrew Schoen <aschoen@redhat.com>