]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agoMerge pull request #27028 from mrandybu/mimic-alt
Yuri Weinstein [Wed, 24 Jul 2019 23:06:01 +0000 (16:06 -0700)]
Merge pull request #27028 from mrandybu/mimic-alt

mimic: ceph_detect_init: Add support for ALT Linux

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
6 years agoMerge pull request #28210 from votdev/fix_rgw_issue
Yuri Weinstein [Wed, 24 Jul 2019 23:04:23 +0000 (16:04 -0700)]
Merge pull request #28210 from votdev/fix_rgw_issue

mimic: mgr/dashboard: Fix various RGW issues

Reviewed-by:  Tiago Melo <tmelo@suse.com>

6 years agoMerge pull request #28911 from bk201/wip-40660-mimic
Yuri Weinstein [Wed, 24 Jul 2019 23:03:24 +0000 (16:03 -0700)]
Merge pull request #28911 from bk201/wip-40660-mimic

mimic: mgr/dashboard: cephfs multimds graphs stack together

Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agoMerge pull request #29024 from ifed01/wip-ifed-fix-len0-mimic
Yuri Weinstein [Wed, 24 Jul 2019 23:02:19 +0000 (16:02 -0700)]
Merge pull request #29024 from ifed01/wip-ifed-fix-len0-mimic

mimic: os/bluestore: avoid length overflow in extents returned by Stupid Allocator

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
6 years agoMerge pull request #29174 from neha-ojha/wip-40583-mimic
Yuri Weinstein [Wed, 24 Jul 2019 23:00:55 +0000 (16:00 -0700)]
Merge pull request #29174 from neha-ojha/wip-40583-mimic

mimic: common/options.cc: Lower the default value of osd_deep_scrub_large_omap_object_key_threshold

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #29189 from badone/wip-mimic-lazy-omap-stats-backport-tracker...
Yuri Weinstein [Wed, 24 Jul 2019 22:59:50 +0000 (15:59 -0700)]
Merge pull request #29189 from badone/wip-mimic-lazy-omap-stats-backport-tracker-38552

mimic: core: lazy omap stat collection

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #29196 from smithfarm/wip-37749-mimic
Yuri Weinstein [Wed, 24 Jul 2019 22:58:23 +0000 (15:58 -0700)]
Merge pull request #29196 from smithfarm/wip-37749-mimic

mimic: tools: Add clear-data-digest command to objectstore tool

Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agoMerge pull request #29016 from ivancich/mimic-abort-multipart-fix
Yuri Weinstein [Wed, 24 Jul 2019 15:26:33 +0000 (08:26 -0700)]
Merge pull request #29016 from ivancich/mimic-abort-multipart-fix

mimic: rgw: abort multipart fix

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #29021 from smithfarm/wip-39074-mimic
Yuri Weinstein [Wed, 24 Jul 2019 15:26:07 +0000 (08:26 -0700)]
Merge pull request #29021 from smithfarm/wip-39074-mimic

mimic: rgw: multisite: data sync loops back to the start of the datalog after reaching the end

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #29139 from ivancich/mimic-fix-resharding-race
Yuri Weinstein [Wed, 24 Jul 2019 15:25:38 +0000 (08:25 -0700)]
Merge pull request #29139 from ivancich/mimic-fix-resharding-race

mimic: rgw: fix race b/w bucket reshard and ops waiting on reshard completion

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #29017 from smithfarm/wip-38080-mimic
Yuri Weinstein [Wed, 24 Jul 2019 15:22:59 +0000 (08:22 -0700)]
Merge pull request #29017 from smithfarm/wip-38080-mimic

mimic: multisite: overwrites in versioning-suspended buckets fail to sync

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agotools: Add clear-data-digest command to objectstore tool. 29196/head
liyichao [Wed, 5 Dec 2018 04:22:20 +0000 (12:22 +0800)]
tools: Add clear-data-digest command to objectstore tool.

There may be a situation where data digest in object info is
inconsistent with that computed from object data, then deep-scrub
will fail even though all three repicas have the same object data.

Fixes: https://tracker.ceph.com/issues/37935
Signed-off-by: Li Yichao <liyichao.good@gmail.com>
(cherry picked from commit da5832b2b49be4ab23f7ffc5ba1ba630168b886f)

Conflicts:
    src/tools/ceph_objectstore_tool.cc
- change cbegin() to begin() to get it to build

6 years agomimic: osd: Modify lazy omap stats to only show one copy 29189/head
Brad Hubbard [Tue, 9 Jul 2019 05:03:24 +0000 (15:03 +1000)]
mimic: osd: Modify lazy omap stats to only show one copy

Only show stats from the primary to get more in line with other pg stats
representations.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 490829c8eaf14f41de978ac0f93ecda3df8bcdef)

6 years agomimic: tests: Add test for lazy omap stat collection
Brad Hubbard [Mon, 4 Mar 2019 08:12:27 +0000 (18:12 +1000)]
mimic: tests: Add test for lazy omap stat collection

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 88e9ca58a06ba572ff4c6f6125a8ba7f8e0a7795)

