]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agocephadm: Aquire lock, if fsid != None 34674/head
Sebastian Wagner [Wed, 22 Apr 2020 09:51:49 +0000 (11:51 +0200)]
cephadm: Aquire lock, if fsid != None

Fixes:

```
Traceback (most recent call last):
  File "./cephadm", line 4494, in <module>
    r = args.func()
  File "./cephadm", line 1077, in _infer_fsid
    return func()
  File "./cephadm", line 1103, in _infer_image
    return func()
  File "./cephadm", line 2813, in command_ceph_volume
    l = FileLock(args.fsid)
  File "./cephadm", line 560, in __init__
    self._lock_file = os.path.join(LOCK_DIR, name + '.lock')
TypeError: unsupported operand type(s) for +: 'NoneType' and 'str'
```

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #33479 from simon-rock/simon_split_stray
Yan, Zheng [Wed, 22 Apr 2020 06:55:57 +0000 (14:55 +0800)]
Merge pull request #33479 from simon-rock/simon_split_stray

mds : enable fragmentation of stray dir when conditions are met

5 years agoMerge pull request #34561 from kotreshhr/ceph-fs-status-output
Gregory Farnum [Wed, 22 Apr 2020 05:17:42 +0000 (22:17 -0700)]
Merge pull request #34561 from kotreshhr/ceph-fs-status-output

mgr/status: Fix "ceph fs status" json format writing to stderr

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
5 years agoMerge pull request #34546 from varshar16/wip-flake8-cephfs-shell
Gregory Farnum [Wed, 22 Apr 2020 05:16:43 +0000 (22:16 -0700)]
Merge pull request #34546 from varshar16/wip-flake8-cephfs-shell

cephfs-shell: Fix multiple flake8 errors

Reviewed-by: Rishabh Dave <ridave@redhat.com>
5 years agoMerge pull request #34534 from ajarr/fix-43061
Gregory Farnum [Wed, 22 Apr 2020 05:15:23 +0000 (22:15 -0700)]
Merge pull request #34534 from ajarr/fix-43061

mon/FSCommands: Fix 'add_data_pool' command and 'fs new' command

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
5 years agoMerge pull request #34164 from ukernel/wip-44382
Gregory Farnum [Wed, 22 Apr 2020 05:14:10 +0000 (22:14 -0700)]
Merge pull request #34164 from ukernel/wip-44382

qa/cephfs: update TestClusterFull:test_barrier

Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge pull request #33576 from lxbsz/fuse
Gregory Farnum [Wed, 22 Apr 2020 05:12:37 +0000 (22:12 -0700)]
Merge pull request #33576 from lxbsz/fuse

unshare-ns-mount: add isolating netns for mount helper support

Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge pull request #34121 from ADI10HERO/flake8_fix1
Gregory Farnum [Wed, 22 Apr 2020 05:10:59 +0000 (22:10 -0700)]
Merge pull request #34121 from ADI10HERO/flake8_fix1

cephfs-shell: Fix flake8 errors (F841, E302, E502, E128, E305 and E222)

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
5 years agoMerge pull request #34531 from lxbsz/libfuse3
Gregory Farnum [Wed, 22 Apr 2020 05:08:15 +0000 (22:08 -0700)]
Merge pull request #34531 from lxbsz/libfuse3

ceph-fuse: link to libfuse3 and pass `-o big_writes` to libfuse if libfuse < 3.0.0

Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34274 from ukernel/wip-44801
Gregory Farnum [Wed, 22 Apr 2020 05:07:06 +0000 (22:07 -0700)]
Merge pull request #34274 from ukernel/wip-44801

client: reset requested_max_size if file write is not wanted

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
5 years agoMerge pull request #34612 from zdover23/wip-doc-tshooting-ssh-errors-44905
Sebastian Wagner [Tue, 21 Apr 2020 13:22:15 +0000 (15:22 +0200)]
Merge pull request #34612 from zdover23/wip-doc-tshooting-ssh-errors-44905

doc/cephadm: Add troubleshooting guidance for ssh connection failures. [cephadm]

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34661 from wjwithagen/wjw-fix-rgw_bucket_sync_cache.h
Casey Bodley [Tue, 21 Apr 2020 12:21:43 +0000 (08:21 -0400)]
Merge pull request #34661 from wjwithagen/wjw-fix-rgw_bucket_sync_cache.h

rgw: remove noexcept from function definition

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #34614 from theanalyst/rgw/reshard-num-check
Casey Bodley [Tue, 21 Apr 2020 11:59:55 +0000 (07:59 -0400)]
Merge pull request #34614 from theanalyst/rgw/reshard-num-check

