]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Casey Bodley [Mon, 3 Jun 2019 14:59:00 +0000 (10:59 -0400)]
test/rgw: test truncated reads in RGWHTTPManager
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
c669cf293f02b3c68a4c539d7accf7ddf35cb1ee )
Conflicts:
src/test/rgw/test_http_manager.cc
- RGWHTTP::process() only takes one argument in mimic
Tianshan Qu [Fri, 31 May 2019 10:37:44 +0000 (18:37 +0800)]
rgw: fix miss handle curl error return
if meet tcp packet loss, curl return will be result=18(CURLE_PARTIAL_FILE)
and http_status=200, so sync will continue and cause content miss match.
Fixes: https://tracker.ceph.com/issues/39992
Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit
9b7025857026c64cf076e82d762556ac2bcd2625 )
Casey Bodley [Wed, 29 May 2019 21:11:13 +0000 (17:11 -0400)]
rgw: fetch_remote_obj() compares expected object size
if the size of object data received doesn't match the value returned in
the Rgwx-Object-Size header, fail with -EIO
Fixes: https://tracker.ceph.com/issues/39992
Signed-off-by: Xiaoxi CHEN <xiaoxchen@ebay.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
c6c4c5639ea34c49329719c2725886e740acd0b3 )
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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 )
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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 )
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 )
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();"
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
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 )
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 )
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>
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>
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>
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>
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 )
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
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 )
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 )
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 )
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
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>
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>
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>
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>
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 )
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
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()
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>
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>
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
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 )
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 )
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 )
Alfredo Deza [Tue, 9 Jul 2019 20:02:13 +0000 (16:02 -0400)]
Merge pull request #28930 from ceph/backport-mimic-26739
mimic: ceph-volume: replace testinfra command with py.test
Reviewed-by: Alfredo Deza
Yuri Weinstein [Mon, 8 Jul 2019 20:01:45 +0000 (13:01 -0700)]
Merge pull request #28209 from votdev/add_tenant_to_bucket
mimic: rgw: Return tenant field in bucket_stats function
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 8 Jul 2019 20:01:21 +0000 (13:01 -0700)]
Merge pull request #28249 from pdvian/wip-39532-mimic
mimic: rgw: resharding of a versioned bucket causes a bucket stats discrepancy
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 8 Jul 2019 20:00:59 +0000 (13:00 -0700)]
Merge pull request #28348 from smithfarm/wip-39179-mimic
mimic: rgw: remove_olh_pending_entries() does not limit the number of xattrs to remove
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 8 Jul 2019 20:00:28 +0000 (13:00 -0700)]
Merge pull request #28409 from cbodley/wip-40147
mimic: rgw: fix bucket may redundantly list keys after BI_PREFIX_CHAR
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 8 Jul 2019 19:59:53 +0000 (12:59 -0700)]
Merge pull request #28422 from pdvian/wip-39697-mimic
mimic: rgw: return ERR_NO_SUCH_BUCKET early while evaluating bucket policy
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 8 Jul 2019 19:59:26 +0000 (12:59 -0700)]
Merge pull request #28483 from pdvian/wip-39734-mimic
mimic: rgw: multisite: mismatch of bucket creation times from List Buckets
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 8 Jul 2019 19:59:03 +0000 (12:59 -0700)]
Merge pull request #28668 from smithfarm/wip-40348-mimic
mimic: tests: use curl in wait_for_radosgw() in util/rgw.py
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 8 Jul 2019 19:58:39 +0000 (12:58 -0700)]
Merge pull request #28711 from pdvian/wip-40133-mimic
mimic: rgw: TempURL should not allow PUTs with the X-Object-Manifest.
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 8 Jul 2019 19:58:14 +0000 (12:58 -0700)]
Merge pull request #28716 from smithfarm/wip-40507-mimic
mimic: rgw: conditionally allow builtin users with non-unique email addresses
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Alfredo Deza [Mon, 4 Mar 2019 14:05:07 +0000 (09:05 -0500)]
ceph-volume tests.simple replace testinfra command for py.test
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
e90ebc3264004cab3286895c843db43f20a4840b )
Alfredo Deza [Mon, 4 Mar 2019 14:04:51 +0000 (09:04 -0500)]
ceph-volume tests.lvm replace testinfra command for py.test
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
c4597fc63195c654b960f747f9d50a558fa719c0 )
Alfredo Deza [Mon, 4 Mar 2019 14:04:36 +0000 (09:04 -0500)]
ceph-volume tests.batch replace testinfra command for py.test
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
dc7501af69ccbdabb5e6a77a91696454855201e9 )
Mykola Golub [Tue, 25 Jun 2019 04:38:37 +0000 (05:38 +0100)]
rbd-mirror: handle duplicates in image sync throttler queue
Fixes: http://tracker.ceph.com/issues/40519
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
2f35ab70a59fc22c02c98e5aa80a1e6cde29a226 )
Conflicts:
src/test/rbd_mirror/test_mock_ImageSyncThrottler.cc:
no g_ceph_context arg for MockImageSyncThrottler constructor
Igor Fedotov [Fri, 21 Jun 2019 10:16:08 +0000 (13:16 +0300)]
os/bluestore: load OSD all compression settings unconditionally.
Inititally we don't load them if OSD compression mode is set to none.
But we might need them when pool's compression is enabled but some
settings aren't set.
Fixes: http://tracker.ceph.com/issues/40480
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
187509ebf6bf913b65f0171013bf7c20279dadb4 )
Matt Benjamin [Fri, 7 Jun 2019 14:20:01 +0000 (10:20 -0400)]
rgw_file: all directories are virtual with respect to contents
This change causes directory handles to always report an mtime of
"now." This is not an invalidate per se--it interacts with the
nfs implementation to produce that result when the implementation
updates its cached attributes. Hence, it can be modulated by timers
or other rules governing attribute caching at the upper layer.
Fixes: http://tracker.ceph.com/issues/40204
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
b4c7d0faeff667c25ab255786999ef0cc844ea2b )
Sage Weil [Tue, 10 Apr 2018 18:00:42 +0000 (13:00 -0500)]
os/bluestore: factor VDO into bluestore's 'allocated' value
If we are on VDO, report the *raw* storage we've allocated, as reported
by VDO.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
04b47939b84f388c3a8c0b09077fe56b27d2f9f2 )
Sage Weil [Mon, 9 Apr 2018 19:58:03 +0000 (14:58 -0500)]
os/filestore: estimate omap_allocated
Assume all of leveldb/rocksdb is omap. This is an overestimate, but
better than nothing.
We don't populate the metadata overhead (no easy way to calculate this
that comes to mind). And we don't populate the compression-related
fields. It's possible we could make something up here in the VDO
case...
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
186edca81ef09058b9c121967ab1850fbb5812b6 )
Sage Weil [Tue, 10 Apr 2018 17:55:55 +0000 (12:55 -0500)]
os/ObjectMap: add get_db() accessor
This is just to let us get at the underlying KeyValueDB for DBObjectMap.
It is not really better or worse than adding accessors for things like
GetEstimatedSize() to ObjectMap.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
6c82e66dde715e5e4e12261655c5e7b521871453 )
Sage Weil [Tue, 3 Oct 2017 13:21:15 +0000 (08:21 -0500)]
osd/OSDMap: include data, omap in 'osd df' output
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
13295a38839d3df18994be101eb69361ce30cd34 )
Sage Weil [Tue, 3 Oct 2017 03:28:13 +0000 (22:28 -0500)]
os/bluestore: report omap and internal metadata usage
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
fc5561ed6e1d44cda83a7c31d27f7392ee2e18ee )
Sage Weil [Tue, 3 Oct 2017 03:22:16 +0000 (22:22 -0500)]
os/bluestore/BlueFS: drop get_fs_usage(); add get_used()
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
52cfc505fb36f6cc77e29b246db8e0e833116a23 )
Sage Weil [Tue, 3 Oct 2017 03:17:54 +0000 (22:17 -0500)]
kv: add per-prefix space estimation
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
c6da00b418764ca8fec248b768f3744ca1e655ed )
Sage Weil [Tue, 3 Oct 2017 02:35:48 +0000 (21:35 -0500)]
osd: decouple statfs update from hb peers, pg count
These don't need to be updated in synchrony. (In fact, the statfs update
could be much more infrequent.)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
71d8fe7faf4952f1743103b16f590d46a9488684 )
Sage Weil [Tue, 3 Oct 2017 02:32:01 +0000 (21:32 -0500)]
osd: drop useless OSDService::update_osd_stat()
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
a66f8bfe7d49f7d33ec027eeeb67870c610610db )
Sage Weil [Tue, 3 Oct 2017 02:27:58 +0000 (21:27 -0500)]
osd/osd_types: separate accounting for data, omap, and metadata
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
fa120cec38b11378a7e6dbe37397f9a203f2f75c )
Conflicts:
src/os/bluestore/BlueStore.cc
src/test/objectstore/store_test.cc
Trivial - gconf and ceph_assert
Sage Weil [Mon, 9 Apr 2018 16:39:25 +0000 (11:39 -0500)]
osd: re-add get_num_pgs()
We removed this but it's a useful accessor.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
b116d2140871e0bb6d562cb3303ad3116145d55d )
Nathan Cutler [Tue, 2 Jul 2019 08:24:58 +0000 (10:24 +0200)]
Merge pull request #28029 from ifed01/wip-ifed-dump-before-nospanid-mimic
mimic: os/bluestore: dump before "no-spanning blob id" abort
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 1 Jul 2019 20:13:31 +0000 (13:13 -0700)]
Merge pull request #28619 from xiexingguo/wip-40230
mimic: mon, osd: parallel clean_pg_upmaps
Reviewed-by: Neha Ojha <nojha@redhat.com>