]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agolibrbd: remove io::ReadResult::set_clip_length 37727/head
Jason Dillaman [Tue, 20 Oct 2020 17:10:06 +0000 (13:10 -0400)]
librbd: remove io::ReadResult::set_clip_length

Combined the functionality with the newer 'set_image_extents' call
to simplify the call-site logic for IO reads.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #37692 from tchaikov/wip-bump-up-pytest
Kefu Chai [Tue, 20 Oct 2020 12:07:55 +0000 (20:07 +0800)]
Merge pull request #37692 from tchaikov/wip-bump-up-pytest

pybind/mgr/dashboard: s/pytest<4/pytest/

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agopybind/mgr/dashboard: disable too-many-branches lint warning 37692/head
Kefu Chai [Tue, 20 Oct 2020 11:04:40 +0000 (19:04 +0800)]
pybind/mgr/dashboard: disable too-many-branches lint warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/dashboard: use setUpClass for initializeing class
Kefu Chai [Fri, 16 Oct 2020 17:10:24 +0000 (01:10 +0800)]
pybind/mgr/dashboard: use setUpClass for initializeing class

instead of relying on __init__(), use setUpClass() to initialize class
for testing. it turns out in pytest > 4, __init__() is called for the
test class but the attributes of the instantiated class is in turn overriden.

so we have to use setUpClass to do this job.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/dashboard: refactor overlong statement
Kefu Chai [Tue, 20 Oct 2020 10:33:29 +0000 (18:33 +0800)]
pybind/mgr/dashboard: refactor overlong statement

to silence lint warning like:

services/tcmu_service.py:64:39: E126 continuation line over-indented for hanging indent':'./services/tcmu_service.py:64:39: E126 continuation line over-indented for hanging indent'}
2: 1     E126 continuation line over-indented for hanging indent

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/dashboard: reindent to appease lint
Kefu Chai [Tue, 20 Oct 2020 10:14:40 +0000 (18:14 +0800)]
pybind/mgr/dashboard: reindent to appease lint

silences warning like:

************* Module dashboard.services.tcmu_service
services/tcmu_service.py:64:0: C0330: Wrong continued indentation (add 18 spaces).
                    or [[0, 0]])[-1][1] / 1000000000
                    ^                 | (bad-continuation)

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/dashboard: s/pytest<4/pytest/
Kefu Chai [Tue, 13 Oct 2020 08:09:42 +0000 (16:09 +0800)]
pybind/mgr/dashboard: s/pytest<4/pytest/

to address following failure:

    The user requested pytest<4
    pytest-cov 2.10.1 depends on pytest>=4.6

when building the target of "mgr-dashboard-virtualenv"

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/mgr/dashboard: bump flake8 to 3.8.4
Kefu Chai [Tue, 13 Oct 2020 07:11:14 +0000 (15:11 +0800)]
pybind/mgr/dashboard: bump flake8 to 3.8.4

to address the failure of

The conflict is caused by:
    flake8 3.7.8 depends on pycodestyle<2.6.0 and >=2.5.0
    autopep8 1.5.4 depends on pycodestyle>=2.6.0

when building the "mgr-dashboard-venv" target

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotools/setup-virtualenv.sh: pass --use-feature=2020-resolver to pip
Kefu Chai [Thu, 8 Oct 2020 07:13:36 +0000 (15:13 +0800)]
tools/setup-virtualenv.sh: pass --use-feature=2020-resolver to pip

as long as pip supports this option, pass it to `pip install`

to silence warnings and errors like:

ERROR: After October 2020 you may experience errors when installing or updating packages. This is because pip will change the way that it resolves dependency conflicts.

We recommend you use --use-feature=2020-resolver to test your packages with the new resolver before it becomes the default.

autopep8 1.5.4 requires pycodestyle>=2.6.0, but you'll have pycodestyle 2.5.0 which is incompatible.
pytest-cov 2.10.1 requires pytest>=4.6, but you'll have pytest 3.10.1 which is incompatible.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36948 from bk201/wip-46492
Lenz Grimmer [Tue, 20 Oct 2020 10:58:51 +0000 (12:58 +0200)]
Merge pull request #36948 from bk201/wip-46492

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge PR #37646 into master
Patrick Donnelly [Tue, 20 Oct 2020 02:28:40 +0000 (19:28 -0700)]
Merge PR #37646 into master