6 years agomimic: osd: Implement lazy omap usage statistics
Brad Hubbard [Tue, 11 Dec 2018 04:00:35 +0000 (14:00 +1000)]
mimic: osd: Implement lazy omap usage statistics

Opportunistic gathering of omap statistics during deep scrub.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 9e21ef0e40ff89b10dfdf857c703336496b3171f)

 Conflicts:
doc/dev/placement-group.rst: Trivial
src/osd/osd_types.h: Trivial

6 years agocommon/options.cc: Lower the default value of osd_deep_scrub_large_omap_object_key_th... 29174/head
Neha Ojha [Fri, 28 Jun 2019 16:31:35 +0000 (09:31 -0700)]
common/options.cc: Lower the default value of osd_deep_scrub_large_omap_object_key_threshold

Warning when there are already 2M omap keys does not help, reduce this
threshold so that preemptive measures can be taken based on this.

Fixes: https://tracker.ceph.com/issues/40583
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 1ec948409ab547effbd5c656af8f0c9565f1717a)

6 years agorgw: add RGWRados::repair_olh() to reconstruct olh attrs 29017/head
Casey Bodley [Fri, 25 Jan 2019 21:44:03 +0000 (16:44 -0500)]
rgw: add RGWRados::repair_olh() to reconstruct olh attrs

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 1309e2d50ee8118afe1138cd6677d84438edb55a)

Conflicts:
    src/rgw/rgw_rados.cc
- no rgw_bl_str() in mimic
- mimic does not have a4d3977cfacc5eb0de16618f2c957bb417505597

6 years agorgw: add RGWRados::bi_get_olh() to read/decode olh entry
Casey Bodley [Fri, 25 Jan 2019 21:43:36 +0000 (16:43 -0500)]
rgw: add RGWRados::bi_get_olh() to read/decode olh entry

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit b8d7f0ad1f882b999e0fd7f3e45f8579599714cf)

Conflicts:
    src/rgw/rgw_rados.cc
- bufferlist::cbegin()

6 years agorgw: bi_get() takes bucket_info
Casey Bodley [Fri, 25 Jan 2019 21:42:50 +0000 (16:42 -0500)]
rgw: bi_get() takes bucket_info

and calls the bucket_info overload of BucketShard::init() to avoid
reading the bucket info again

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit a15e8736340c916120fef1f3a5ff1b982cf7c837)

6 years agorgw: add BucketShard::init overload for bucket_info,obj
Casey Bodley [Fri, 25 Jan 2019 21:17:19 +0000 (16:17 -0500)]
rgw: add BucketShard::init overload for bucket_info,obj

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit c6c445f6074df113a28adcae89248b909d031f8e)

6 years agotest/rgw: add multisite test_version_suspended_incremental_sync
Casey Bodley [Wed, 2 Jan 2019 16:24:45 +0000 (11:24 -0500)]
test/rgw: add multisite test_version_suspended_incremental_sync

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 81fa354c1dadf4f957592f20fe9e02acd70671e0)

Conflicts:
src/test/rgw/rgw_multi/tests.py

6 years agorgw: fetch_remote_obj filters out olh attrs
Casey Bodley [Fri, 4 Jan 2019 20:53:34 +0000 (15:53 -0500)]
rgw: fetch_remote_obj filters out olh attrs

each zone manages its own olh log, so we don't want any of the source
zone's olh attributes. in one case (sync of an object overwrite in a
versioning-suspended bucket), these olh attributes were being written
directly to the head object and leading to link_olh errors due to the
olh_tag mismatch

Fixes: http://tracker.ceph.com/issues/37792
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit a4195fc55fb76f0a2576d5ff0b2c99ad12fd7a49)

6 years agoMerge pull request #29020 from smithfarm/wip-39047-mimic
Nathan Cutler [Mon, 22 Jul 2019 09:19:00 +0000 (11:19 +0200)]
Merge pull request #29020 from smithfarm/wip-39047-mimic

mimic: rgw: update resharding documentation

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
6 years agoMerge pull request #29014 from smithfarm/wip-37891-mimic
Nathan Cutler [Mon, 22 Jul 2019 08:53:54 +0000 (10:53 +0200)]
Merge pull request #29014 from smithfarm/wip-37891-mimic

mimic: doc: wrong value of usage log default in logging section

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agorgw: fix race b/w bucket reshard and ops waiting on reshard completion 29139/head
J. Eric Ivancich [Mon, 1 Apr 2019 14:59:51 +0000 (10:59 -0400)]
rgw: fix race b/w bucket reshard and ops waiting on reshard completion

A previous commit (f84f70d4) added functionality to clean up old
bucket instances and bucket shards once sharding completed
successfully. However the existing code that allowed a bucket
operation to wait until resharding completed was relying on a field in
the old bucket instance to know the bucket instance id of the new
bucket instance. This created a race condition as to whether the
clean-up or read of the bucket instance id would occur first.

