]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Alfredo Deza [Wed, 25 Apr 2018 14:48:45 +0000 (10:48 -0400)]
doc/ceph-volume include information for devices in listing
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
009d49a4f5cf8c97a156b710342d4786b734747b )
Alfredo Deza [Wed, 25 Apr 2018 13:50:24 +0000 (09:50 -0400)]
ceph-volume tests verify associated pvs reporting on listing
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
f57cc594c282cf06a75b2278ca1c2b2d38f87aa3 )
Alfredo Deza [Tue, 24 Apr 2018 21:35:08 +0000 (17:35 -0400)]
ceph-volume tests update to include devices on listing
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
08dea1b7d1d92d893c2f0a5e6e750d838d9cdbe4 )
Alfredo Deza [Tue, 24 Apr 2018 21:16:50 +0000 (17:16 -0400)]
ceph-volume lvm.listing include associated physical devices
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
be1e6c2ae9a6e6a77fcb5297badb1aa58548180c )
Alfredo Deza [Tue, 24 Apr 2018 21:11:42 +0000 (17:11 -0400)]
ceph-volume api.lvm include lv_uuid on pvs listings
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
12a7a48c53b16f52a76ad74773aaa67f8bfc7c52 )
Jenkins Build Slave User [Mon, 23 Apr 2018 16:18:33 +0000 (16:18 +0000)]
12.2.5
Andrew Schoen [Fri, 20 Apr 2018 18:23:04 +0000 (18:23 +0000)]
Merge pull request #21565 from alfredodeza/backport-wip-ceph-volume
luminous: ceph-volume: Nits noticed while studying code
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Fri, 20 Apr 2018 18:07:51 +0000 (18:07 +0000)]
Merge pull request #21574 from alfredodeza/backport-cv-doc-updates
luminous: ceph-volume update man page for prepare/activate flags
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Fri, 20 Apr 2018 16:22:40 +0000 (12:22 -0400)]
doc/man/ceph-volume update flags for activate
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
a454abc863817cd393e01e8c135174c1e1839be2 )
Alfredo Deza [Fri, 20 Apr 2018 16:46:48 +0000 (12:46 -0400)]
doc/man/ceph-volume update flags for prepare
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
ae96b9f0a283a65ddf6887461f3515a5a756572b )
Yuri Weinstein [Fri, 20 Apr 2018 17:01:22 +0000 (10:01 -0700)]
Merge pull request #21492 from b-ranto/wip-mgr-rgw-luminous
[luminous] Backport recent prometheus rgw changes
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Dan Mick [Tue, 17 Apr 2018 02:13:18 +0000 (19:13 -0700)]
Remove unused and wrongly-described _lsblk_type
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit
a97419f5d2b23131242a3602f2fa5f91ac7bc74d )
Dan Mick [Tue, 17 Apr 2018 01:37:30 +0000 (18:37 -0700)]
Fix mixing of format() and %-interpolation
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit
9e9a07c9ae41cc72e587dfd6551fd83389cc35e6 )
Dan Mick [Tue, 17 Apr 2018 01:35:33 +0000 (18:35 -0700)]
Spelling/typos
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit
15ef400bb35e70cbb27144d595759d31a075aa37 )
Andrew Schoen [Fri, 20 Apr 2018 15:13:28 +0000 (15:13 +0000)]
Merge pull request #21538 from alfredodeza/backport-rm23678
luminous: ceph-volume: allow skipping systemd interactions on activate/create
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Rubab-Syed [Tue, 9 Jan 2018 23:32:42 +0000 (04:32 +0500)]
mgr/dashboard: performance counter browsers
Signed-off-by: Rubab-Syed <rubab.syed21@gmail.com>
(cherry picked from commit
25ecfbd9cfb620463de1545ca0be50001c805460 )
Conflicts: Removed dashboard changes
John Spray [Thu, 9 Nov 2017 11:27:24 +0000 (06:27 -0500)]
mgr: expose have_mon_connection to python modules
So that they can warn their end users if the data
we have is probably stale.
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
5633328e28c0f7a5122229737c2ca132174a4349 )
Alfredo Deza [Wed, 18 Apr 2018 00:29:26 +0000 (20:29 -0400)]
ceph-volume lvm.activate add --no-systemd flag to skip starting/enabling services
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
75685e33bfc192f3a3b16ad57b8cd40313bd8bc6 )
Alfredo Deza [Wed, 18 Apr 2018 00:28:14 +0000 (20:28 -0400)]
ceph-volume lvm.common add --no-systemd flag to skip enabling/starting services
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
832da49ca8f1a57807f8a892cd734aa9b37216a6 )
Alfredo Deza [Wed, 18 Apr 2018 12:20:57 +0000 (08:20 -0400)]
ceph-volume tests functional python tests for --no-systemd in activate
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
8848d037086f889a880f5ea1d3bb2254e16faf7b )
Andrew Schoen [Thu, 19 Apr 2018 19:55:24 +0000 (19:55 +0000)]
Merge pull request #21533 from alfredodeza/backport-rm23067
luminous: ceph-volume Implement an 'activate all' to help with dense servers or migrating OSDs
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Sage Weil [Thu, 19 Apr 2018 18:40:50 +0000 (13:40 -0500)]
Merge pull request #21506 from liewegas/wip-rados-test-luminous
qa/workunits/rados/test-upgrade-to-mimic.sh: fix tee output
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Jan Fajerski [Thu, 19 Apr 2018 15:27:03 +0000 (17:27 +0200)]
pybind/mgr/prometheus: fix creation of osd_metadata metric
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
05a37d4a61c427ed532138ab0c13a9dd4d0f65fb )
John Spray [Sun, 8 Apr 2018 14:21:27 +0000 (15:21 +0100)]
mgr/prometheus: fix and complete PG state names
...and reformat into a flat list in the same
order as found in osd_types.cc so that it's
easy to cross check.
Fixes: https://tracker.ceph.com/issues/23584
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
48acc6c7981ef6cbb962883cd36e2666a16d9c23 )
John Spray [Wed, 28 Feb 2018 14:03:42 +0000 (14:03 +0000)]
mgr/prometheus: skip OSD output if missing from CRUSH devices
Apparently this occurs as a transient state while adding
OSDs.
Fixes: https://tracker.ceph.com/issues/23166
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
e8e5bffbb0842cc9c41bb64e7e9b5c6e2898fc0c )
Alfredo Deza [Tue, 10 Apr 2018 00:00:27 +0000 (20:00 -0400)]
ceph-volume lvm.activate error if no bluestore OSDs are found
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
b1920d6e731f194c4829810d849dba6b087ce3a4 )
Alfredo Deza [Mon, 9 Apr 2018 17:56:45 +0000 (13:56 -0400)]
ceph-volume tests/functional add 'activate all' for xenial/filestore/dmcrypt
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
d6524297ac423ffc7ea82dc9598d27b4cc61a0ae )
Alfredo Deza [Mon, 9 Apr 2018 17:56:31 +0000 (13:56 -0400)]
ceph-volume tests/functional add 'activate all' for xenial/bluestore/dmcrypt
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
452081e57e5de9bb3a1391f22ffcac1bb712f2e9 )
Alfredo Deza [Mon, 9 Apr 2018 17:56:12 +0000 (13:56 -0400)]
ceph-volume tests/functional add 'activate all' for centos7/filestore/dmcrypt
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
5513f4de4ee0b4802bc1c0d1af754dd2d80486ed )
Alfredo Deza [Mon, 9 Apr 2018 17:55:59 +0000 (13:55 -0400)]
ceph-volume tests/functional add 'activate all' for centos7/bluestore/dmcrypt
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
16421c9058011e115cf043de4cf279cbbd0ac0ce )
Alfredo Deza [Mon, 9 Apr 2018 17:55:15 +0000 (13:55 -0400)]
ceph-volume tests/functional add 'activate all' in filestore playbook
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
ef09f3996b8a165112afc4e6912a119015c798be )
Alfredo Deza [Mon, 9 Apr 2018 17:55:05 +0000 (13:55 -0400)]
ceph-volume tests/functional add 'activate all' in bluestore playbook
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
797518a54603ad8fc9b57a66eab7cf7e55ea0299 )
Alfredo Deza [Thu, 29 Mar 2018 18:03:00 +0000 (14:03 -0400)]
ceph-volume tests ensure activate all behavior
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
2d8f48983d8674376a57ad98db16700bc00f8e29 )
Alfredo Deza [Thu, 29 Mar 2018 18:02:25 +0000 (14:02 -0400)]
ceph-volume lvm.activate warn when no osds are found with --all
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
967938a0cf4353e99eb55815cde4ee90d6d4b79b )
Alfredo Deza [Thu, 29 Mar 2018 16:55:42 +0000 (12:55 -0400)]
ceph-volume tests add process.call unit tests
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
6975e221d9f0c1b17531ca6fed87882b514e6d95 )
Alfredo Deza [Thu, 29 Mar 2018 12:59:19 +0000 (08:59 -0400)]
ceph-volume lvm.activate add 'activate all' functionality
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
fb0008ea8babe0065c08d3377bdabd36f3c2fa33 )
Alfredo Deza [Thu, 29 Mar 2018 12:58:14 +0000 (08:58 -0400)]
ceph-volume process.call add conditional verbosity on failure
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
50c9d5331b0c42d568baa47a2d52f199b3b4d818 )
Alfredo Deza [Thu, 29 Mar 2018 12:35:17 +0000 (08:35 -0400)]
ceph-volume systemd.systemctl add helpers for daemon status
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
2e8249f9e233d408fc45b772e45995c00f5180d7 )
Alfredo Deza [Tue, 27 Mar 2018 11:51:03 +0000 (07:51 -0400)]
ceph-volume lvm.listing create a helper that lists osds
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
cee7612ce400ca4bc3e6e5dbcc1a158178edafe5 )
Alfredo Deza [Mon, 26 Mar 2018 18:20:30 +0000 (14:20 -0400)]
ceph-volume lvv.activate allo to configure the CLI with --all
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
4f305eb661553bebc1a86d18c11f596fa6206828 )
Andrew Schoen [Thu, 19 Apr 2018 14:44:10 +0000 (14:44 +0000)]
Merge pull request #21509 from ceph/backport-rm23757
luminous: ceph-volume: allow parallel creates
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Andrew Schoen [Thu, 19 Apr 2018 14:41:52 +0000 (14:41 +0000)]
Merge pull request #21505 from ceph/backport-rm23581
luminous: ceph-volume: automatic VDO detection
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Thu, 19 Apr 2018 13:29:38 +0000 (09:29 -0400)]
Merge pull request #21519 from ceph/evelu-luminous-readonly
luminous: ceph-volume: Using --readonly for {vg|pv|lv}s commands
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Erwan Velu [Fri, 13 Apr 2018 08:16:44 +0000 (10:16 +0200)]
ceph-volume: Using --readonly for {vg|pv|lv}s commands
The actual code is detecting {vg|pv|lv}s by running the usual {vg|pv|lv}s commands.
Those calls expect lvmetad to be aware of the actual state of them.
This works actually pretty well in most of the cases.
When ceph-volume is run from a container,
this code also works from the container itself but don't on the host.
On the host side, running {vg|pv|lv}s commands reports nothing,
making ceph-volume reporting "No valid Ceph devices found"
The root cause is lvmetad not receiving the udev notification and so,
{vg|pv|lv}s commands reports the 'known' state instead of the 'real' state.
This is a major issue as it means that it exists cases or maybe races where
ceph-volume reports "No valid Ceph devices found" while the disk
actually have some Ceph data & metadata on them.
This could be interpreted like disks are free/available while they are not.
This will mislead users or configuration tools trying to understand the
current state of a node.
In July 2015, as per https://www.redhat.com/archives/lvm-devel/2015-July/msg00086.html,
a new option called "--readonly" have been added to lvm2.
One of the most interesting part of it is : "disable using lvmetad so VGs are read from disk"
In our case, that feature is really interesting as it means that
everytime ceph-volume calls a {vg|pv|lv}s command, it will read the
metadata from the disks instead of considering the lvmetad status.
This patch change all the {vg|pv|lv}s call to use --readonly.
It solves the bug exposed here and doesn't affect the traditional use-case.
The main benefit of this patch is to avoid a false report of a disk not having metadata.
(cherry picked from commit
7be00cd19297ec80b4a629e2fc1e79c64205402c )
Fixes: https://tracker.ceph.com/issues/23693
Signed-off-by: Erwan Velu <erwan@redhat.com>
Theofilos Mouratidis [Wed, 18 Apr 2018 08:02:37 +0000 (10:02 +0200)]
ceph-volume: allow parallel creates
Currently the create code decides the vg_name "ceph-$cluster_fsid" as
the primary vg_name and creates a new name if this already exists.
If this code is run N times in parallel, the script will try to
create N times the vg with the name "ceph-$cluster_fsid" and it
will fail to create the N osds successfully.
Creating vgs with names like "ceph-$uuid4" lets our scripts to run
without any problems.
Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
(cherry picked from commit
201817f27ecfe195216284d9e4c344038cb654b6 )
Sage Weil [Wed, 18 Apr 2018 19:35:49 +0000 (14:35 -0500)]
qa/workunits/rados/test-upgrade-to-mimic.sh: fix tee output
Signed-off-by: Sage Weil <sage@redhat.com>
Alfredo Deza [Mon, 16 Apr 2018 18:42:22 +0000 (14:42 -0400)]
ceph-volume util.prepare preserve order on incoming mount flags
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
89f8f82402f9eda7cf76ebe860e50dd8e1047d76 )
Alfredo Deza [Mon, 16 Apr 2018 18:41:52 +0000 (14:41 -0400)]
ceph-volume tests update (preserved) order on mount flags
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
1a92ecbede09f084ab34ef556de46b435fa3e9d1 )
Alfredo Deza [Mon, 16 Apr 2018 16:50:02 +0000 (12:50 -0400)]
doc/dev/ceph-volume add VDO tag information
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
eeff3463543c12874ca4dfc3c3852af539d318f2 )
Alfredo Deza [Mon, 16 Apr 2018 16:45:21 +0000 (12:45 -0400)]
ceph-volume tests ensure non-duplicate flags in mount calls
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
61bed1e615a111f1c978d474fda390ba980bfb85 )
Alfredo Deza [Mon, 16 Apr 2018 16:44:24 +0000 (12:44 -0400)]
ceph-volume util.prepare allow and dedupe extra flags for mounting
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
81c20e6b58b77671ffaa0f8030f18747e1a23569 )
Alfredo Deza [Mon, 16 Apr 2018 16:40:27 +0000 (12:40 -0400)]
ceph-volume lvm.prepare detect vdo from device for mounting filestore
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
6b87580d4fe8e86de958ac258971cb2f90a70455 )
Alfredo Deza [Mon, 16 Apr 2018 16:38:35 +0000 (12:38 -0400)]
ceph-volume lvm.activate detect vdo from tags for mounting filestore
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
0deef5f53c61b4215817008c04589a4f4b5cc3b3 )
Alfredo Deza [Fri, 13 Apr 2018 19:52:55 +0000 (15:52 -0400)]
ceph-volume util.prepare allow extra ad-hoc mount flags
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
d815c4f45429fd73d2506bd874656de438fe74fd )
Alfredo Deza [Fri, 13 Apr 2018 19:52:23 +0000 (15:52 -0400)]
ceph-volume lvm.prepare capture vdo-ness on LVM tags
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
c6a79ef21ccc61a7634c05db5a705fc3ef46fbb9 )
Alfredo Deza [Fri, 13 Apr 2018 17:54:25 +0000 (13:54 -0400)]
ceph-volume tests for is_vdo detection
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
75f532597aa5ad5b84e993dc60c60d4a147af191 )
Alfredo Deza [Wed, 11 Apr 2018 12:53:17 +0000 (08:53 -0400)]
ceph-volume api.lvm helpers to detect vdo from a dm path
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
5b97d8e54ce3dcf2a56872cdf0cbc0139ca0a723 )
Eric Ivancich [Wed, 18 Apr 2018 14:16:41 +0000 (10:16 -0400)]
Merge pull request #21426 from ivancich/wip-fix-existing-mclock-cost-luminous
osd: remove cost from mclock op queues; cost not handled well in dmcl…
Boris Ranto [Thu, 12 Apr 2018 16:11:51 +0000 (18:11 +0200)]
prometheus: Implement rgw_metadata metric
This maps rgw id to its hostname and ceph version running on the node.
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit
c7cbc24803da9474c9d1d15a52da8d0eed2d49af )
David Zafman [Wed, 18 Apr 2018 00:29:12 +0000 (17:29 -0700)]
Merge pull request #21397 from dzafman/wip-23654
luminous: Special scrub handling of hinfo_key errors
Reviewed-by: Kefu Chai <kchai@redhat.com>
David Zafman [Fri, 13 Apr 2018 22:01:52 +0000 (15:01 -0700)]
osd: Change shard digests to hex like object info digests
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
22ddc6da5fd03e65a7baf96748a8893cc258d977 )
David Zafman [Wed, 11 Apr 2018 15:43:56 +0000 (08:43 -0700)]
test: Luminous backport specific changes
osd-scrub-repair.sh:
Remove legacy_snaps and redirect_target to keep test more in sync with master
We don't have omap_digest bluestore handling
Additional cases of omap_digest_mismatch_oi changes
omap_digest still set
ROBJ10 output still applies
osd-scrub-snaps.sh:
Add head_exists in snapset
Add snapset for object with head_mismatch
Signed-off-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Tue, 17 Apr 2018 15:11:37 +0000 (08:11 -0700)]
Merge pull request #21216 from smithfarm/wip-23545-luminous
luminous: journal: Message too long error when appending journal
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 17 Apr 2018 13:03:42 +0000 (09:03 -0400)]
Merge pull request #21471 from liewegas/wip-librbd-upgrade-luminous
test/pybind/test_rbd: allow v1 images for testing
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Tue, 17 Apr 2018 12:53:14 +0000 (07:53 -0500)]
test/pybind/test_rbd: allow v1 images for testing
Signed-off-by: Sage Weil <sage@redhat.com>
Josh Durgin [Tue, 17 Apr 2018 00:04:30 +0000 (17:04 -0700)]
Merge pull request #21452 from yuriw/wip-fix-p2p-luminous
qa/tests - added tag: v12.2.2 to be used by client.1 ...
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Mon, 16 Apr 2018 19:28:27 +0000 (12:28 -0700)]
qa/tests - added tag: v12.2.2 to be used by client.1 under workload_luminous to avoid failures.
added workunits/rados/test-upgrade-to-mimic.sh, and add --gtest_filter=-CReadOpsTest.Exec to api_c_read_operations
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Mon, 16 Apr 2018 16:22:48 +0000 (09:22 -0700)]
Merge pull request #21328 from tchaikov/wip-11332-luminous
luminous: mon: update PaxosService::cached_first_committed in PaxosService::may…
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Mon, 16 Apr 2018 16:22:11 +0000 (09:22 -0700)]
Merge pull request #21365 from k0ste/luminous_backports
luminous: mgr: prometheus: fix PG state names
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Yuri Weinstein [Mon, 16 Apr 2018 16:21:22 +0000 (09:21 -0700)]
Merge pull request #21394 from ifed01/wip-ifed-backport2
luminous: BlueStore.cc: _balance_bluefs_freespace: assert(0 == "allocate failed, wtf");
Reviewed-by: Sage Weil <sage@redhat.com>
David Zafman [Mon, 16 Apr 2018 04:49:48 +0000 (21:49 -0700)]
test: Use jq in a compatible way and for easier diff analysis
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
458babe7ee2e5fc0c4519a94249cbc1bd7cec9b6 )
J. Eric Ivancich [Fri, 13 Apr 2018 22:27:25 +0000 (18:27 -0400)]
osd: remove cost from mclock op queues; cost not handled well in dmclock library
The current version of the dmclock library does not handle operation
cost well. Therefore cost should not be passed into the library when
enqueuing operations; instead 0 should be passed in.
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Fri, 13 Apr 2018 15:27:26 +0000 (08:27 -0700)]
Merge pull request #21388 from theanalyst/wip-luminous-usage-log
luminous: usage log fixes
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 13 Apr 2018 15:27:07 +0000 (08:27 -0700)]
Merge pull request #21389 from theanalyst/wip-luminous-23687
Wip luminous 23687
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Yuri Weinstein [Fri, 13 Apr 2018 15:26:18 +0000 (08:26 -0700)]
Merge pull request #21393 from theanalyst/wip-luminous-recalc
luminous: rgw recalculate stats option added
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 13 Apr 2018 15:24:57 +0000 (08:24 -0700)]
Merge pull request #21390 from theanalyst/wip-luminous-23690
rgw: fix mutlisite read-write issues
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 12 Apr 2018 21:32:46 +0000 (14:32 -0700)]
Merge pull request #21233 from smithfarm/wip-jinja-mgr-luminous
luminous: build/ops: deb: move python-jinja2 dependency to mgr
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: James Page <james.page@ubuntu.com>
Yuri Weinstein [Thu, 12 Apr 2018 21:30:51 +0000 (14:30 -0700)]
Merge pull request #21283 from liewegas/wip-pgpool-enc-luminous
luminous: osd/osd_types: fix pg_pool_t encoding for hammer
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Thu, 12 Apr 2018 21:29:27 +0000 (14:29 -0700)]
Merge pull request #21307 from smithfarm/wip-23606-luminous
luminous: tests: ENGINE Error in 'start' listener <bound in rados
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Yuri Weinstein [Thu, 12 Apr 2018 21:28:16 +0000 (14:28 -0700)]
Merge pull request #21330 from tchaikov/wip-23610-luminous
luminous: osd: resend osd_pgtemp if it's not acked
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Thu, 12 Apr 2018 19:27:41 +0000 (12:27 -0700)]
Merge pull request #21352 from pdvian/wip-23634-luminous
luminous: doc: outline upgrade procedure for mds cluster
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Igor Fedotov [Tue, 6 Feb 2018 17:45:24 +0000 (20:45 +0300)]
os/bluestore: do not assert on insufficient allocation during bluefs
rebalance
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
64abc7ba39fab57cc9e19463219e8a70d284eda0 )
Igor Fedotov [Tue, 6 Feb 2018 16:50:40 +0000 (19:50 +0300)]
test/store_test: add test case to for excessive fragmentation
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
eb0443a1034b42d006d2a1d2bd5cb91881f07df7 )
Igor Fedotov [Mon, 23 Oct 2017 16:32:23 +0000 (09:32 -0700)]
os/bluestore: fix lack of extent demotion in StupidAllocator::init_rm_free
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
89aeea84f9ad24b2f9ca5ea3ee1dd9146e7eb664 )
Sage Weil [Sat, 28 Oct 2017 21:24:30 +0000 (16:24 -0500)]
unittest_interval_set: test with flat_map<> too
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
70ddb0c18b2969c26dbe855e1573f3f028d9f113 )
Sage Weil [Sat, 28 Oct 2017 21:21:15 +0000 (16:21 -0500)]
include/interval_set: cbegin/cend -> begin/end
c{begin,end} don't exist for btree_map<>.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
7bbb7958df45b36556a0e469fe55f9236d036972 )
Sage Weil [Sat, 28 Oct 2017 21:20:53 +0000 (16:20 -0500)]
include/btree_interval_set: remove it!
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
3dafe9d33eaadf8fbd3bed6cca5a4b2519b33a3f )
Sage Weil [Sat, 28 Oct 2017 21:20:43 +0000 (16:20 -0500)]
os/bluestore: use interval_set<...,btree_map<...>>
This avoid the code duplication, yay!
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
762dd42971a9ced62ea5617f7cd6b0e0fd2ef74c )
Sage Weil [Sat, 28 Oct 2017 20:56:35 +0000 (15:56 -0500)]
include/btree_map: clean up wrapper header around btree_map
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
78d5afde4334e422cb8b915148ca3fc9f819570a )
Sage Weil [Sat, 28 Oct 2017 20:50:30 +0000 (15:50 -0500)]
os/bluestore/BitMapAllocator: drop useless include
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
79f9c86dfde7356915ec790f0cffca77579552e6 )
Sage Weil [Sat, 28 Oct 2017 20:37:03 +0000 (15:37 -0500)]
include/interval_set: tolerate maps that invalidate iterator on change
These changes picked out of the diff between the original
btree_interval_set.h and interval_set.h (sadly I had it rolled into the
initial commit so it was tedious to identify these).
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
87aed2026a8f689540a92eeeea6b4054b6c69acd )
Sage Weil [Sat, 28 Oct 2017 20:27:47 +0000 (15:27 -0500)]
include/interval_set: templating map used
Default to std::map for backward compat.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
d254259059c47c714526976a6144eec3b52e9bcd )
xie xingguo [Thu, 21 Sep 2017 05:40:40 +0000 (13:40 +0800)]
common/interval_set: override subset_of for given range
E.g.:
subset_of([5~10,20~5], 0, 100) -> [5~10,20~5]
subset_of([5~10,20~5], 5, 25) -> [5~10,20~5]
subset_of([5~10,20~5], 1, 10) -> [5~5]
subset_of([5~10,20~5], 8, 24) -> [8~7, 20~4]
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
f90bd4b957938c1ce050b3f5783ead37b297ddc2 )
Zac Medico [Tue, 26 Sep 2017 06:13:57 +0000 (23:13 -0700)]
inverval_set: optimize subset_of with sequential search
Optimize subset_of to use sequential search when it
performs better than the lower_bound method, for set
size ratios smaller than 10. This is analogous to
intersection_of behavior since commit
825470fcf919 .
The subset_of method can be used in some cases as a
less-expensive alternative to the intersection_of
method, since subset_of can return early if any element
of the smaller set is not contained in the larger set,
and intersection_of has the added burden of storing
the intersecting elements.
Signed-off-by: Zac Medico <zmedico@gmail.com>
(cherry picked from commit
5c3775815a433a028618b239f5a4bebacff3dc4b )
Zac Medico [Thu, 31 Aug 2017 03:59:32 +0000 (20:59 -0700)]
interval_set: optimize intersection_of
Iterate over all elements of the smaller set, and use find_inc to
locate elements from the larger set in logarithmic time. This greatly
improves performance when one set is much larger than the other:
2 +-+--+----+----+----+----+----+----+----+----+--+-+
P +* +
E |* |
R 1.8 +* +
F | * |
O | * |
R 1.6 + * +
M | * |
A | * |
N 1.4 + * +
C | * |
E | * |
1.2 + * +
R | * |
A | * |
T 1 + *** +
I | ****** |
O + ***********************************
0.8 +-+--+----+----+----+----+----+----+----+----+--+-+
0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1
SET SIZE RATIO
The above plot compares performance of the new intersection_size_asym
function to the existing intersection_of function. The performance of
intersection_size_asym gets worse as the set size ratio approaches 1.
For set size ratios where the performance ratio is greater than 1, the
performance of intersection_size_asym is superior. Therefore, this
patch only uses intersection_size_asym when the set size ratio is less
than or equal to 0.1 (code uses the reciprocal which is 10).
The plot was generated using benchmark results produced by the
following program:
#include <iostream>
#include <sys/timeb.h>
#include "include/interval_set.h"
int main()
{
const int interval_count = 100000;
const int interval_distance = 4;
const int interval_size = 2;
const int sample_count = 8;
const int max_offset = interval_count * interval_distance;
interval_set<int> a, b, intersection;
for (int i = 0; i < max_offset; i+=interval_distance) {
a.insert(i, interval_size);
}
for (int m = 1; m < 100; m++) {
float ratio = 1 / float(m);
for (int i = 0; i < max_offset; i+=interval_distance*m) {
b.insert(i, interval_size);
}
struct timeb start, end;
int ms = 0;
for (int i = 0; i < sample_count; i++) {
ftime(&start);
intersection.intersection_of(a, b);
ftime(&end);
ms += (int) (1000.0 * (end.time - start.time)
+ (end.millitm - start.millitm));
intersection.clear();
}
b.clear();
std::cout << ratio << "\t" << ms << std::endl << std::flush;
}
}
Signed-off-by: Zac Medico <zmedico@gmail.com>
(cherry picked from commit
825470fcf9190c94422716454dbf11b24350a748 )
Abhishek Lekshmanan [Mon, 12 Mar 2018 18:14:46 +0000 (19:14 +0100)]
rgw: rgw-rados, rgw-admin add an option to recalculate user stats
Adds a method in rgw-rados to reset user stats calling the earlier implemented
cls user reset stats.
In rgw-admin we add an option called --reset-stats that invokes this method.
Fixes: http://tracker.ceph.com/issues/23335
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
0b72dd7d3beea47b5c479eeb979b73c4cd70f7bc )
(cherry picked from commit
0bd635b2133c7536f0f3e561579e4aab9cf72d59 )
Abhishek Lekshmanan [Mon, 12 Mar 2018 19:17:36 +0000 (20:17 +0100)]
cls/user: implement reset user stats
This is an implementation of reset user stats, that recalculates the user stats
purely based on the values of bucket entries in user.buckets object. This is
helpful in cases when user stats has been improperly set in case of manual
resharding etc.
Luminous only additions:
use global scope for encode in cls_user_ops
Fixes: http://tracker.ceph.com/issues/23335
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
63f9127dd685890d938a612739320c942a96f910 )
Abhishek Lekshmanan [Mon, 12 Mar 2018 13:14:22 +0000 (14:14 +0100)]
rgw: radosgw-admin abort early for user stats for empty uids
Otherwise we'll call sync stats with an empty argument which results in creation
of an empty ".buckets" object
Fixes: http://tracker.ceph.com/issues/23322
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
aa3a408d4a66296cbf273551920f8ac9b381b2dd )
(cherry picked from commit
99dec6115bb6d8ef1cdaf658fc359a301d31017d )
Niu Pengju [Sun, 8 Apr 2018 03:08:04 +0000 (11:08 +0800)]
rgw: Fix multisite Synchronization failed when read and write delete at the same time
This case is first write objA,then write and delete objA at the same
time,write early than delete.
When del objA, use information which stat of first write objA, so the
op should del the first write data.However when try to del objA, objA
header is second write, so osd "do_xattr_cmp_str" has found idtag change
and return -125(canceled),after rgw client receive the ret -125 , it
will still do "complete_del", then do cls_obj_complete_del to write
bilog。"complete_op" in cls_rgw module will write bilog with second
write mtime and second ".ver.epoch". Finally, del op append behind the
second write in bilog. And the slave rgw will merge write op and del op
as del op, and del data,but master rgw complete second write and cancel
del.
This logic is problematic, so bilog recording the del op should use
cancel op. And squash_map should skip the cancel op.
Fixes: http://tracker.ceph.com/issues/22804
Signed-off-by: Niu Pengju <pengju.niu@xtaotech.com>
(cherry picked from commit
a8fd508915a0acf7768fe6ba7f7414e71813f1d7 )
Orit Wasserman [Thu, 29 Mar 2018 10:57:28 +0000 (13:57 +0300)]
rgw: warn user about on going resharding when canceling it
Fixes: http://tracker.ceph.com/issues/21619
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
f4dae60d4cc1ae4099c8d5da785f32a7c39f5a79 )