* refs/pull/37646/head:
mds: account for closing sessions in hit_session

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #37608 into master
Patrick Donnelly [Tue, 20 Oct 2020 02:27:48 +0000 (19:27 -0700)]
Merge PR #37608 into master

* refs/pull/37608/head:
mon/MDSMonitor: divide mds identifier and mds real name with dot

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #37529 into master
Patrick Donnelly [Tue, 20 Oct 2020 02:26:52 +0000 (19:26 -0700)]
Merge PR #37529 into master

* refs/pull/37529/head:
qa: set rados op timeouts for mds/ceph-fuse
qa: print debug info on mount cleanup
qa: remove redundant rmr
qa: use null mode to prevent undesired changes to mountpoint
qa: unmount all clients before deleting the file system
osdc: add timeout configs for mons/osds
common: accept timespan for SaferCond.wait_for

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge PR #37294 into master
Patrick Donnelly [Tue, 20 Oct 2020 02:25:29 +0000 (19:25 -0700)]
Merge PR #37294 into master

* refs/pull/37294/head:
mds: assert when inode has no parent directory

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37644 from mgfritch/orch-device-lsm_data
Joshua Schmid [Mon, 19 Oct 2020 14:21:56 +0000 (16:21 +0200)]
Merge pull request #37644 from mgfritch/orch-device-lsm_data

mgr/orchestrator: set `lsm_data` to default of Dict type

4 years agomgr/cephadm: do not configure Dashboard Ganesha settings 36948/head
Kiefer Chang [Wed, 2 Sep 2020 12:48:02 +0000 (20:48 +0800)]
mgr/cephadm: do not configure Dashboard Ganesha settings

The Dashboard can get cluster information from the Orchestrator.
For settings that are set by previous revisions, the Dashboard will
check them and ask user to remove them.

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
4 years agodoc/dashboard: add information for Orchestrator NFS-Ganesha clusters
Kiefer Chang [Thu, 3 Sep 2020 14:32:12 +0000 (22:32 +0800)]
doc/dashboard: add information for Orchestrator NFS-Ganesha clusters

Fixes: https://tracker.ceph.com/issues/46492
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
4 years agomgr/dashboard: support Orchestrator and user-defined Ganesha clusters
Kiefer Chang [Wed, 2 Sep 2020 12:28:36 +0000 (20:28 +0800)]
mgr/dashboard: support Orchestrator and user-defined Ganesha clusters

This change make the Dashboard support two types of Ganesha clusters:

- Orchestrator clusters (Since Octopus)
  - Deployed by the Orchestrator.
  - The Dashboard gets the pool/namespace that stores Ganesha
    configuration objects from the Orchestrator.
  - The Dashboard gets the daemons in a cluster from the Orchestrator.

- User-defined clusters (Since Nautilus)
  - Clusters defined by using `ceph dashboard
    set-ganesha-clusters-rados-pool-namespace` command is treated as
    user-defined clusters.
  - Each daemon has its own RADOS configuration objects. The
    Dashboard uses these objects to deduce daemons.

Fixes: https://tracker.ceph.com/issues/46492
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
4 years agomgr/dashboard: refator orchestrator service and daemon APIs
Kiefer Chang [Wed, 2 Sep 2020 12:25:52 +0000 (20:25 +0800)]
mgr/dashboard: refator orchestrator service and daemon APIs

- Allow listing services by service_type.
- Allow listing daemons by daemon_type.

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
4 years agoMerge pull request #37175 from changchengx/log_start
Kefu Chai [Mon, 19 Oct 2020 10:44:29 +0000 (18:44 +0800)]
Merge pull request #37175 from changchengx/log_start

common: remove log_early configuration option

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37617 from rhcs-dashboard/46869-sass-modules
Lenz Grimmer [Mon, 19 Oct 2020 09:56:55 +0000 (11:56 +0200)]
Merge pull request #37617 from rhcs-dashboard/46869-sass-modules

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Sebastian Krah <skrah@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agoMerge pull request #37700 from tchaikov/wip-build-integration-branch
Kefu Chai [Mon, 19 Oct 2020 09:21:51 +0000 (17:21 +0800)]
Merge pull request #37700 from tchaikov/wip-build-integration-branch

build-integration-branch: send token in the header

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #37564 from s0nea/wip-dashboard-nfs-daemons-param
Lenz Grimmer [Mon, 19 Oct 2020 08:42:22 +0000 (10:42 +0200)]
Merge pull request #37564 from s0nea/wip-dashboard-nfs-daemons-param