This solution rereads the bucket entry point object when resharding
completes to determine the bucket instance id of the new bucket
thereby avoiding the race.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 26b793680805721cac86f64cdd234b273bf33be4)

Conflicts:
        src/rgw/rgw_rados.cc: equivalent changes made to rgw_reshard.cc

6 years agorgw: correct comment describing function try_refresh_bucket_info
J. Eric Ivancich [Wed, 27 Mar 2019 20:32:17 +0000 (16:32 -0400)]
rgw: correct comment describing function try_refresh_bucket_info

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit d0894e6f6c062907796d10b524088c2abf7e4252)

6 years agorgw: fix log messages using "proceeding" to "processing"
J. Eric Ivancich [Tue, 12 Mar 2019 19:38:54 +0000 (15:38 -0400)]
rgw: fix log messages using "proceeding" to "processing"

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 1c2aa902cb2bec690387ace8eb6b8afb5678373f)

6 years agomgr/dashboard: Fix various RGW issues 28210/head
Volker Theile [Wed, 22 May 2019 09:30:50 +0000 (11:30 +0200)]
mgr/dashboard: Fix various RGW issues

* Fix handling of tenanted users
* Better exception handling if RGW backend is not available
* RGW user/bucket "max. size" should be hidden when "user/bucket quota" is not enabled
* Fix bug in loading user quota.

Fixes: https://tracker.ceph.com/issues/38800
partial manual backport of 61995970916cb11f66c3800bcf869755f8dae32c
partial manual backport of e6f130d47023c24f8a9c742f145abd34d7320cd8
partial manual backport of 945e790cab57785e1bc2dbf708d5ddafec618aba
partial manual backport of a98bca6a2f161140f78f34cfa5f5ebec07af2f82
partial manual backport of 975736aba546adb09ce4f38a1ae061621f7240cd

This fix is not cherry-picked because the code was completely re-worked for Nautilus (codebase is too far apart).

Signed-off-by: Volker Theile <vtheile@suse.com>
6 years agoMerge pull request #28206 from pdvian/wip-39475-mimic
Yuri Weinstein [Thu, 18 Jul 2019 19:52:11 +0000 (12:52 -0700)]
Merge pull request #28206 from pdvian/wip-39475-mimic

mimic: common/util: handle long lines in /proc/cpuinfo

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28217 from smithfarm/wip-40005-mimic
Yuri Weinstein [Thu, 18 Jul 2019 19:51:39 +0000 (12:51 -0700)]
Merge pull request #28217 from smithfarm/wip-40005-mimic

mimic: build/ops: do_cmake.sh: source not found

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agoMerge pull request #28741 from smithfarm/wip-40547-mimic
Yuri Weinstein [Thu, 18 Jul 2019 19:50:33 +0000 (12:50 -0700)]
Merge pull request #28741 from smithfarm/wip-40547-mimic

mimic: common: Keyrings created by ceph auth get are not suitable for ceph auth import

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28894 from ifed01/wip-ifed-fix-no-compress-mimic
Yuri Weinstein [Thu, 18 Jul 2019 19:49:29 +0000 (12:49 -0700)]
Merge pull request #28894 from ifed01/wip-ifed-fix-no-compress-mimic

mimic: os/bluestore: load OSD all compression settings unconditionally.

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #28967 from liewegas/wip-set-aio-write-max-mimic
Yuri Weinstein [Thu, 18 Jul 2019 19:49:00 +0000 (12:49 -0700)]
Merge pull request #28967 from liewegas/wip-set-aio-write-max-mimic

mimic: os/bluestore: fix >2GB bluefs writes

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #28970 from neha-ojha/wip-40720-mimic
Yuri Weinstein [Thu, 18 Jul 2019 19:47:58 +0000 (12:47 -0700)]
Merge pull request #28970 from neha-ojha/wip-40720-mimic

mimic: os/bluestore: default to bitmap allocator for bluestore/bluefs

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #28995 from smithfarm/wip-38751-mimic
Yuri Weinstein [Thu, 18 Jul 2019 19:47:14 +0000 (12:47 -0700)]
Merge pull request #28995 from smithfarm/wip-38751-mimic

mimic: core: should report EINVAL in ErasureCode::parse() if m<=0

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #28220 from pdvian/wip-39513-mimic
Yuri Weinstein [Wed, 17 Jul 2019 23:01:04 +0000 (16:01 -0700)]
Merge pull request #28220 from pdvian/wip-39513-mimic

mimic: osd: take heartbeat_lock when calling heartbeat()

Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agoMerge pull request #26499 from k0ste/mimic_backports2
Yuri Weinstein [Wed, 17 Jul 2019 22:19:26 +0000 (15:19 -0700)]
Merge pull request #26499 from k0ste/mimic_backports2