rgw: reshard: skip stale bucket id entries from reshard queue

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agorgw: remove noexcept from function definition 34661/head
Willem Jan Withagen [Tue, 21 Apr 2020 11:13:32 +0000 (11:13 +0000)]
rgw: remove noexcept from function definition

Clang complains:
src/rgw/rgw_bucket_sync_cache.h:88:3: error: exception specification of explicitly defaulted copy co
nstructor does not match the calculated one
  Handle(const Handle&) noexcept = default;
  ^
1 error generated.

And a reference that I found for this:
    https://github.com/mapnik/mapnik/issues/3274
Suggesting that the noexcept is inherited from the first definition.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
5 years agoqa/cephfs: add test case for fragmenting stray dirs 33479/head
Yan, Zheng [Mon, 20 Apr 2020 11:16:47 +0000 (19:16 +0800)]
qa/cephfs: add test case for fragmenting stray dirs

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
5 years agoMerge pull request #34605 from tchaikov/wip-45113
Kefu Chai [Tue, 21 Apr 2020 01:23:39 +0000 (09:23 +0800)]
Merge pull request #34605 from tchaikov/wip-45113

qa/suites/*/rados_cls_all.yaml: load all classes

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agomds: automatically fragment stray dirs
Simon Gao [Sat, 22 Feb 2020 02:26:57 +0000 (10:26 +0800)]
mds: automatically fragment stray dirs

Signed-off-by: Simon Gao <simon29rock@gmail.com>
5 years agoMerge pull request #34655 from ceph/wip-yuriw-remove-wip-master
Josh Durgin [Mon, 20 Apr 2020 23:37:32 +0000 (16:37 -0700)]
Merge pull request #34655 from ceph/wip-yuriw-remove-wip-master

qa/tests: removed tests 'client-upgrade-octopus-pacific'

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoqa/tests: removed tests 'client-upgrade-octopus-pacific' 34655/head
Yuri Weinstein [Mon, 20 Apr 2020 22:59:19 +0000 (15:59 -0700)]
qa/tests: removed tests 'client-upgrade-octopus-pacific'

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #34651 from ceph/wip-yuriw-crontab-master
Josh Durgin [Mon, 20 Apr 2020 22:32:11 +0000 (15:32 -0700)]
Merge pull request #34651 from ceph/wip-yuriw-crontab-master

qa/tests: fixed typo

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoqa/tests: fixed typo 34651/head
Yuri Weinstein [Mon, 20 Apr 2020 20:57:10 +0000 (13:57 -0700)]
qa/tests: fixed typo

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #34649 from ceph/wip-yuriw-crontab-master
Yuri Weinstein [Mon, 20 Apr 2020 20:45:41 +0000 (13:45 -0700)]
Merge pull request #34649 from ceph/wip-yuriw-crontab-master

qa/tests: added new clients upgrade tests `client-upgrade-octopus-pacific`

5 years agoqa/tests: added new clients upgrade tests 34649/head
Yuri Weinstein [Mon, 20 Apr 2020 19:41:34 +0000 (12:41 -0700)]
qa/tests: added new clients upgrade tests

`client-upgrade-octopus-pacific` for future 'pacific' release

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #34642 from ceph/wip-yuriw-octopus-client-upgrade-octopus-pacific
Yuri Weinstein [Mon, 20 Apr 2020 19:35:32 +0000 (12:35 -0700)]
Merge pull request #34642 from ceph/wip-yuriw-octopus-client-upgrade-octopus-pacific

qa/tests: initial checkin for clients upgrades tests for future relea…

5 years agoqa/tests: initial checkin for clients upgrades tests for future release of pacific 34642/head
Yuri Weinstein [Mon, 20 Apr 2020 17:45:44 +0000 (10:45 -0700)]
qa/tests: initial checkin for clients upgrades tests for future release of pacific

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #34608 from trociny/wip-journal-append-stripe-width 34647/head
Jason Dillaman [Mon, 20 Apr 2020 17:27:35 +0000 (13:27 -0400)]
Merge pull request #34608 from trociny/wip-journal-append-stripe-width

cls/journal: use EC pool stripe width for padding appends

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #34636 from tchaikov/wip-vstart-runner-py3
Kefu Chai [Mon, 20 Apr 2020 13:23:43 +0000 (21:23 +0800)]
Merge pull request #34636 from tchaikov/wip-vstart-runner-py3

qa/tasks/vstart_runner,doc: be compatible with python3

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
5 years agoqa/tasks/cephfs/fuse_mount.py: by python3 compatible 34636/head
Kefu Chai [Mon, 20 Apr 2020 11:50:02 +0000 (19:50 +0800)]
qa/tasks/cephfs/fuse_mount.py: by python3 compatible

pass `StringIO()` to capture stdout whose value will be interpreted as a
string later on

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoAdd troubleshooting guidance for ssh connection failures. 34612/head
Zac Dover [Fri, 17 Apr 2020 04:12:37 +0000 (14:12 +1000)]
Add troubleshooting guidance for ssh connection failures.

For more thorough information about this commit, see:
https://tracker.ceph.com/issues/44905

Signed-off-by: Zac Dover <zac.dover@gmail.com>
Update doc/cephadm/troubleshooting.rst

Co-Authored-By: Michael Fritch <mfritch@suse.com>
ibid

Signed-off-by: Zac Dover <zac.dover@gmail.com>
Update doc/cephadm/troubleshooting.rst

Co-Authored-By: Sebastian Wagner <sebastian@spawnhost.de>
Update doc/cephadm/troubleshooting.rst

Co-Authored-By: Sebastian Wagner <sebastian@spawnhost.de>
Added mgfritch's suggestion regarding checking to see if the public key
is listed in the authorized_keys file.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
5 years agopybind/mgr/dashboard/run-backend-api-tests.sh: use python3 by default
Kefu Chai [Mon, 20 Apr 2020 11:13:52 +0000 (19:13 +0800)]
pybind/mgr/dashboard/run-backend-api-tests.sh: use python3 by default

since vstart_runner.py is now py3, let's use python3 by default

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tasks/vstart_runner.py: be python3 compatible
Kefu Chai [Mon, 20 Apr 2020 10:27:58 +0000 (18:27 +0800)]
qa/tasks/vstart_runner.py: be python3 compatible

differentiate `str` and `bytes` instances, and drop python2 support from
vstart_runner.py, as we've moved to python3 already

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/suites/*/rados_cls_all.yaml: load all classes 34605/head
Kefu Chai [Fri, 17 Apr 2020 07:15:52 +0000 (15:15 +0800)]
qa/suites/*/rados_cls_all.yaml: load all classes

the intention to add the whitelist was to test "sdk" class, but if we
add new classes to the list, and add tests exercising them, the tests
fail if we fail to update these `rados_cls_all.yaml` accordingly.

so in this change, the list is now '*' which allows OSD to load all
classes found in the specified directory

Fixes: https://tracker.ceph.com/issues/45113
Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agodoc/dev/developer_guide: use python3 to launch vstart_runner.py
Kefu Chai [Mon, 20 Apr 2020 10:26:27 +0000 (18:26 +0800)]
doc/dev/developer_guide: use python3 to launch vstart_runner.py

as vstart_runner.py is compatible with python3, and so is the tests
under `qa/` directory.

and use `pip` to install teuthology, simpler this way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomds: make MDCache::scan_stray_dir() handle dir fragmentation
Yan, Zheng [Tue, 3 Mar 2020 07:37:59 +0000 (15:37 +0800)]
mds: make MDCache::scan_stray_dir() handle dir fragmentation

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
5 years agomds: don't add null dentry to frozen stray dir
Yan, Zheng [Tue, 3 Mar 2020 03:52:29 +0000 (11:52 +0800)]
mds: don't add null dentry to frozen stray dir

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
5 years agomds: auth pin stray dir when purging stray inode
Yan, Zheng [Tue, 3 Mar 2020 03:30:45 +0000 (11:30 +0800)]
mds: auth pin stray dir when purging stray inode

After stray inode gets added to purge queue, mds deletes stray dentry.
MDS needs to make sure stray dir is not being fragmented.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
5 years agoceph: allow 'dirfrag split' asok command to operate on stray dirs
Yan, Zheng [Tue, 3 Mar 2020 03:16:13 +0000 (11:16 +0800)]
ceph: allow 'dirfrag split' asok command to operate on stray dirs

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
5 years agoMerge pull request #34432 from optimistyzy/47_upstream
Kefu Chai [Mon, 20 Apr 2020 06:51:33 +0000 (14:51 +0800)]
Merge pull request #34432 from optimistyzy/47_upstream

os/bluestore/NVMEDevice.cc: use slist for tracking mempool

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoNVMEDevice: Remove the performance counter 34432/head
Ziye Yang [Tue, 7 Apr 2020 21:09:56 +0000 (05:09 +0800)]
NVMEDevice: Remove the performance counter

Compared with other approach (KernelDevice, iouring), it does not
have such feature, so remove it to simplify the code and improve
the performance. Because, each thread will call the logger and calculate
the time, it is very time consuming. And the upper layer in bluestore has
the feature to track each I/O task.

And it is not readable if we add ifdef configure to enable this feature,
so in my mind that I suggest removing this latency track. And the
latency benefit demonstrated by SPDK is already approved, so we do not
need to tracking every I/O time when invoking SPDK driver.

Signed-off-by: Ziye Yang <ziye.yang@intel.com>
5 years agoNVMEDevice.cc: Remove the data_buf_mempool
Ziye Yang [Tue, 7 Apr 2020 15:23:46 +0000 (23:23 +0800)]
NVMEDevice.cc: Remove the data_buf_mempool

Use the linked list is enough.

Signed-off-by: Ziye Yang <ziye.yang@intel.com>
5 years agoMerge pull request #34615 from dillaman/wip-45072
Mykola Golub [Sun, 19 Apr 2020 07:57:49 +0000 (10:57 +0300)]
Merge pull request #34615 from dillaman/wip-45072

rbd-mirror: image replayer stop might race with instance replayer shut down

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoceph-fuse: link to libfuse3 if fuse3 is installed 34531/head
Xiubo Li [Wed, 15 Apr 2020 06:21:44 +0000 (02:21 -0400)]
ceph-fuse: link to libfuse3 if fuse3 is installed

Fixes: https://tracker.ceph.com/issues/44891
Signed-off-by: Xiubo Li <xiubli@redhat.com>
5 years agorbd-fuse: remove FUSE_CAP_BIG_WRITES when linking to libfuse3
Xiubo Li [Fri, 17 Apr 2020 09:46:24 +0000 (05:46 -0400)]
rbd-fuse: remove FUSE_CAP_BIG_WRITES when linking to libfuse3

The big-writes is enabled as default from 3.0.

Fixes: https://tracker.ceph.com/issues/44891
Signed-off-by: Xiubo Li <xiubli@redhat.com>
5 years agorbd-fuse: switch to use utimens instead
Xiubo Li [Fri, 17 Apr 2020 09:33:55 +0000 (05:33 -0400)]
rbd-fuse: switch to use utimens instead

The utime is deprecated.

Fixes: https://tracker.ceph.com/issues/44891
Signed-off-by: Xiubo Li <xiubli@redhat.com>
5 years agoMerge pull request #34576 from jdurgin/wip-object-corpus
Kefu Chai [Sat, 18 Apr 2020 03:59:55 +0000 (11:59 +0800)]
Merge pull request #34576 from jdurgin/wip-object-corpus

ceph-object-corpus: update to octopus

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #34535 from changchengx/refine_build_liburing
Kefu Chai [Sat, 18 Apr 2020 03:39:32 +0000 (11:39 +0800)]
Merge pull request #34535 from changchengx/refine_build_liburing

cmake: refactor liburing support

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoceph-fuse: enable the big writes as default
Xiubo Li [Thu, 16 Apr 2020 10:13:17 +0000 (06:13 -0400)]
ceph-fuse: enable the big writes as default

When the libfuse version < 3, without the big_writes options enabled
the write perf is very poor.

Fixes: https://tracker.ceph.com/issues/44885
Signed-off-by: Xiubo Li <xiubli@redhat.com>
5 years agoMerge pull request #34584 from bk201/wip-45108
Sebastian Wagner [Fri, 17 Apr 2020 16:55:21 +0000 (18:55 +0200)]
Merge pull request #34584 from bk201/wip-45108

mgr/test_orchestrator: fix error when listing services

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #32951 from matthewoliver/cephadm_rgw_ssl
Sebastian Wagner [Fri, 17 Apr 2020 16:54:50 +0000 (18:54 +0200)]
Merge pull request #32951 from matthewoliver/cephadm_rgw_ssl

cephadm: add RGW SSL support

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34410 from lxbsz/mds_dirty_parent
Gregory Farnum [Fri, 17 Apr 2020 15:27:40 +0000 (08:27 -0700)]
Merge pull request #34410 from lxbsz/mds_dirty_parent

tools/cephfs: add accounted_rstat/rstat when building file dentry

Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
5 years agoMerge pull request #33928 from mchangir/cephfs-journal-tool-cannot-set-dry_run-arg
Gregory Farnum [Fri, 17 Apr 2020 15:26:52 +0000 (08:26 -0700)]
Merge pull request #33928 from mchangir/cephfs-journal-tool-cannot-set-dry_run-arg

cephfs-journal-tool: correctly parse --dry_run argument

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
5 years agocmake: use cmake module to integrate liburing 34535/head
Changcheng Liu [Mon, 13 Apr 2020 09:55:49 +0000 (17:55 +0800)]
cmake: use cmake module to integrate liburing

1. WITH_LIBURING is used to set HAVE_LIBURING to decide
   use liburing in KernelDevice or not.
2. WITH_SYSTEM_LIBURING is to choose use system installed
   liburing or build the liburing from source code.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
5 years agoMerge pull request #32612 from rishabh-d-dave/fs-qa-UnicodeDecodeError
Gregory Farnum [Fri, 17 Apr 2020 15:21:42 +0000 (08:21 -0700)]
Merge pull request #32612 from rishabh-d-dave/fs-qa-UnicodeDecodeError

test_cephfs_shell: fix UnicodeDecodeError

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
5 years agoMerge pull request #33169 from moningchao/master
Gregory Farnum [Fri, 17 Apr 2020 15:20:42 +0000 (08:20 -0700)]
Merge pull request #33169 from moningchao/master

client: fix blacklist removal failed

Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
5 years agoMerge pull request #33711 from lxbsz/qa_umount_failed
Gregory Farnum [Fri, 17 Apr 2020 15:20:30 +0000 (08:20 -0700)]
Merge pull request #33711 from lxbsz/qa_umount_failed

qa/tasks/cephfs: umount the mountpoints when tearDown

Reviewed-by: Rishabh Dave <ridave@redhat.com>
5 years agoMerge pull request #34533 from fanjunwei/fix_fuse_bug
Gregory Farnum [Fri, 17 Apr 2020 15:18:52 +0000 (08:18 -0700)]
Merge pull request #34533 from fanjunwei/fix_fuse_bug

client: fix ceph-fuse parse command line failed

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
5 years agorbd-mirror: track in-flight start/stop/restart in instance replayer 34615/head
Jason Dillaman [Fri, 17 Apr 2020 15:17:05 +0000 (11:17 -0400)]
rbd-mirror: track in-flight start/stop/restart in instance replayer

The shut down waits for in-flight ops to complete but the
start/stop/restart operations were previously not tracked. This
could cause a potential race and crash between an image replayer
operation and the instance replayer shutting down.

Fixes: https://tracker.ceph.com/issues/45072
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorgw: reshard: skip stale bucket id entries from reshard queue 34614/head
Abhishek Lekshmanan [Fri, 17 Apr 2020 15:11:01 +0000 (17:11 +0200)]
rgw: reshard: skip stale bucket id entries from reshard queue

If we encounter a reshard queue entry that has an older ID compared to the
bucket's current ID, it'd mean that some other process or a manual reshard has
already processed this entry, skip processing the entry this time. An
alternative is to verify the num_shards that we have in queue >= the current
shards, but this would mean that we may reshard a recently manual resharded
bucket again which might not be intended

Fixes: https://tracker.ceph.com/issues/45134
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge pull request #34601 from yuriw/wip-yuriw-crontab-master
Yuri Weinstein [Fri, 17 Apr 2020 14:47:06 +0000 (07:47 -0700)]
Merge pull request #34601 from yuriw/wip-yuriw-crontab-master

qa/tests: added octopus-p2p upgrade tests to the mix

5 years agorbd-mirror: switch to common C_TrackedOp context class
Jason Dillaman [Fri, 17 Apr 2020 14:20:44 +0000 (10:20 -0400)]
rbd-mirror: switch to common C_TrackedOp context class

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agocommon: add helper C_TrackerOp context class
Jason Dillaman [Fri, 17 Apr 2020 14:02:10 +0000 (10:02 -0400)]
common: add helper C_TrackerOp context class

This wraps the functionality of starting and finishing a tracked op
into the standard context interface.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #34604 from tchaikov/wip-cmake-fuse
Kefu Chai [Fri, 17 Apr 2020 13:31:44 +0000 (21:31 +0800)]
Merge pull request #34604 from tchaikov/wip-cmake-fuse

cmake: check for FUSE version and cleanups

Reviewed-by: Xiubo Li <xiubli@redhat.com>
5 years agocls/journal: use EC pool stripe width for padding appends 34608/head
Mykola Golub [Fri, 17 Apr 2020 11:40:41 +0000 (12:40 +0100)]
cls/journal: use EC pool stripe width for padding appends

to avoid ECSubRead ops to reencode a partially updated stripe.

Signed-off-by: Mykola Golub <mgolub@suse.com>
5 years agoobjclass: add method to get pool stripe width
Mykola Golub [Fri, 17 Apr 2020 10:49:59 +0000 (11:49 +0100)]
objclass: add method to get pool stripe width

Signed-off-by: Mykola Golub <mgolub@suse.com>
5 years agocmake: detect fuse3 as well 34604/head
Kefu Chai [Fri, 17 Apr 2020 06:31:15 +0000 (14:31 +0800)]
cmake: detect fuse3 as well

Fixes: https://tracker.ceph.com/issues/44891
Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocmake: check for FUSE version
Kefu Chai [Fri, 17 Apr 2020 05:50:16 +0000 (13:50 +0800)]
cmake: check for FUSE version

and refactor FindFUSE.cmake a little bit to conditionalize OSX support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocmake: link against FUSE::FUSE
Kefu Chai [Fri, 17 Apr 2020 05:46:21 +0000 (13:46 +0800)]
cmake: link against FUSE::FUSE

instead of specifying the include directory and linkage separately

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocmake: rename Findfuse.cmake to FindFUSE.cmake
Kefu Chai [Fri, 17 Apr 2020 05:02:22 +0000 (13:02 +0800)]
cmake: rename Findfuse.cmake to FindFUSE.cmake

so its name is consistent with upstream name, and with the variables
exposed by FindFUSE.cmake.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoqa/tests: added octopus-p2p upgrade tests to the mix 34601/head
Yuri Weinstein [Thu, 16 Apr 2020 21:01:10 +0000 (14:01 -0700)]
qa/tests: added octopus-p2p upgrade tests to the mix

Signed-off-by: Yuri Weinstein <yweinste@gmail.com>
5 years agoMerge pull request #34573 from dillaman/wip-44938-2
Mykola Golub [Thu, 16 Apr 2020 15:50:47 +0000 (18:50 +0300)]
Merge pull request #34573 from dillaman/wip-44938-2

test: tx-only peer from heartbeat can race w/ CLI

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #34346 from jschmid1/osd_id_claims
Sebastian Wagner [Thu, 16 Apr 2020 14:37:34 +0000 (16:37 +0200)]
Merge pull request #34346 from jschmid1/osd_id_claims

mgr/cephadm: add support for osd_id_claims

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34517 from tchaikov/wip-qa-dashboard-telemetry
Kefu Chai [Thu, 16 Apr 2020 14:12:56 +0000 (22:12 +0800)]
Merge pull request #34517 from tchaikov/wip-qa-dashboard-telemetry

qa/tasks/mgr/dashboard: set last_opt_revision when setting enabled

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
5 years agoMerge pull request #34210 from kotreshhr/cephfs-subvolume-info
Venky Shankar [Thu, 16 Apr 2020 13:08:08 +0000 (18:38 +0530)]
Merge pull request #34210 from kotreshhr/cephfs-subvolume-info

mgr/volumes: Add interface to get subvolume metadata

5 years agomgr/test_orchestrator: fix error when listing services 34584/head
Kiefer Chang [Thu, 16 Apr 2020 07:34:51 +0000 (15:34 +0800)]
mgr/test_orchestrator: fix error when listing services

- Adapting attribute change of ServiceSpec.
- Update dummy data.

Fixes: https://tracker.ceph.com/issues/45108
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agoqa/tasks/mgr/dashboard: set last_opt_revision when setting enabled 34517/head
Kefu Chai [Sat, 11 Apr 2020 04:02:18 +0000 (12:02 +0800)]
qa/tasks/mgr/dashboard: set last_opt_revision when setting enabled

telemetry requires user to re opt-in when opt_revision is bumped up

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/orch: Fixes some deserialization errors
Kiefer Chang [Thu, 16 Apr 2020 07:30:24 +0000 (15:30 +0800)]
mgr/orch: Fixes some deserialization errors

Fixes errors when calling `from_json` of these classes:
- InventoryHost: parsing labels
- ServiceDescription: `last_refresh` and `created` fields should be parsed
  to datetime type.

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agodoc: add object corpus to release checklist 34576/head
Josh Durgin [Thu, 16 Apr 2020 02:25:55 +0000 (22:25 -0400)]
doc: add object corpus to release checklist

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agoceph-object-corpus: pick up octopus 15.2.1-40-ga838bb1aae
Josh Durgin [Thu, 16 Apr 2020 01:29:39 +0000 (21:29 -0400)]
ceph-object-corpus: pick up octopus 15.2.1-40-ga838bb1aae

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #34577 from tchaikov/wip-doc-dev-corpus 34582/head
Kefu Chai [Thu, 16 Apr 2020 04:37:25 +0000 (12:37 +0800)]
Merge pull request #34577 from tchaikov/wip-doc-dev-corpus

doc/dev/corpus.rst: tweak formatting

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoclient: reset requested_max_size if file write is not wanted 34274/head
Yan, Zheng [Fri, 20 Mar 2020 05:15:45 +0000 (13:15 +0800)]
client: reset requested_max_size if file write is not wanted

write can stuck at waiting for larger max_size in following sequence of
events:

- client opens a file and writes to position 'A' (larger than unit of
  max size increment)
- client closes the file handle and updates wanted caps (not wanting
  file write caps)
- client opens and truncates the file, writes to position 'A' again.

At the 1st event, client set inode's requested_max_size to 'A'. At the
2nd event, mds removes client's writable range, but client does not reset
requested_max_size. At the 3rd event, client does not request max size
because requested_max_size is already larger than 'A'.

Fixes: https://tracker.ceph.com/issues/44801
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
5 years agodoc/dev/corpus.rst: tweak formatting 34577/head
Kefu Chai [Thu, 16 Apr 2020 03:09:43 +0000 (11:09 +0800)]
doc/dev/corpus.rst: tweak formatting

* use `shell` lexer, otherwise the Python one is used, and the rendered
  result does not look right
* be consistent when indenting -- either use tab or spaces, otherwise
  the indent in code block would be wrong.
* double quote the variables in text

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocephadm: add RGW SSL support 32951/head
Matthew Oliver [Thu, 23 Jan 2020 00:02:24 +0000 (11:02 +1100)]
cephadm: add RGW SSL support

This patch adds SSL support to RGW when using cephadm.
If an SSL certificate is provided, inside the json supplied with:

  cpeh orchestrator rgw create -i rgw.json

Then the SSL cert and/or key will be added to pushed into the mon config-key database
using the key `rgw/cert/<rgw_realm>/<rgw_zone>.[crt|key]`.
Which will then be referenced in the config:

  rgw_frontends = beast port=80 ssl_port=443 ssl_certificate=config://rgw/cert/<rgw_realm>/<rgw_zone>.crt

And if an ssl key is also supplied this becomes something like:

  rgw_frontends = beast port=80 ssl_port=443 ssl_certificate=config://rgw/cert/<rgw_realm>/<rgw_zone>.crt ssl_key=config://rgw/cert/<rgw_realm>/<rgw_zone>.key

Of course you could also just upload the cert and key yourself to
config-key location, and ssl will be enabled as well. But this patch
let's you either supply them via `-i` or as a manual upload step.

Co-Authored-By: Michael Fritch <mfritch@suse.com>
Co-Authored-By: Sebastian Wagner <sebastian@spawnhost.de>
Signed-off-by: Matthew Oliver <moliver@suse.com>
5 years agoinclude/denc: replace bufferlist::copy with iterator version
Josh Durgin [Thu, 16 Apr 2020 01:26:40 +0000 (21:26 -0400)]
include/denc: replace bufferlist::copy with iterator version

This version was only compiled as part of ceph-object-corpus
generation, when ENCODE_DUMP_PATH is defined, so it was missed
when bufferlist::copy() was removed.

Fixes: https://tracker.ceph.com/issues/45023
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #34541 from neha-ojha/wip-balancer-on
Neha Ojha [Wed, 15 Apr 2020 22:03:28 +0000 (15:03 -0700)]
Merge pull request #34541 from neha-ojha/wip-balancer-on

mgr: turn on balancer in upmap mode by default

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoqa/workunits/rbd: retry the addition of a mirror pool peer 34573/head
Jason Dillaman [Wed, 15 Apr 2020 20:27:07 +0000 (16:27 -0400)]
qa/workunits/rbd: retry the addition of a mirror pool peer

We might race with the remote rbd-mirror daemon creating a
tx-only peer when adding a new peer. Therefore, delete the
tx-only peer and attempt to re-create it.

Fixes: https://tracker.ceph.com/issues/44938
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agolibrbd: mirror peer add error message should include site name
Jason Dillaman [Wed, 15 Apr 2020 20:26:09 +0000 (16:26 -0400)]
librbd: mirror peer add error message should include site name

It previously included the pointer to string holding the generated
uuid (neither of which would mean much to an end user).

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agorbd: improved error message when adding a duplicate mirror pool peer
Jason Dillaman [Wed, 15 Apr 2020 19:21:55 +0000 (15:21 -0400)]
rbd: improved error message when adding a duplicate mirror pool peer

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32747 from Exotelis/wip-40702-collapse
Lenz Grimmer [Wed, 15 Apr 2020 15:33:50 +0000 (17:33 +0200)]
Merge pull request #32747 from Exotelis/wip-40702-collapse

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #34094 from cbodley/wip-rgw-data-sync-cache
Casey Bodley [Wed, 15 Apr 2020 15:00:29 +0000 (11:00 -0400)]
Merge pull request #34094 from cbodley/wip-rgw-data-sync-cache

rgw multisite: data sync optimizations

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
5 years agomgr/cephadm: add replacement flag to _create_osd 34346/head
Joshua Schmid [Thu, 2 Apr 2020 09:33:35 +0000 (11:33 +0200)]
mgr/cephadm: add replacement flag to _create_osd

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agomgr/status: Fix "ceph fs status" json format writing to stderr 34561/head
Kotresh HR [Tue, 14 Apr 2020 17:16:54 +0000 (22:46 +0530)]
mgr/status: Fix "ceph fs status" json format writing to stderr

"ceph fs status" json format outputs to stderr instead of
stdout. This patch fixes the same.

Fixes: https://tracker.ceph.com/issues/44962
Signed-off-by: Kotresh HR <khiremat@redhat.com>
5 years agoMerge pull request #34549 from dillaman/wip-qa-rbd-read-balance
Mykola Golub [Wed, 15 Apr 2020 13:08:08 +0000 (16:08 +0300)]
Merge pull request #34549 from dillaman/wip-qa-rbd-read-balance

qa/suites/rbd: tweak 'require_osd_release' to 'pacific'

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #34496 from dillaman/wip-44105
Mykola Golub [Wed, 15 Apr 2020 12:30:48 +0000 (15:30 +0300)]
Merge pull request #34496 from dillaman/wip-44105

rbd-mirror: clean-up unnecessary non-primary snapshots

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agomgr/dashboard: Add expand/collapse datatable feature 32747/head
Sebastian Krah [Tue, 7 Jan 2020 15:56:40 +0000 (16:56 +0100)]
mgr/dashboard: Add expand/collapse datatable feature

Adds expand/collapse feature to every datatable with details.

Fixes: https://tracker.ceph.com/issues/40702
Signed-off-by: Sebastian Krah <skrah@suse.com>
5 years agomon/FSCommands: Fix 'fs new' command 34534/head
Ramana Raja [Tue, 14 Apr 2020 11:13:33 +0000 (16:43 +0530)]
mon/FSCommands: Fix 'fs new' command

After creating a filesystem using the 'fs new' command, the value
of the 'data' and 'metadata' key of the datapool and metadatapool's
application tag 'cephfs' should be the filesystem's name. This
didn't happen when the data or metadata pool's application metadata
'cephfs' was enabled before the pool was used in the 'fs new' command.
Fix this during the handling of the 'fs new' command by setting the
value of the key of the pool's application metadata 'cephfs' to the
filesystem's name even when the application metadata 'cephfs' is
already enabled or set.

Fixes: https://tracker.ceph.com/issues/43761
Signed-off-by: Ramana Raja <rraja@redhat.com>
5 years agomgr/cephadm: use --osd-ids instead of --osd-id
Joshua Schmid [Wed, 1 Apr 2020 14:26:33 +0000 (16:26 +0200)]
mgr/cephadm: use --osd-ids instead of --osd-id

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agomgr/cephadm: add support for osd_id_claims
Joshua Schmid [Wed, 1 Apr 2020 13:56:08 +0000 (15:56 +0200)]
mgr/cephadm: add support for osd_id_claims

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agoMerge pull request #34529 from maran/master
Sebastian Wagner [Wed, 15 Apr 2020 10:56:03 +0000 (12:56 +0200)]
Merge pull request #34529 from maran/master

cephadm: warn when no valid version arguments are supplied to add-repo

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #34490 from sebastian-philipp/cephadm-command_add_repo-no-podman
Sebastian Wagner [Wed, 15 Apr 2020 10:54:41 +0000 (12:54 +0200)]
Merge pull request #34490 from sebastian-philipp/cephadm-command_add_repo-no-podman

cephadm: add-repo: Don't test for podman

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #34443 from sebastian-philipp/cephadm-revert-33974
Sebastian Wagner [Wed, 15 Apr 2020 10:54:17 +0000 (12:54 +0200)]
Merge pull request #34443 from sebastian-philipp/cephadm-revert-33974

cephadm: Update images used

Reviewed-by: Michael Fritch <mfritch@suse.com>