mgr/dashboard/qa: consider `daemons` parameter

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
4 years agoMerge pull request #37658 from neha-ojha/wip-crimson-suite
Kefu Chai [Mon, 19 Oct 2020 06:56:00 +0000 (14:56 +0800)]
Merge pull request #37658 from neha-ojha/wip-crimson-suite

qa/crontab/teuthology-cronjobs: add crimson-rados

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocommon: remove log_early configuration option 37175/head
Changcheng Liu [Tue, 13 Oct 2020 01:47:16 +0000 (09:47 +0800)]
common: remove log_early configuration option

After deciding to always enable tracking log in early phase, there's no
need to keep "log_early" option here and remove it directly.

Suggested-by: Kefu Chai <kefu@redhat.com>
Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agocommon: remove useless log_early check condition here
Changcheng Liu [Wed, 16 Sep 2020 01:50:54 +0000 (09:50 +0800)]
common: remove useless log_early check condition here

The code logic shows that Log thread needs to be started even
log_early is false.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agoMerge pull request #37315 from changchengx/paxos_extend
Kefu Chai [Mon, 19 Oct 2020 06:15:01 +0000 (14:15 +0800)]
Merge pull request #37315 from changchengx/paxos_extend

mon: define paxos services indexes using enum and cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.com>
4 years agoMerge pull request #36536 from matthewoliver/pick_address_warning_doc_update
Kefu Chai [Mon, 19 Oct 2020 06:12:52 +0000 (14:12 +0800)]
Merge pull request #36536 from matthewoliver/pick_address_warning_doc_update

common/pick_address: support IPv4 and IPv6 dual stack mode

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37670 from changchengx/crypto_plugin
Kefu Chai [Mon, 19 Oct 2020 06:10:06 +0000 (14:10 +0800)]
Merge pull request #37670 from changchengx/crypto_plugin

crypto: remove useless code and unify file name variable

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37635 from jecluis/wip-46816
Kefu Chai [Mon, 19 Oct 2020 06:08:09 +0000 (14:08 +0800)]
Merge pull request #37635 from jecluis/wip-46816

mon: have 'mon stat' output json as well

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #33392 from alram/master
Kefu Chai [Mon, 19 Oct 2020 04:44:51 +0000 (12:44 +0800)]
Merge pull request #33392 from alram/master

osdmaptool: add --mark-{up,in} and --adjust-crush-weight options

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #36603 into master
Patrick Donnelly [Mon, 19 Oct 2020 01:44:51 +0000 (18:44 -0700)]
Merge PR #36603 into master

* refs/pull/36603/head:
test: add test for setting ceph mirror virtual xattr
tests/pybind/cephfs: cleanup xattrs before starting tests
client: filter ceph.* xattrs from listing
client: force an attr fetch for ceph xattrs
client: changes for ceph.mirror.info xattr
mds: restrict setting/removing certain xattrs in ceph namespace
mds: introduce ceph.mirror.info virtual xattr
mds: customize xattr handling using dispatch handlers
mds: introduce is_ceph_vxattr() helper

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37699 from dillaman/wip-47880
Mykola Golub [Sun, 18 Oct 2020 12:43:51 +0000 (15:43 +0300)]
Merge pull request #37699 from dillaman/wip-47880

journal: possible race condition between flush and append callback

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agobuild-integration-branch: change to be pep8 compliant 37700/head
Kefu Chai [Sat, 17 Oct 2020 03:24:22 +0000 (11:24 +0800)]
build-integration-branch: change to be pep8 compliant

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agobuild-integration-branch: send token in the header
Kefu Chai [Sat, 17 Oct 2020 03:09:49 +0000 (11:09 +0800)]
build-integration-branch: send token in the header

see
https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37698 from tchaikov/wip-crimson-do-until
Kefu Chai [Sat, 17 Oct 2020 01:32:23 +0000 (09:32 +0800)]
Merge pull request #37698 from tchaikov/wip-crimson-do-until

crimson/common: schedule action only if the future is not available

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agoMerge pull request #37695 from tchaikov/wip-dashboard-pep8
Kefu Chai [Fri, 16 Oct 2020 17:32:59 +0000 (01:32 +0800)]
Merge pull request #37695 from tchaikov/wip-dashboard-pep8