mimic: mgr/balancer: restrict automatic balancing to specific weekdays

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #27986 from pdvian/wip-39311-mimic
Yuri Weinstein [Wed, 17 Jul 2019 22:18:24 +0000 (15:18 -0700)]
Merge pull request #27986 from pdvian/wip-39311-mimic

mimic: crushtool crash on Fedora 28 and newer

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28089 from dzafman/wip-39720
Yuri Weinstein [Wed, 17 Jul 2019 22:17:30 +0000 (15:17 -0700)]
Merge pull request #28089 from dzafman/wip-39720

mimic: osd: Include dups in copy_after() and copy_up_to()

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #28097 from pdvian/wip-39374-mimic
Yuri Weinstein [Wed, 17 Jul 2019 22:17:00 +0000 (15:17 -0700)]
Merge pull request #28097 from pdvian/wip-39374-mimic

mimic: osd/OSD.cc: make osd bench description consistent with parameters

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #28142 from pdvian/wip-39422-mimic
Yuri Weinstein [Wed, 17 Jul 2019 22:14:53 +0000 (15:14 -0700)]
Merge pull request #28142 from pdvian/wip-39422-mimic

mimic: osd/OSDMap: Replace get_out_osds with get_out_existing_osds

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
6 years agoMerge pull request #28165 from pdvian/wip-39458-mimic
Yuri Weinstein [Wed, 17 Jul 2019 22:14:06 +0000 (15:14 -0700)]
Merge pull request #28165 from pdvian/wip-39458-mimic

mimic: mgr/prometheus: replace whitespaces in metrics' names

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
6 years agoMerge pull request #28201 from dzafman/wip-38341
Yuri Weinstein [Wed, 17 Jul 2019 22:13:21 +0000 (15:13 -0700)]
Merge pull request #28201 from dzafman/wip-38341

mimic: osd: pg stuck in backfill_wait with plenty of disk space

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #29074 from ceph/backport-mimic-26397
Alfredo Deza [Wed, 17 Jul 2019 20:44:53 +0000 (16:44 -0400)]
Merge pull request #29074 from ceph/backport-mimic-26397

mimic: ceph-volume: update testing playbook 'deploy.yml'

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge pull request #27949 from smithfarm/wip-37613-mimic
Yuri Weinstein [Wed, 17 Jul 2019 19:46:02 +0000 (12:46 -0700)]
Merge pull request #27949 from smithfarm/wip-37613-mimic

mimic: rpm: missing dependency on python34-ceph-argparse from python34-cephfs (and others?)

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28090 from pdvian/wip-39233-mimic
Yuri Weinstein [Wed, 17 Jul 2019 19:45:14 +0000 (12:45 -0700)]
Merge pull request #28090 from pdvian/wip-39233-mimic

mimic: cephfs: mount.ceph.c: do not pass nofail to the kernel

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #28186 from pdvian/wip-39472-mimic
Yuri Weinstein [Wed, 17 Jul 2019 19:44:45 +0000 (12:44 -0700)]
Merge pull request #28186 from pdvian/wip-39472-mimic

mimic: mds: fix SnapRealm::resolve_snapname for long name

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
6 years agoMerge pull request #28274 from pdvian/wip-39669-mimic
Yuri Weinstein [Wed, 17 Jul 2019 19:44:23 +0000 (12:44 -0700)]
Merge pull request #28274 from pdvian/wip-39669-mimic

mimic: mds: output lock state in format dump

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #28337 from pdvian/wip-39679-mimic
Yuri Weinstein [Wed, 17 Jul 2019 19:43:59 +0000 (12:43 -0700)]
Merge pull request #28337 from pdvian/wip-39679-mimic

mimic: cephfs: pybind: added lseek()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #28381 from pdvian/wip-39689-mimic
Yuri Weinstein [Wed, 17 Jul 2019 19:43:35 +0000 (12:43 -0700)]
Merge pull request #28381 from pdvian/wip-39689-mimic

mimic: mds: check dir fragment to split dir if mkdir makes it oversized.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #28501 from smithfarm/wip-40168-mimic
Yuri Weinstein [Wed, 17 Jul 2019 19:43:06 +0000 (12:43 -0700)]
Merge pull request #28501 from smithfarm/wip-40168-mimic

mimic: cephfs: client: ceph.dir.rctime xattr value incorrectly prefixes 09 to the nanoseconds component

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
6 years agoMerge pull request #28579 from ukernel/mimic-40342
Yuri Weinstein [Wed, 17 Jul 2019 19:41:37 +0000 (12:41 -0700)]
Merge pull request #28579 from ukernel/mimic-40342

mimic: mds: fix corner case of replaying open sessions

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #28650 from pdvian/wip-40042-mimic
Yuri Weinstein [Wed, 17 Jul 2019 19:40:33 +0000 (12:40 -0700)]
Merge pull request #28650 from pdvian/wip-40042-mimic