mgr/dashboard: do not use "l" for variable name

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #37645 from dillaman/wip-librbd-aio-completion-race
Mykola Golub [Fri, 16 Oct 2020 15:45:32 +0000 (18:45 +0300)]
Merge pull request #37645 from dillaman/wip-librbd-aio-completion-race

librbd: update AioCompletion return value before evaluating pending count

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #37643 from dillaman/wip-47840
Mykola Golub [Fri, 16 Oct 2020 15:45:04 +0000 (18:45 +0300)]
Merge pull request #37643 from dillaman/wip-47840

librbd: ignore -ENOENT error when disabling object-map

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #37444 from dillaman/wip-librbd-copyup-api
Mykola Golub [Fri, 16 Oct 2020 15:44:36 +0000 (18:44 +0300)]
Merge pull request #37444 from dillaman/wip-librbd-copyup-api

librbd: support the ability to process parent data prior to copyup

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Or Ozeri <oro@il.ibm.com>
4 years agojournal: possible race condition between flush and append callback 37699/head
Jason Dillaman [Fri, 16 Oct 2020 15:25:39 +0000 (11:25 -0400)]
journal: possible race condition between flush and append callback

When notifying the journal recorder of an overflow or if the object
close request has completed due to no more in-flight IO, it was
possible for a race between a flush request and the processing of
an append completion to attempt to kick off duplicate notifications.
Since the overflowed and closed callbacks are properly protected from
duplicates, use a counter instead of a boolean to track possible
in-flight handler callbacks.

Fixes: https://tracker.ceph.com/issues/47880
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agocrimson/common: schedule action only if the future is not available 37698/head
Kefu Chai [Fri, 16 Oct 2020 14:07:50 +0000 (22:07 +0800)]
crimson/common: schedule action only if the future is not available

otherwise we could call do_until() recursively if we have other tasks
which need to prempt the reactor and current future's state is actually
always available.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/dashboard: do not use "l" for variable name 37695/head
Kefu Chai [Fri, 16 Oct 2020 10:51:04 +0000 (18:51 +0800)]
mgr/dashboard: do not use "l" for variable name

see also https://www.flake8rules.com/rules/E741.html

also silences flake8 warnings like:

2: {tty:'./controllers/home.py:90:26: E741 ambiguous variable name 'l'':'./controllers/home.py:90:26: E741 ambiguous variable name 'l''}
2: {tty:'./controllers/logs.py:52:13: E741 ambiguous variable name 'l'':'./controllers/logs.py:52:13: E741 ambiguous variable name 'l''}
2: {tty:'./services/ganesha.py:36:40: E741 ambiguous variable name 'l'':'./services/ganesha.py:36:40: E741 ambiguous variable name 'l''}
2: 3     E741 ambiguous variable name 'l'

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37687 from tchaikov/wip-crimson-errorator
Kefu Chai [Fri, 16 Oct 2020 08:50:10 +0000 (16:50 +0800)]
Merge pull request #37687 from tchaikov/wip-crimson-errorator

crimson/common: do not take from a future twice

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
4 years agoMerge pull request #37602 from tspmelo/wip-flake8-ignore
Kiefer Chang [Fri, 16 Oct 2020 07:27:35 +0000 (15:27 +0800)]
Merge pull request #37602 from tspmelo/wip-flake8-ignore

mgr/dashboard: Remove some Flake8 ignore rules

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agocrimson/common: do not take from a future twice 37687/head
Kefu Chai [Fri, 16 Oct 2020 06:11:52 +0000 (14:11 +0800)]
crimson/common: do not take from a future twice

before this change, in our specialization of seastar::do_until(),
we access `f` after calling `f.get()`, this is not correct. as `f.get()`
actually moves `f._state` away and detaches the associated promise if any.
so we cannot call `f._then()` anymore after calling `f.get()`. as
`f._then()` schedules `f` by detaching the future from promise and
attaching the scheduled task to the promise. but `future_base::detach_promise()`
does not check `_promise` before accessing it, hence the segfault.

after this change, the order of the checks is rearranged so that
`f.get()` is called at the end. and also use `f.get0()` to be more
explicit, as we are accessing the only element of the returned
value.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37684 from ivancich/rgw-yummy-orphan-testing
J. Eric Ivancich [Thu, 15 Oct 2020 20:14:07 +0000 (16:14 -0400)]
Merge pull request #37684 from ivancich/rgw-yummy-orphan-testing

rgw: use yum rather than dnf for teuthology testing of rgw-orphan-list

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw: use yum rather than dnf for testing rgw-orphan-list 37684/head
J. Eric Ivancich [Thu, 15 Oct 2020 18:14:04 +0000 (14:14 -0400)]
rgw: use yum rather than dnf for testing rgw-orphan-list

The teuthology testing for rgw-orphan-list needs to install
`s3cmd`. Switch from using dnf to yum to work on a wider variety of
platforms.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #37660 from adamemerson/wip-datalog-fix
Adam C. Emerson [Thu, 15 Oct 2020 16:03:13 +0000 (12:03 -0400)]
Merge pull request #37660 from adamemerson/wip-datalog-fix

cls/fifo: Switch use CLS_ERR for errors
rgw/fifo: Fix a few missed return value assignments
rgw/fifo: Add some error logging
rgw/fifo: Catch two instances journaling a new part
rgw/fifo: Use unique_ptr and explicit release for callbacks

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #37575 from bk201/wip-47742
Joshua Schmid [Thu, 15 Oct 2020 13:02:50 +0000 (15:02 +0200)]
Merge pull request #37575 from bk201/wip-47742

qa/suites/rados/cephadm/dashboard: fix creating OSD failure

4 years agoMerge pull request #37669 from lixiaoy1/fix_cache_state_ut_1015
Jason Dillaman [Thu, 15 Oct 2020 12:47:57 +0000 (08:47 -0400)]
Merge pull request #37669 from lixiaoy1/fix_cache_state_ut_1015

rbd/cache: fix UTs related to image cache state

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
4 years agorbd/cache: fix UTs related to image cache state 37669/head
lixiaoy1 [Thu, 15 Oct 2020 11:00:07 +0000 (07:00 -0400)]
rbd/cache: fix UTs related to image cache state

Signed-off-by: Li, Xiaoyan <xiaoyan.li@intel.com>
4 years agoMerge pull request #37633 from tchaikov/wip-pybind-rados-cleanup
Kefu Chai [Thu, 15 Oct 2020 10:54:38 +0000 (18:54 +0800)]
Merge pull request #37633 from tchaikov/wip-pybind-rados-cleanup

pybind/rados: add more type hintings and cleanup

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #37624 from lxbsz/cram
Kefu Chai [Thu, 15 Oct 2020 10:53:38 +0000 (18:53 +0800)]
Merge pull request #37624 from lxbsz/cram

qa/tasks: add a 'parallel' option support for the cram task

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #37621 from dsavineau/cephadm_ntpsec
Kefu Chai [Thu, 15 Oct 2020 10:16:19 +0000 (18:16 +0800)]
Merge pull request #37621 from dsavineau/cephadm_ntpsec

cephadm: allow ntpsec service

Reviewed-by: Joshua Schmid <jschmid@suse.de>
4 years agoMerge pull request #37601 from tspmelo/wip-rm-wait-for-expected-get-result
Kefu Chai [Thu, 15 Oct 2020 10:12:54 +0000 (18:12 +0800)]
Merge pull request #37601 from tspmelo/wip-rm-wait-for-expected-get-result

qa/mgr: Remove _wait_for_expected_get_result

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agocrypto/isa-l: remove redundant declare shared library 37670/head
Changcheng Liu [Thu, 15 Oct 2020 06:56:01 +0000 (14:56 +0800)]
crypto/isa-l: remove redundant declare shared library

isal_crypto_plugin_objs is same as ceph_crypto_isal

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agocommon/plugin: correct output filename path
Changcheng Liu [Thu, 15 Oct 2020 06:53:27 +0000 (14:53 +0800)]
common/plugin: correct output filename path

The around code use fname as output in some places.
Unify the file name variable to be fname.

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agocommon/plugin: remove stale commented code
Changcheng Liu [Thu, 15 Oct 2020 06:52:38 +0000 (14:52 +0800)]
common/plugin: remove stale commented code

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
4 years agoMerge pull request #37609 from lixiaoy1/remove_writelog
Jason Dillaman [Thu, 15 Oct 2020 00:31:17 +0000 (20:31 -0400)]
Merge pull request #37609 from lixiaoy1/remove_writelog

rbd/cache: remove unnecessary WriteLogCache

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
4 years agoMerge pull request #37625 from lixiaoy1/rwl_path
Jason Dillaman [Thu, 15 Oct 2020 00:29:41 +0000 (20:29 -0400)]
Merge pull request #37625 from lixiaoy1/rwl_path