mimic: mds: avoid sending too many osd requests at once after mds restarts

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
6 years agoMerge pull request #28796 from shenhang/mimic
Yuri Weinstein [Wed, 17 Jul 2019 19:39:31 +0000 (12:39 -0700)]
Merge pull request #28796 from shenhang/mimic

mimic: mds: destroy reconnect msg when it is from non-existent session to avoid memory leak

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
6 years agoceph-volume: fix deploy playbook for ansible~=2.6,<2.7 29074/head
Andrew Schoen [Tue, 16 Jul 2019 15:29:40 +0000 (10:29 -0500)]
ceph-volume: fix deploy playbook for ansible~=2.6,<2.7

When testing the lumionus and mimic branch the import_role
ansible feature does not work as expected. Variables created by one
role is not available to the next role called when using
import_role. To fix this, we need to use the roles keyword instead.

This commit is only applies to luminous and mimic and should
only be applied there.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit b619988fbfafa7568e0ec51cfb56336a72460d44)

6 years agoMerge pull request #28887 from pdvian/wip-40262-mimic
Yuri Weinstein [Tue, 16 Jul 2019 20:29:46 +0000 (13:29 -0700)]
Merge pull request #28887 from pdvian/wip-40262-mimic

mimic: rgw: rgw_file: all directories are virtual with respect to contents

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
6 years agoMerge pull request #29018 from smithfarm/wip-38776-mimic
Yuri Weinstein [Tue, 16 Jul 2019 20:24:47 +0000 (13:24 -0700)]
Merge pull request #29018 from smithfarm/wip-38776-mimic

mimic: rgw: support delimiter longer then one symbol

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #28073 from pdvian/wip-39229-mimic
Yuri Weinstein [Tue, 16 Jul 2019 20:18:35 +0000 (13:18 -0700)]
Merge pull request #28073 from pdvian/wip-39229-mimic

mimic: rgw_file: save etag and acl info in setattr

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #28757 from smithfarm/wip-38747-mimic
Yuri Weinstein [Tue, 16 Jul 2019 20:18:10 +0000 (13:18 -0700)]
Merge pull request #28757 from smithfarm/wip-38747-mimic

mimic: rgw: non-existent mdlog failures logged at level 0

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #28310 from pdvian/wip-39674-mimic
Yuri Weinstein [Tue, 16 Jul 2019 15:45:09 +0000 (08:45 -0700)]
Merge pull request #28310 from pdvian/wip-39674-mimic

mimic: qa/workunits/rbd: wait for rbd-nbd unmap to complete

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #28815 from trociny/wip-40593-mimic
Yuri Weinstein [Tue, 16 Jul 2019 15:44:22 +0000 (08:44 -0700)]
Merge pull request #28815 from trociny/wip-40593-mimic

mimic: rbd-mirror: handle duplicates in image sync throttler queue

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agomgr/dashboard: fix MDS charts are stacked in Filesystems page 28911/head
Kiefer Chang [Fri, 31 May 2019 07:28:25 +0000 (15:28 +0800)]
mgr/dashboard: fix MDS charts are stacked in Filesystems page

Also include some UI enhancements:
- Fix MDS chart container is not aligned to other components.
- Show header on client table.

Fixes: https://tracker.ceph.com/issues/37579
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit a3e76ac5f5cf56f830fd2ae9d2e2ac4585195fc2)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html

files above are renamed, their paths in mimic are:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html

6 years agoMerge pull request #28852 from jdurgin/wip-18096-mimic
Yuri Weinstein [Mon, 15 Jul 2019 19:41:02 +0000 (12:41 -0700)]
Merge pull request #28852 from jdurgin/wip-18096-mimic

mimic: osd: report omap/data/metadata usage

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #27971 from smithfarm/wip-39593-mimic
Yuri Weinstein [Mon, 15 Jul 2019 19:36:02 +0000 (12:36 -0700)]
Merge pull request #27971 from smithfarm/wip-39593-mimic

mimic: build/ops: Cython 0.29 removed support for subinterpreters: raises ImportError: Interpreter change detected ...

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28208 from votdev/fix_vstart_runner
Yuri Weinstein [Mon, 15 Jul 2019 19:34:46 +0000 (12:34 -0700)]
Merge pull request #28208 from votdev/fix_vstart_runner

mimic: qa: Fix issues in vstart runner

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #28954 from bk201/wip-40707
Yuri Weinstein [Mon, 15 Jul 2019 19:33:20 +0000 (12:33 -0700)]
Merge pull request #28954 from bk201/wip-40707

mimic: mgr/dashboard: Fix run-frontend-e2e-tests.sh

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
6 years agoceph-volume: update deploy.yml
Guillaume Abrioux [Wed, 13 Feb 2019 10:27:12 +0000 (11:27 +0100)]
ceph-volume: update deploy.yml

update deploy.yml accordingly with recent changes in ceph-ansible.

Fixes: ceph/ceph-ansible#3602
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit da13da67bc1e8ba062c61a716eea485ae462db48)