rbd/cache: store full cache path to image metadata

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
4 years agorgw/fifo: Use unique_ptr and explicit release for callbacks 37660/head
Adam C. Emerson [Tue, 13 Oct 2020 21:32:01 +0000 (17:32 -0400)]
rgw/fifo: Use unique_ptr and explicit release for callbacks

To simplify and clarify memory allocation in AIO cases.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw/fifo: Catch two instances journaling a new part
Adam C. Emerson [Tue, 13 Oct 2020 21:05:58 +0000 (17:05 -0400)]
rgw/fifo: Catch two instances journaling a new part

If we see another part journaled, just run the journal ourselves.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw/fifo: Add some error logging
Adam C. Emerson [Tue, 13 Oct 2020 19:25:53 +0000 (15:25 -0400)]
rgw/fifo: Add some error logging

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agorgw/fifo: Fix a few missed return value assignments
Adam C. Emerson [Tue, 13 Oct 2020 17:12:46 +0000 (13:12 -0400)]
rgw/fifo: Fix a few missed return value assignments

Slipped in when I converted from call-back based to sequential.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agocls/fifo: Switch use CLS_ERR for errors
Adam C. Emerson [Tue, 13 Oct 2020 15:56:04 +0000 (11:56 -0400)]
cls/fifo: Switch use CLS_ERR for errors

So things going wrong show up in the log by default. Also use
__PRETTY_FUNCTION__ instead of __func__ and print some more context.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
4 years agoMerge PR #34702 into master
Patrick Donnelly [Wed, 14 Oct 2020 18:11:15 +0000 (11:11 -0700)]
Merge PR #34702 into master

* refs/pull/34702/head:
doc: Make time-related osd default values in documentation big-endian.

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37587 from anthonyeleven/yet-more-doc-polishing
zdover23 [Wed, 14 Oct 2020 16:48:25 +0000 (02:48 +1000)]
Merge pull request #37587 from anthonyeleven/yet-more-doc-polishing

doc: clarity, detail, modernization, capitalization

Reviewed-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge pull request #37168 from ifed01/wip-ifed-fix-compress-csum
Kefu Chai [Wed, 14 Oct 2020 14:19:03 +0000 (22:19 +0800)]
Merge pull request #37168 from ifed01/wip-ifed-fix-compress-csum

os/bluestore: attach csum for compressed blobs

Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
4 years agoMerge pull request #37611 from tchaikov/wip-cmake-tox
Kefu Chai [Wed, 14 Oct 2020 14:02:36 +0000 (22:02 +0800)]
Merge pull request #37611 from tchaikov/wip-cmake-tox

cmake: do not always add py3 to TOX_ENVS

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #37594 from trociny/wip-rbd-quiesce-cancel
Jason Dillaman [Wed, 14 Oct 2020 13:59:58 +0000 (09:59 -0400)]
Merge pull request #37594 from trociny/wip-rbd-quiesce-cancel

librbd: fix race on watcher unregister

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #37650 from jschmid1/gs
Joshua Schmid [Wed, 14 Oct 2020 12:45:27 +0000 (14:45 +0200)]
Merge pull request #37650 from jschmid1/gs

mgr/cephadm: adapt <placement> usage string

4 years agomgr/dashboard: set 'vendor/variables' SASS module as the single source of truth 37617/head
Alfonso Martínez [Wed, 14 Oct 2020 11:29:35 +0000 (13:29 +0200)]
mgr/dashboard: set 'vendor/variables' SASS module as the single source of truth

Fixes: https://tracker.ceph.com/issues/46869
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
4 years agomgr/dashboard: add an empty line to appease flake8 37611/head
Kefu Chai [Tue, 13 Oct 2020 08:38:55 +0000 (16:38 +0800)]
mgr/dashboard: add an empty line to appease flake8

silence the warnings like

./controllers/mgr_modules.py:38:5: E301 expected 1 blank line, found 0'
./controllers/user.py:69:5: E301 expected 1 blank line, found 0

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37394 from rosinL/cleanup-queue-option
Kefu Chai [Wed, 14 Oct 2020 08:08:04 +0000 (16:08 +0800)]
Merge pull request #37394 from rosinL/cleanup-queue-option

common/options: remove unavailable values of osd_op_queue

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37627 from changchengx/msg
Kefu Chai [Wed, 14 Oct 2020 08:05:51 +0000 (16:05 +0800)]
Merge pull request #37627 from changchengx/msg

msg: remove stale comment and unnecessary code

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37626 from tchaikov/wip-drop-std-iterator
Kefu Chai [Wed, 14 Oct 2020 08:04:14 +0000 (16:04 +0800)]
Merge pull request #37626 from tchaikov/wip-drop-std-iterator

include/interval_set: do not inherit from std::iterator

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
4 years agoMerge pull request #37455 from smithfarm/wip-spec-file-cleanup
Kefu Chai [Wed, 14 Oct 2020 07:43:30 +0000 (15:43 +0800)]
Merge pull request #37455 from smithfarm/wip-spec-file-cleanup

rpm: three spec file cleanups

Reviewed-by: Tim Serong <tserong@suse.com>
4 years agopybind/rados: correct the declarations of C APIs 37633/head
Kefu Chai [Mon, 12 Oct 2020 07:38:48 +0000 (15:38 +0800)]
pybind/rados: correct the declarations of C APIs

so they are consistent with the ones declared in include/rados/librados.h

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopybind/rados: add more type hintings
Kefu Chai [Mon, 12 Oct 2020 07:12:30 +0000 (15:12 +0800)]
pybind/rados: add more type hintings

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocmake: do not always add py3 to TOX_ENVS
Kefu Chai [Fri, 9 Oct 2020 05:55:39 +0000 (13:55 +0800)]
cmake: do not always add py3 to TOX_ENVS

before this change add_tox_test() always add "py3" to testenv, even the
caller specifies TOX_ENVS explicitly.

after this change, py3 is added only if the caller does not specify any
TOX_ENVS.

this change helps with the readability.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agopick_address: Warn and continue when you find at least 1 IPv4 or IPv6 address 36536/head
Matthew Oliver [Mon, 10 Aug 2020 04:46:21 +0000 (04:46 +0000)]
pick_address: Warn and continue when you find at least 1 IPv4 or IPv6 address

Currently if specify a single public or cluster network, yet have both
`ms bind ipv4` and `ms bind ipv6` set daemons crash when they can't find
both IPs from the same network:

    unable to find any IPv4 address in networks '2001:db8:11d::/120' interfaces ''

And rightly so, of course it can't find an IPv4 network in an IPv6
network.
This patch, adds a new helper method, networks_address_family_coverage,
that takes the list of networks and returns a bitmap of address families
supported.
We then check to see if we have enough networks defined and if you don't
it'll warn and then continue.

Also update the network-config-ref to mention having to define both
address family addresses for cluster and or public networks.

As well as a warning about `ms bind ipv4` being enabled by default which
is easy to miss, there by enabling dual stack when you may only be
expect single stack IPv6.

Thee is also a drive by to fix a `note` that wan't being displayed due
to missing RST syntax.

Signed-off-by: Matthew Oliver <moliver@suse.com>
Fixes: https://tracker.ceph.com/issues/46845
Fixes: https://tracker.ceph.com/issues/39711
4 years agoMerge PR #37583 into master
Patrick Donnelly [Tue, 13 Oct 2020 17:27:02 +0000 (10:27 -0700)]
Merge PR #37583 into master

* refs/pull/37583/head:
mgr/volumes/nfs: Fix wrong error message for pseudo path

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #37585 into master
Patrick Donnelly [Tue, 13 Oct 2020 17:26:02 +0000 (10:26 -0700)]
Merge PR #37585 into master

* refs/pull/37585/head:
doc/cephfs/nfs: Remove outdated doc related to rook

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: set rados op timeouts for mds/ceph-fuse 37529/head
Patrick Donnelly [Tue, 13 Oct 2020 17:09:41 +0000 (10:09 -0700)]
qa: set rados op timeouts for mds/ceph-fuse

Now that the osdc Objecter obeys updates to these configs, let's use
them to avoid having them block forever on operations that may never
complete (or should complete in a timely manner).

Fixes: https://tracker.ceph.com/issues/47734
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: print debug info on mount cleanup
Patrick Donnelly [Wed, 7 Oct 2020 00:19:08 +0000 (17:19 -0700)]
qa: print debug info on mount cleanup

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: remove redundant rmr
Patrick Donnelly [Tue, 6 Oct 2020 16:37:21 +0000 (09:37 -0700)]
qa: remove redundant rmr