6 years agorgw: minor code clean-up 29016/head
J. Eric Ivancich [Tue, 25 Jun 2019 19:21:44 +0000 (15:21 -0400)]
rgw: minor code clean-up

Adding some const correctness and reformatting.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit fb862909202c12c4bd908a0efe140c0f0ef0bd5a)

6 years agorgw: allow multipart upload abort to proceed
J. Eric Ivancich [Tue, 25 Jun 2019 20:07:35 +0000 (16:07 -0400)]
rgw: allow multipart upload abort to proceed

Cleaning up after aborting unfinished multipart uploads is a
best-effort process. Due to the history of the multipart upload, not
all components may be found and the process needs to be robust to
that.

Presently, if a component is not found after the final call to
list_bucket_multiparts, the error propogates to the caller, but not if
the component is not found in an earlier call. This change does not
propogate that error up ever.

Additional logging is also added to multipart-related functions.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 51aff62ac7cbb4653e0de667dccfa46795ffd8cb)

6 years agoos/bluestore: avoid length overflow in extents returned by Stupid 29024/head
Igor Fedotov [Tue, 9 Jul 2019 18:02:08 +0000 (21:02 +0300)]
os/bluestore: avoid length overflow in extents returned by Stupid
Allocator.

Fixes: http://tracker.ceph.com/issues/40703
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit e1b4984a63e79ab2e2aec7aa17bd80a77e79ec8c)

 Conflicts:
src/test/objectstore/Allocator_test.cc
 inconsistency with the old gtest version

6 years agorgw: always generate after delimiter char to skip directory 29018/head
Tianshan Qu [Tue, 11 Jun 2019 04:27:12 +0000 (12:27 +0800)]
rgw: always generate after delimiter char to skip directory

the following code also need after_delim_s to skip directory after list
1000 objects

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit 8c6678387b00c862d71cffd6fed6ca6c236e3fb7)

6 years agorgw: fix list bucket with start maker and delimiter '/' will miss next object with...
Tianshan Qu [Tue, 21 May 2019 10:50:06 +0000 (18:50 +0800)]
rgw: fix list bucket with start maker and delimiter '/' will miss next object with char '0'

'/' + 1 = '0', and the start marker will be skipped, so it will miss the
'0' object.

Fixes: http://tracker.ceph.com/issues/39989
Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit 43b5264c7d61ae3be56d68f131b544edee307a46)

Conflicts:
src/rgw/rgw_rados.cc
- mimic does not have "unsigned" in the line "unsigned char e = delim.back();"

6 years agorgw: data sync checks empty next_marker for datalog 29021/head
Casey Bodley [Fri, 29 Mar 2019 14:27:56 +0000 (10:27 -0400)]
rgw: data sync checks empty next_marker for datalog

RGWReadRemoteDataLogShardCR tracks the marker and next_marker
separately, because next_marker will be empty when it reaches the end

this allows RGWDataSyncShardCR to avoid clearing its sync_marker and
restarting datalog listing from the beginning

Fixes: http://tracker.ceph.com/issues/39033
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 2ff63778342282ab5c676529f6e7d90f30e6da1a)

6 years agorgw: fix up indentation in incremental data sync
Casey Bodley [Wed, 15 Aug 2018 20:13:17 +0000 (16:13 -0400)]
rgw: fix up indentation in incremental data sync

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 666bfe3a909ec83a3067398e7896527f99283e0a)

Conflicts:
src/rgw/rgw_data_sync.cc

6 years agorgw: updates to resharding documentation 29020/head
J. Eric Ivancich [Thu, 28 Mar 2019 17:30:08 +0000 (13:30 -0400)]
rgw: updates to resharding documentation

Some minor updates to the resharding documentation with the aim of
clarifying the language and using terms consistently.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 54b6b650eeeeac0e754bd5860cd53109ba7865bd)

Conflicts:
doc/radosgw/dynamicresharding.rst
- refrain from backporting changes to sections that aren't present in mimic

6 years agorgw: prefix-delimiter listing: support >1 character delimiter
Matt Benjamin [Fri, 8 Mar 2019 20:41:05 +0000 (15:41 -0500)]
rgw: prefix-delimiter listing: support >1 character delimiter

Fix prefix and CommonPrefix extraction logic in
RGWRados::Bucket::List::list_objects_ordered so as to permit
arbitrary-length string delimiters.

Fixes: https://tracker.ceph.com/issues/24821
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit e3c1ea244234aace7368d5a5ee95af2f6a529b00)

6 years agodoc: rgw: fix the default value of usage log setting 29014/head
Abhishek Lekshmanan [Thu, 10 Jan 2019 10:10:41 +0000 (11:10 +0100)]
doc: rgw: fix the default value of usage log setting

Fixes: http://tracker.ceph.com/issues/37856
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit b21c96ec69ec65f359473a0f193c716925086828)