The mount.cleanup method will remove the mount point. This `rm -rf` will
always fail (with exit status 0).

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: use null mode to prevent undesired changes to mountpoint
Patrick Donnelly [Mon, 5 Oct 2020 17:40:42 +0000 (10:40 -0700)]
qa: use null mode to prevent undesired changes to mountpoint

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: unmount all clients before deleting the file system
Patrick Donnelly [Mon, 5 Oct 2020 17:31:23 +0000 (10:31 -0700)]
qa: unmount all clients before deleting the file system

Otherwise we have unnecessary timeout waits.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoosdc: add timeout configs for mons/osds
Patrick Donnelly [Sat, 3 Oct 2020 00:11:54 +0000 (17:11 -0700)]
osdc: add timeout configs for mons/osds

Have the Objecter track the rados_(mon|osd)_op_timeout configs so that
it can be configured at runtime/startup. This is useful for the
MDS/ceph-fuse so that we can avoid waiting forever for a response from
the Monitors that will never come (statfs on a deleted file system's
pools).

Also: make these configs take a time value rather than double. This is
simpler to deal with in the code and allows time units to be used (e.g.
"5m" for 5 minutes).

Fixes: https://tracker.ceph.com/issues/47734
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agocommon: accept timespan for SaferCond.wait_for
Patrick Donnelly [Tue, 13 Oct 2020 17:08:21 +0000 (10:08 -0700)]
common: accept timespan for SaferCond.wait_for

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa/crontab/teuthology-cronjobs: add crimson-rados 37658/head
Neha Ojha [Tue, 13 Oct 2020 17:00:07 +0000 (17:00 +0000)]
qa/crontab/teuthology-cronjobs: add crimson-rados

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #37610 from anthonyeleven/doc-rados-troubleshooting
zdover23 [Tue, 13 Oct 2020 16:32:24 +0000 (02:32 +1000)]
Merge pull request #37610 from anthonyeleven/doc-rados-troubleshooting

doc/rados/troubleshooting: clarity and modernization

Reviewed-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge PR #36537 into master
Patrick Donnelly [Tue, 13 Oct 2020 16:29:04 +0000 (09:29 -0700)]
Merge PR #36537 into master

* refs/pull/36537/head:
qa/cephfs: update ephemeral pin tests
mds: distribute dirfrags for ephemeral distributed directory

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa/suites/crimson-rados: add .qa helper
Neha Ojha [Tue, 13 Oct 2020 15:52:20 +0000 (15:52 +0000)]
qa/suites/crimson-rados: add .qa helper

Fixes:
OSError: /home/nojha/src/github.com_ceph_ceph_master/qa/suites/crimson-rados/basic/centos_latest.yaml
does not exist (abs /home/nojha/src/github.com_ceph_ceph_master/qa/suites/crimson-rados/basic/centos_latest.yaml)

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoqa/cephfs: update ephemeral pin tests 36537/head
Yan, Zheng [Wed, 12 Aug 2020 06:49:15 +0000 (14:49 +0800)]
qa/cephfs: update ephemeral pin tests

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
4 years agomds: distribute dirfrags for ephemeral distributed directory
Yan, Zheng [Fri, 7 Aug 2020 15:58:19 +0000 (23:58 +0800)]
mds: distribute dirfrags for ephemeral distributed directory

Instead of distribute individual dir inodes inside the ephemeral
distributed dir. Distributing dirfrags can limit number of subtrees
created by the ephemeral dist pin.

This patch also unifies codes that handle export pin and ephemeral pin.

Fixes: https://tracker.ceph.com/issues/46696
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
4 years agolibrbd: support preprocessing source object data prior to deep-copy 37444/head
Jason Dillaman [Mon, 5 Oct 2020 18:04:14 +0000 (14:04 -0400)]
librbd: support preprocessing source object data prior to deep-copy

Let object dispatch layers potentially mutate the data read from the
source image prior to issuing the actual deep-copy operations against
the destination image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: continue to simplify deep-copy object copy write ops types
Jason Dillaman [Mon, 5 Oct 2020 14:19:51 +0000 (10:19 -0400)]
librbd: continue to simplify deep-copy object copy write ops types

Replace the custom WriteOp data structure and just re-use the new
io::SnapshotSparseBufferlist structure to record write and zero ops.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: simplify deep-copy object copy write ops types
Jason Dillaman [Mon, 5 Oct 2020 13:56:56 +0000 (09:56 -0400)]
librbd: simplify deep-copy object copy write ops types

The write-ops now only stores write vs zero ops and the type of
zero operation is delayed until the actual op is sent. This will
make the state machine compatible with the copyup process hook.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>