6 years agoMerge pull request #28123 from dillaman/wip-39461-mimic
Yuri Weinstein [Thu, 11 Jul 2019 20:16:35 +0000 (13:16 -0700)]
Merge pull request #28123 from dillaman/wip-39461-mimic

mimic: rbd-mirror: clear out bufferlist prior to listing mirror images

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #28133 from dillaman/wip-38441-mimic
Yuri Weinstein [Thu, 11 Jul 2019 20:15:53 +0000 (13:15 -0700)]
Merge pull request #28133 from dillaman/wip-38441-mimic

mimic: librbd: ensure compare-and-write doesn't skip compare after copyup

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #28770 from dillaman/wip-40573-mimic
Yuri Weinstein [Thu, 11 Jul 2019 20:15:09 +0000 (13:15 -0700)]
Merge pull request #28770 from dillaman/wip-40573-mimic

mimic: librbd: properly track in-flight flush requests

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #28814 from trociny/wip-40461-mimic
Yuri Weinstein [Thu, 11 Jul 2019 20:14:41 +0000 (13:14 -0700)]
Merge pull request #28814 from trociny/wip-40461-mimic

mimic: journal: properly advance read offset after skipping invalid range

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoqa/standalone/erasure-code/test-erasure-code: adjust test to avoid m=0 28995/head
Sage Weil [Wed, 13 Mar 2019 17:46:50 +0000 (12:46 -0500)]
qa/standalone/erasure-code/test-erasure-code: adjust test to avoid m=0

_DD is k=2 m=0, which we don't allow.  Switch it to cDD.

I confess I don't fully understand why this was _DD to begin with, but
I'm pretty sure mapping is there to control the order of results so that
it can be mapped to the CRUSH rule output sanely, and the coding portion
is not relevant to the test.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 52d5797c3d3d74dd88664cfe85e5d551e7b334a6)

6 years agoerasure-code: ensure m >= 1
Sage Weil [Tue, 12 Mar 2019 13:57:21 +0000 (08:57 -0500)]
erasure-code: ensure m >= 1

Fixes: http://tracker.ceph.com/issues/38682
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ab0a6528266ab30d442f351de97f5475399ff278)

Conflicts:
src/erasure-code/clay/ErasureCodeClay.cc
- file does not exist in mimic

6 years agomon/OSDMonitor: set ec min_size to k + min(1, m - 1)
Sage Weil [Mon, 11 Mar 2019 17:52:23 +0000 (12:52 -0500)]
mon/OSDMonitor: set ec min_size to k + min(1, m - 1)

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 7f49be2104f0a5df894a53e200c431c527781f9c)

6 years agodeb,rpm,do_cmake: switch to cmake3 27971/head
Kefu Chai [Fri, 6 Jul 2018 05:25:23 +0000 (13:25 +0800)]
deb,rpm,do_cmake: switch to cmake3

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit af2c91ace6c1082925f118d145937ae55fa780d4)

6 years agocmake: remove cython 0.29's subinterpreter check during install
Tim Serong [Wed, 20 Mar 2019 07:52:14 +0000 (18:52 +1100)]
cmake: remove cython 0.29's subinterpreter check during install

Commit 3bde34af8a removed cython 0.29's subinterpreter check when
building the various python modules during `make`, but unforunately
they're *rebuilt* during `make install`, with the rebuild overwriting
the original build.  The original fix was of course missing from the
install stage...

Fixes: https://tracker.ceph.com/issues/38788
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 108462e3fb0e814c98ab32f02b79cf3ea1247692)

6 years agocmake: remove cython 0.29's subinterpreter check
Tim Serong [Mon, 17 Dec 2018 11:01:25 +0000 (22:01 +1100)]
cmake: remove cython 0.29's subinterpreter check

cython 0.29 introduced a check which prevents multiple python
subinterpreters from loading the same module:

https://github.com/cython/cython/commit/7e27c7c

Unfortunately, this completely breaks ceph-mgr.  Until we can
figure out a better long term solution, this commit removes
cython's subinterpreter check, via some careful abuse of the
C preprocessor.

This works because when cython is invoked, it first generates
some C code, then compiles it.  We know it's going to generate
C code including:

  int __Pyx_check_single_interpreter(void) { ... }

and:

  if (__Pyx_check_single_interpreter())
      return NULL;

So, we can do the following:

  #define void0 dead_function(void)
  #define __Pyx_check_single_interpreter(ARG)=ARG ## 0

This replaces the call to __Pyx_check_single_interpreter()
with a literal 0, removing the subinterpreter check.

The void0 dead_function(void) thing is necessary because
the __Pyx_check_single_interpreter() macro also clobbers
that function definition, so we need to make sure it's
replaced with something that works as a function definition.

Fixes: https://tracker.ceph.com/issues/37472
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 3bde34af8a84d76744887b2cf10ee4ef36e3925b)

Conflicts:
cmake/modules/Distutils.cmake
- mimic doesn't have the immediately preceding ccache stuff

6 years agoMerge pull request #28161 from pdvian/wip-39426-mimic
Yuri Weinstein [Wed, 10 Jul 2019 19:38:56 +0000 (12:38 -0700)]
Merge pull request #28161 from pdvian/wip-39426-mimic

mimic: mgr: deadlock

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
6 years agoMerge pull request #28326 from cbodley/wip-40088
Yuri Weinstein [Wed, 10 Jul 2019 19:38:12 +0000 (12:38 -0700)]
Merge pull request #28326 from cbodley/wip-40088

mimic: common: parse ISO 8601 datetime format

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #28399 from xiexingguo/wip-fudege-for-m
Yuri Weinstein [Wed, 10 Jul 2019 19:37:48 +0000 (12:37 -0700)]
Merge pull request #28399 from xiexingguo/wip-fudege-for-m

mimic: mgr/balancer: fix fudge

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28645 from ifed01/wip-ifed-fix-40080-mimic
Yuri Weinstein [Wed, 10 Jul 2019 19:37:07 +0000 (12:37 -0700)]
Merge pull request #28645 from ifed01/wip-ifed-fix-40080-mimic

mimic: os/bluestore: fix duplicate allocations in bmap allocator

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoos/bluestore: default to bitmap allocator for bluestore/bluefs 28970/head
Igor Fedotov [Fri, 18 May 2018 19:14:59 +0000 (22:14 +0300)]
os/bluestore: default to bitmap allocator for bluestore/bluefs

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 231b7dd9c5dc1d22e93a8f81d07e772a6615f9f0)

6 years agoceph_test_objectstore: add very_large_write test 28967/head
Sage Weil [Tue, 16 Apr 2019 13:53:56 +0000 (08:53 -0500)]
ceph_test_objectstore: add very_large_write test

Write 2GB to verify the blockdevice aio splitting.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1974f011137976edf277833d68bdcc4ff22779b0)

- fixed set_val/get_val usage

6 years agoos/bluestore: fix aio pwritev lost data problem.
Sage Weil [Wed, 10 Jul 2019 15:36:50 +0000 (10:36 -0500)]
os/bluestore: fix aio pwritev lost data problem.

On Linux, write() (and similar system calls) will transfer at most
0x7ffff000 (2,147,479,552) bytes, it will cap data if aio pwritev
more than 0x7ffff000, so we have the split the data to more aio submit.

Signed-off-by: kungf <yang.wang@easystack.cn>
(cherry picked from commit 4d33114a40d5ae0d541c36175977ca22789a3b88)

# Conflicts:
# src/os/bluestore/KernelDevice.cc
- fd_direct vs choose_fd()

6 years agoMerge pull request #28948 from ceph/backport-mimic-28866
Alfredo Deza [Wed, 10 Jul 2019 13:20:03 +0000 (09:20 -0400)]
Merge pull request #28948 from ceph/backport-mimic-28866

mimic: ceph-volume broken assertion errors after pytest changes

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agoMerge pull request #28947 from ceph/backport-mimic-28836
Alfredo Deza [Wed, 10 Jul 2019 13:19:19 +0000 (09:19 -0400)]
Merge pull request #28947 from ceph/backport-mimic-28836

mimic: ceph-volume tests add a sleep in tox for slow OSDs after booting

Reviewed-by: Alfredo Deza <adeza@redhat.com>
6 years agomgr/dashboard: Fix run-frontend-e2e-tests.sh 28954/head
Tiago Melo [Mon, 19 Nov 2018 15:07:07 +0000 (15:07 +0000)]
mgr/dashboard: Fix run-frontend-e2e-tests.sh

e2e tests were always returning positive result, even when they failed.

Fixed problem with jq, where it was failing when it was not receiving a string.

Fixes: http://tracker.ceph.com/issues/40707
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit ad293e1961065ea4b92244c8f059dff0ef73a016)

Conflicts:
src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh

6 years agoceph-volume api.lvm catch IndexError when parsing dmmapper output 28948/head
Alfredo Deza [Wed, 3 Jul 2019 18:59:18 +0000 (14:59 -0400)]
ceph-volume api.lvm catch IndexError when parsing dmmapper output

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit bfff70d07a1ccf7fb11a96dd7c63335cfc9b5e26)

6 years agoceph-volume tests update to use error.value instead of str(error)
Alfredo Deza [Wed, 3 Jul 2019 18:58:31 +0000 (14:58 -0400)]
ceph-volume tests update to use error.value instead of str(error)

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 484be7ffb1e0865ff840090a73036567a1f4f5d2)

6 years agoceph-volume tests add a sleep in tox for slow OSDs after booting 28947/head
Alfredo Deza [Tue, 2 Jul 2019 12:34:01 +0000 (08:34 -0400)]
ceph-volume tests add a sleep in tox for slow OSDs after booting

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit b398f99f810d97c94af6d943aed4c11a5fd69c19)