]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agospec: include snap_schedule in ceph spec file
Venky Shankar [Tue, 28 Apr 2020 06:57:30 +0000 (02:57 -0400)]
spec: include snap_schedule in ceph spec file

Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agosnap_schedule: add initial interface and basic CRUD ops
Jan Fajerski [Wed, 6 May 2020 13:32:17 +0000 (15:32 +0200)]
snap_schedule: add initial interface and basic CRUD ops

Storage of schedules is in an in-memory sqlite DB that gets serialized
to an rados object.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
4 years agopybind/mgr/mgr_util: CephFSClient - add helper methods
Jan Fajerski [Wed, 6 May 2020 13:20:56 +0000 (15:20 +0200)]
pybind/mgr/mgr_util: CephFSClient - add helper methods

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
4 years agopybing/mgr/mgr_module: allow keyword arguments
Jan Fajerski [Thu, 16 Apr 2020 09:49:31 +0000 (11:49 +0200)]
pybing/mgr/mgr_module: allow keyword arguments

If a mgr module encounters an argument values containing a '=' parsing
switches to kwargs style parsing independent of arg position. If a
non-kw argument is encountered after the first kw argument an EINVAL
error is returned.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
4 years agoMerge pull request #36816 from sebastian-philipp/cephadm-pep8-osd
Sebastian Wagner [Thu, 27 Aug 2020 13:38:43 +0000 (15:38 +0200)]
Merge pull request #36816 from sebastian-philipp/cephadm-pep8-osd

mgr/cephadm: PEP8tify services/osd.py

Reviewed-by: Adam King <adking@redhat.com>
4 years agoMerge pull request #36830 from tchaikov/wip-crimson-recovery-cleanup
Kefu Chai [Thu, 27 Aug 2020 13:31:24 +0000 (21:31 +0800)]
Merge pull request #36830 from tchaikov/wip-crimson-recovery-cleanup

crimson/osd: recovery related cleanup

Reviewed-by: Xuehan Xu <xxhdx1985126@163.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #36841 from matthewoliver/cephadm_iscsi_dev_volumemount
Sebastian Wagner [Thu, 27 Aug 2020 13:23:58 +0000 (15:23 +0200)]
Merge pull request #36841 from matthewoliver/cephadm_iscsi_dev_volumemount

cephadm: Give better access to the /dev in the iscsi container

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36811 from sebastian-philipp/mgr-always-mock-rados
Sebastian Wagner [Thu, 27 Aug 2020 12:50:46 +0000 (14:50 +0200)]
Merge pull request #36811 from sebastian-philipp/mgr-always-mock-rados

pybind/mgr: pytest: Unconditionally mock the rados objects

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
4 years agoMerge pull request #36844 from BryceCao/wip-correct-log-output
Daniel Gryniewicz [Thu, 27 Aug 2020 12:30:00 +0000 (08:30 -0400)]
Merge pull request #36844 from BryceCao/wip-correct-log-output

rgw: correct log output when decode bucket CORS attr

4 years agoMerge pull request #36736 from ceph/47052-fix-base-uri-api-tests
Laura Paduano [Thu, 27 Aug 2020 12:27:08 +0000 (14:27 +0200)]
Merge pull request #36736 from ceph/47052-fix-base-uri-api-tests

mgr/dashboard: fix API tests: Invalid URL: None/api/auth

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agoMerge pull request #36818 from sebastian-philipp/orch-pep8
Sebastian Wagner [Thu, 27 Aug 2020 12:03:10 +0000 (14:03 +0200)]
Merge pull request #36818 from sebastian-philipp/orch-pep8

mgr/orchestrator: PEP8tify

Reviewed-by: Adam King <adking@redhat.com>
4 years agoMerge pull request #36590 from votdev/issue_46903_prevent_select_events
Lenz Grimmer [Thu, 27 Aug 2020 10:33:01 +0000 (12:33 +0200)]
Merge pull request #36590 from votdev/issue_46903_prevent_select_events

mgr/dashboard: Datatable catches select events from other datatables

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agoMerge pull request #36599 from votdev/issue_46915_login_autocomplete
Lenz Grimmer [Thu, 27 Aug 2020 10:15:17 +0000 (12:15 +0200)]
Merge pull request #36599 from votdev/issue_46915_login_autocomplete

mgr/dashboard: Disable autocomplete on user form

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agoMerge pull request #36799 from mgfritch/cephadm-iscsi-check-mon-command
Sebastian Wagner [Thu, 27 Aug 2020 10:03:56 +0000 (12:03 +0200)]
Merge pull request #36799 from mgfritch/cephadm-iscsi-check-mon-command

mgr/cephadm: use `check_mon_command` during iscsi config

4 years agoMerge pull request #36797 from mgfritch/cephadm-infer-image-no-tag
Sebastian Wagner [Thu, 27 Aug 2020 10:03:23 +0000 (12:03 +0200)]
Merge pull request #36797 from mgfritch/cephadm-infer-image-no-tag

cephadm: infer latest image with a valid tag

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #36752 from mgfritch/cephadm-nfs-redux
Sebastian Wagner [Thu, 27 Aug 2020 10:01:52 +0000 (12:01 +0200)]
Merge pull request #36752 from mgfritch/cephadm-nfs-redux

mgr/cephadm: clean-up nfs service

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #36330 from Devp00l/wip-46551
Sebastian Wagner [Thu, 27 Aug 2020 09:59:36 +0000 (11:59 +0200)]
Merge pull request #36330 from Devp00l/wip-46551

cephadm: Update error message on host failure

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agorgw: correct log output when decode bucket CORS attr 36844/head
cao.leilc [Thu, 27 Aug 2020 06:32:38 +0000 (14:32 +0800)]
rgw: correct log output when decode bucket CORS attr

Signed-off-by: caolei <cao.leilc@inspur.com>
4 years agoMerge pull request #36842 from cyx1231st/wip-fix-crimson-heartbeat
Kefu Chai [Thu, 27 Aug 2020 06:25:06 +0000 (14:25 +0800)]
Merge pull request #36842 from cyx1231st/wip-fix-crimson-heartbeat

crimson/osd: fix unexpected connection markdown in heartbeat

Reviewed-by: Xuehan Xu <xxhdx1985126@163.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/net: cleanup, reset event is synchronously called 36842/head
Yingxin Cheng [Thu, 27 Aug 2020 02:51:07 +0000 (10:51 +0800)]
crimson/net: cleanup, reset event is synchronously called

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agoMerge pull request #36807 from badone/wip-tracker-47002-legacy_vals-keyring
Kefu Chai [Thu, 27 Aug 2020 04:40:58 +0000 (12:40 +0800)]
Merge pull request #36807 from badone/wip-tracker-47002-legacy_vals-keyring

common/config: Make sure legacy_values are updated

Reviewed-by: Ali Maredia <amaredia@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36535 from hualongfeng/fixed_unused_bluefs
Kefu Chai [Thu, 27 Aug 2020 03:41:46 +0000 (11:41 +0800)]
Merge pull request #36535 from hualongfeng/fixed_unused_bluefs

os/bluestore: do not update used_blocks with bluefs_extents if bluefs is not available

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: fix unexpected connection markdown in heartbeat
Yingxin Cheng [Thu, 27 Aug 2020 02:29:11 +0000 (10:29 +0800)]
crimson/osd: fix unexpected connection markdown in heartbeat

Pass reference when log Heartbeat::Connection instance, or the
destructor will be called incorrectly, and the conn be marked down
unexpectedly.

Also, the replacing conn is actually connected during replacement-reset
event.

Fixes: https://tracker.ceph.com/issues/47124
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
4 years agocommon/config: Make sure legacy_values are updated 36807/head
Brad Hubbard [Tue, 25 Aug 2020 11:07:06 +0000 (21:07 +1000)]
common/config: Make sure legacy_values are updated

Must be updated after final change to 'values'

Fixes: https://tracker.ceph.com/issues/47002
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoMerge PR #36827 into master
Patrick Donnelly [Thu, 27 Aug 2020 02:45:07 +0000 (19:45 -0700)]
Merge PR #36827 into master

* refs/pull/36827/head:
qa/suites/smoke: remove packages on test completion

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agocephadm: Give better access to the /dev in the iscsi container 36841/head
Matthew Oliver [Thu, 27 Aug 2020 02:44:40 +0000 (12:44 +1000)]
cephadm: Give better access to the /dev in the iscsi container

In testing it seems the main iscsi container's /dev related volume mount to just
/dev/log is too narrow. And in certain circumstances it needs to access
to see /dev/rbd* devices. Like if using krdb.

This patch volume mounts /dev rather then /dev/log in the main
container, but since this aligns with what we need in the tcmu-runner
container it actaully ends up simplifying the code as well.

Signed-off-by: Matthew Oliver <moliver@suse.com>
4 years agoMerge pull request #36801 from yuriw/wip-yuriw-crontab-master
Kefu Chai [Thu, 27 Aug 2020 02:14:33 +0000 (10:14 +0800)]
Merge pull request #36801 from yuriw/wip-yuriw-crontab-master

qa/tests: clients' upgrades for older releases must use "-t py2"

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
4 years agoqa/tests: clients' upgrades for older releases must use "-t py2" 36801/head
Yuri Weinstein [Tue, 25 Aug 2020 20:59:42 +0000 (13:59 -0700)]
qa/tests: clients' upgrades for older releases must use "-t py2"

Fixes: https://tracker.ceph.com/issues/47120
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoMerge PR #36773 into master
Patrick Donnelly [Wed, 26 Aug 2020 17:46:07 +0000 (10:46 -0700)]
Merge PR #36773 into master

* refs/pull/36773/head:
mgr/volumes: Prevent subvolume recreate if trash is not-empty
mgr/volumes: Disallow subvolume group level snapshots
mgr/volumes: Add test case to ensure subvolume is marked
mgr/volumes: handle idempotent subvolume marks
mgr/volumes: Tests amended and added to ensure subvolume trash functionality
mgr/volumes: Mark subvolume root with the vxattr ceph.dir.subvolume
mgr/volumes: Move incarnations for v2 subvolumes, to subvolume trash
mgr/volumes: maintain per subvolume trash directory
mgr/volumes: make subvolume_v2::_is_retained() object property

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agomgr/volumes: Prevent subvolume recreate if trash is not-empty 36773/head
Shyamsundar Ranganathan [Wed, 26 Aug 2020 12:41:11 +0000 (08:41 -0400)]
mgr/volumes: Prevent subvolume recreate if trash is not-empty

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agomgr/volumes: Disallow subvolume group level snapshots
Shyamsundar Ranganathan [Tue, 25 Aug 2020 22:46:12 +0000 (18:46 -0400)]
mgr/volumes: Disallow subvolume group level snapshots

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agomgr/volumes: Add test case to ensure subvolume is marked
Shyamsundar Ranganathan [Tue, 25 Aug 2020 15:44:50 +0000 (11:44 -0400)]
mgr/volumes: Add test case to ensure subvolume is marked

with the vxattr ceph.dir.subvolume set to true.

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agomgr/volumes: handle idempotent subvolume marks
Venky Shankar [Tue, 25 Aug 2020 06:57:50 +0000 (02:57 -0400)]
mgr/volumes: handle idempotent subvolume marks

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agomgr/volumes: Tests amended and added to ensure subvolume trash functionality
Shyamsundar Ranganathan [Mon, 24 Aug 2020 19:10:44 +0000 (15:10 -0400)]
mgr/volumes: Tests amended and added to ensure subvolume trash functionality

Amended a few test cases to ensure created subvolumes and snaps
are removed, and trash stays empty at the end of the test.

Further added one test case for create errors in a retained
v2 subvolume, to ensure metadata is sane, and created incarnation
is not present.

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agomgr/volumes: Mark subvolume root with the vxattr ceph.dir.subvolume
Shyamsundar Ranganathan [Mon, 24 Aug 2020 13:33:10 +0000 (09:33 -0400)]
mgr/volumes: Mark subvolume root with the vxattr ceph.dir.subvolume

This enables snapshot scaling of subvolumes, and hence prevents
renaming, hardlinking etc. outside the subvolume.

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agomgr/volumes: Move incarnations for v2 subvolumes, to subvolume trash
Shyamsundar Ranganathan [Sun, 23 Aug 2020 16:31:01 +0000 (12:31 -0400)]
mgr/volumes: Move incarnations for v2 subvolumes, to subvolume trash

For v2 subvolumes without any snapshots or pending purges
move the subvolume to trash, for the purge operation.

When removing only incarnations, leverage symlink based purge
job creation, to avoid renaming the incarnation out of the
subvolume.

For create errors, where the subvolume was retained, just remove
the created incarnation directory.

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agomgr/volumes: maintain per subvolume trash directory
Venky Shankar [Fri, 21 Aug 2020 14:07:37 +0000 (10:07 -0400)]
mgr/volumes: maintain per subvolume trash directory

PR https://github.com/ceph/ceph/pull/36472 introduces changes
that disallow nested nested snapshots in a subtree (subvolume)
and renames across subvolumes. This effect asynchronous purge
in mgr/volumes as subvolume are moved to a trash directory for
asynchronous deletion by purge threads.

To workaround this, start maintaining a subvolume specific
trash directory. Use the trash directory as an index to the
subvolume specific trash directory entry.

This changes subvolume deletion logic which currently relies
on `--retain-snapshots` flag to decide if the subvolume user
directory should get purged or the subvolume base directory
itself. Deleting a subvolume moves the user facing directory
to its specific trash directory. Purge threads take care of
deleting user facing directories (in trash) and the subvolume
base directory if required (when certain conditions are met).

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agomgr/volumes: make subvolume_v2::_is_retained() object property
Venky Shankar [Fri, 21 Aug 2020 05:18:45 +0000 (01:18 -0400)]
mgr/volumes: make subvolume_v2::_is_retained() object property

... and drop the leading underscore.

Fixes: https://tracker.ceph.com/issues/47154
Signed-off-by: Venky Shankar <vshankar@redhat.com>
4 years agocrimson/osd: use map::at() for better readability 36830/head
Kefu Chai [Wed, 26 Aug 2020 15:39:48 +0000 (23:39 +0800)]
crimson/osd: use map::at() for better readability

avoid using operator[] for find-or-create, to ensure that we fail if the
indexed element is missing.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomessages,osd,crimson: MOSDPGPull::set_pulls(vector<>&&)
Kefu Chai [Wed, 26 Aug 2020 14:53:51 +0000 (22:53 +0800)]
messages,osd,crimson: MOSDPGPull::set_pulls(vector<>&&)

this allows us to pass a lvalue reference to it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: extract load_obc_for_recovery() out
Kefu Chai [Wed, 26 Aug 2020 13:46:06 +0000 (21:46 +0800)]
crimson/osd: extract load_obc_for_recovery() out

extract ReplicatedRecoveryBackend::load_obc_for_recovery()
from ReplicatedRecoveryBackend::recover_object() for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: extract maybe_pull_missing_obj() out
Kefu Chai [Wed, 26 Aug 2020 12:58:32 +0000 (20:58 +0800)]
crimson/osd: extract maybe_pull_missing_obj() out

extract ReplicatedRecoveryBackend::maybe_pull_missing_obj() from
ReplicatedRecoveryBackend::recover_object() for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoqa/suites/smoke: remove packages on test completion 36827/head
Patrick Donnelly [Wed, 26 Aug 2020 14:46:27 +0000 (07:46 -0700)]
qa/suites/smoke: remove packages on test completion

A new teuthology PR [1] skips package cleanup by default. Use the
lightweight smoke suite to ensure that package cleanup continues to
work.

[1] https://github.com/ceph/teuthology/pull/1553

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #36805 into master
Patrick Donnelly [Wed, 26 Aug 2020 15:27:43 +0000 (08:27 -0700)]
Merge PR #36805 into master

* refs/pull/36805/head:
pybind/mgr/volumes: add global lock debug

Reviewed-by: Venky Shankar <vshankar@redhat.com>
4 years agoMerge pull request #36774 from dillaman/wip-46669-2
Mykola Golub [Wed, 26 Aug 2020 15:22:34 +0000 (18:22 +0300)]
Merge pull request #36774 from dillaman/wip-46669-2

librbd: drop deferred AsioEngine destruction

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #36582 from rhcs-dashboard/fix-redirected-URL
Lenz Grimmer [Wed, 26 Aug 2020 14:25:56 +0000 (16:25 +0200)]
Merge pull request #36582 from rhcs-dashboard/fix-redirected-URL

mgr/dashboard: redirect to original URL after successful login

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agopybind/mgr/volumes: add global lock debug 36805/head
Patrick Donnelly [Wed, 5 Aug 2020 22:54:33 +0000 (15:54 -0700)]
pybind/mgr/volumes: add global lock debug

Fixes: https://tracker.ceph.com/issues/47149
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36817 from sebastian-philipp/cephadm-pep8-tests
Sebastian Wagner [Wed, 26 Aug 2020 12:27:57 +0000 (14:27 +0200)]
Merge pull request #36817 from sebastian-philipp/cephadm-pep8-tests

mgr/cephadm: PEP8tify some tests

Reviewed-by: Adam King <adking@redhat.com>
4 years agoMerge pull request #36315 from p-se/fix-monitoring-images-ceph-salt
Sebastian Wagner [Wed, 26 Aug 2020 11:28:00 +0000 (13:28 +0200)]
Merge pull request #36315 from p-se/fix-monitoring-images-ceph-salt

cephadm: deploying of monitoring images partially broken

Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
4 years agoMerge pull request #36571 from pcuzner/cephadm-tox-update
Sebastian Wagner [Wed, 26 Aug 2020 10:56:26 +0000 (12:56 +0200)]
Merge pull request #36571 from pcuzner/cephadm-tox-update

cephadm: remove py2 from tox tests

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Tim Serong <tserong@suse.com>
4 years agopybind/mgr: don't load cython modules 36811/head
Sebastian Wagner [Wed, 26 Aug 2020 09:32:46 +0000 (11:32 +0200)]
pybind/mgr: don't load cython modules

Most of the tests already require the cython modules to
be mocked. This is the final step in making pytest
independent of those modules.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agopybind/mgr: pytest: Unconditionally mock the rados objects
Sebastian Wagner [Wed, 26 Aug 2020 08:39:20 +0000 (10:39 +0200)]
pybind/mgr: pytest: Unconditionally mock the rados objects

Always call `mock_ceph_modules()`. Otherwise we'd need to
split the tox run between modules that need to call
`mock_ceph_modules()` and those that don't

Fixes: https://tracker.ceph.com/issues/47141
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agomgr/orchestrator: PEP8tify 36818/head
Sebastian Wagner [Wed, 26 Aug 2020 09:48:17 +0000 (11:48 +0200)]
mgr/orchestrator: PEP8tify

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agomgr/cephadm: PEP8tify some tests 36817/head
Sebastian Wagner [Wed, 26 Aug 2020 09:45:56 +0000 (11:45 +0200)]
mgr/cephadm: PEP8tify some tests

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agomgr/cephadm: PEP8tify services/osd.py 36816/head
Sebastian Wagner [Wed, 26 Aug 2020 09:41:58 +0000 (11:41 +0200)]
mgr/cephadm: PEP8tify services/osd.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36794 from sebastian-philipp/cephadm-pep8-cephadmservice.py
Sebastian Wagner [Wed, 26 Aug 2020 09:37:51 +0000 (11:37 +0200)]
Merge pull request #36794 from sebastian-philipp/cephadm-pep8-cephadmservice.py

mgr/cephadm: PEP8tify cephadmservice.py

Reviewed-by: Adam King <adking@redhat.com>
4 years agoMerge pull request #36761 from wjwithagen/wjw-fix-dashboard-package.json
Lenz Grimmer [Wed, 26 Aug 2020 08:24:18 +0000 (10:24 +0200)]
Merge pull request #36761 from wjwithagen/wjw-fix-dashboard-package.json

dashboard: Fix building build shell script

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agoMerge pull request #36527 from neha-ojha/wip-whitelist-blacklist
Neha Ojha [Tue, 25 Aug 2020 19:24:36 +0000 (12:24 -0700)]
Merge pull request #36527 from neha-ojha/wip-whitelist-blacklist

Replace 'whitelist' and 'blacklist' language

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
4 years agoMerge pull request #36509 from pcuzner/cephadm-add-host-facts
Sebastian Wagner [Tue, 25 Aug 2020 18:29:18 +0000 (20:29 +0200)]
Merge pull request #36509 from pcuzner/cephadm-add-host-facts

cephadm: add gather_facts command

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
4 years agoMerge pull request #36793 from sebastian-philipp/cephadm-pep8-schedule.py
Sebastian Wagner [Tue, 25 Aug 2020 18:27:27 +0000 (20:27 +0200)]
Merge pull request #36793 from sebastian-philipp/cephadm-pep8-schedule.py

mgr/cephadm: PEP8tify schedule.py

Reviewed-by: Adam King <adking@redhat.com>
4 years agomgr/cephadm: use `check_mon_command` during iscsi config 36799/head
Michael Fritch [Tue, 25 Aug 2020 17:19:03 +0000 (11:19 -0600)]
mgr/cephadm: use `check_mon_command` during iscsi config

ensure the mon commands actually succeed

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: use `check_mon_command` util 36752/head
Michael Fritch [Tue, 25 Aug 2020 15:26:51 +0000 (09:26 -0600)]
mgr/cephadm: use `check_mon_command` util

rather then checking the retval explicitly

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: merge NFSGanesha into NFSService class
Michael Fritch [Fri, 21 Aug 2020 00:52:33 +0000 (18:52 -0600)]
mgr/cephadm: merge NFSGanesha into NFSService class

these two classes really preform the same function

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #36757 from mgfritch/cephadm-raw-str-warn
Sebastian Wagner [Tue, 25 Aug 2020 16:31:33 +0000 (18:31 +0200)]
Merge pull request #36757 from mgfritch/cephadm-raw-str-warn

mgr/cephadm: use raw string during `re.search`

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agocephadm: infer latest image with a valid tag 36797/head
Michael Fritch [Tue, 25 Aug 2020 13:55:08 +0000 (07:55 -0600)]
cephadm: infer latest image with a valid tag

Fixes: https://tracker.ceph.com/issues/47134
Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #36787 from tchaikov/wip-47031
Kefu Chai [Tue, 25 Aug 2020 14:14:42 +0000 (22:14 +0800)]
Merge pull request #36787 from tchaikov/wip-47031

crimson/osd: drop misdirected ops

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agomgr/cephadm: PEP8tify cephadmservice.py 36794/head
Sebastian Wagner [Tue, 25 Aug 2020 13:33:06 +0000 (15:33 +0200)]
mgr/cephadm: PEP8tify cephadmservice.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agomgr/cephadm: PEP8tify schedule.py 36793/head
Sebastian Wagner [Tue, 25 Aug 2020 13:30:51 +0000 (15:30 +0200)]
mgr/cephadm: PEP8tify schedule.py

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36738 from ShraddhaAg/cephadm-archive-logs
Sebastian Wagner [Tue, 25 Aug 2020 13:18:58 +0000 (15:18 +0200)]
Merge pull request #36738 from ShraddhaAg/cephadm-archive-logs

qa/tasks/cephadm.py: add ceph logs directory in job's info.yaml

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/dashboard: redirect to original URL after successful login 36582/head
Avan Thakkar [Wed, 12 Aug 2020 09:22:22 +0000 (14:52 +0530)]
mgr/dashboard: redirect to original URL after successful login

Fixes: https://tracker.ceph.com/issues/45067
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit b5359a155c6ff7e92ab6c6ed16f7ff9fc76c76ea)

4 years agocephadm: Update error message on host failure 36330/head
Stephan Müller [Tue, 28 Jul 2020 18:36:30 +0000 (20:36 +0200)]
cephadm: Update error message on host failure

Now the error message explains how to add the ssh key to the not
reachable host

Fixes: https://tracker.ceph.com/issues/46551
Signed-off-by: Stephan Müller <smueller@suse.com>
4 years agocrimson/osd: drop misdirected ops 36787/head
Kefu Chai [Tue, 25 Aug 2020 09:30:00 +0000 (17:30 +0800)]
crimson/osd: drop misdirected ops

see also `PrimaryLogPG::do_op()`, we should ignore the ops hitting us if
we are not supposed to serve them. this happens when the client is using
a stale osdmap.

Fixes: https://tracker.ceph.com/issues/47031
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36778 from tchaikov/wip-cmake-fio
Kefu Chai [Tue, 25 Aug 2020 09:16:22 +0000 (17:16 +0800)]
Merge pull request #36778 from tchaikov/wip-cmake-fio

cmake: silence "detached HEAD" warning

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
4 years agocmake: silence "detached HEAD" warning 36778/head
Kefu Chai [Tue, 25 Aug 2020 04:34:15 +0000 (12:34 +0800)]
cmake: silence "detached HEAD" warning

git complains when checking out a tag in "detached HEAD", like:

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them
...

but this does not help, as, in general, we don't hack fio in Ceph,
so disable this warning. and also clone the repo in shallow mode
for the same reason -- we don't care about the whole history of
fio repo. we just use it for testing.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36336 from pcuzner/ceph-volume-lsm
pcuzner [Mon, 24 Aug 2020 23:23:28 +0000 (11:23 +1200)]
Merge pull request #36336 from pcuzner/ceph-volume-lsm

ceph-volume: add libstoragemgmt support

4 years agocephadm: remove py2 from test_adoption 36509/head
Paul Cuzner [Mon, 24 Aug 2020 22:51:26 +0000 (10:51 +1200)]
cephadm: remove py2 from test_adoption

Since cephadm is py3 based, and py2 is EOL this patch
removes the py2 test iteration from test_adoption.sh

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
4 years agoMerge PR #36684 into master
Patrick Donnelly [Mon, 24 Aug 2020 20:18:13 +0000 (13:18 -0700)]
Merge PR #36684 into master

* refs/pull/36684/head:
qa/tasks/nfs: Test mounting of export created with nfs command
qa/tasks/nfs: Add helper method to check nfs cluster status
qa/tasks/nfs: Cleanup created filesystem
qa/tasks/nfs: Remove unused port status function and 'stdin' keyword argument

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agolibrbd: support reverting to legacy blacklist op via neorados API 36527/head
Jason Dillaman [Mon, 24 Aug 2020 15:24:31 +0000 (11:24 -0400)]
librbd: support reverting to legacy blacklist op via neorados API

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agomgr/dashboard: remove racially insensitive terms
Ernesto Puerta [Thu, 20 Aug 2020 12:22:57 +0000 (14:22 +0200)]
mgr/dashboard: remove racially insensitive terms

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
4 years agolibrbd: RESTORE_SOURCE_WHITELIST -> ALLOWED_RESTORE_SOURCES
Neha Ojha [Wed, 19 Aug 2020 17:30:38 +0000 (17:30 +0000)]
librbd: RESTORE_SOURCE_WHITELIST -> ALLOWED_RESTORE_SOURCES

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agojournal, librbd: whitelisted_laggy_clients -> ignored_laggy_clients
Neha Ojha [Wed, 19 Aug 2020 17:24:03 +0000 (17:24 +0000)]
journal, librbd: whitelisted_laggy_clients -> ignored_laggy_clients

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years ago*: convert more blacklist to blocklist
Patrick Donnelly [Thu, 13 Aug 2020 20:29:46 +0000 (13:29 -0700)]
*: convert more blacklist to blocklist

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agolibrbd: convert WHITELIST to ALLOWLIST
Patrick Donnelly [Thu, 13 Aug 2020 20:29:23 +0000 (13:29 -0700)]
librbd: convert WHITELIST to ALLOWLIST

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years ago*: convert EBLACKLISTED to EBLOCKLISTED
Patrick Donnelly [Thu, 13 Aug 2020 20:16:43 +0000 (13:16 -0700)]
*: convert EBLACKLISTED to EBLOCKLISTED

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agotest/librados_test_stub/TestMemIoCtxImpl.cc: blacklist -> blocklist
Neha Ojha [Fri, 7 Aug 2020 19:19:55 +0000 (19:19 +0000)]
test/librados_test_stub/TestMemIoCtxImpl.cc: blacklist -> blocklist

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoqa/suites/rados/thrash: log-whitelist -> log-ignorelist
Neha Ojha [Fri, 7 Aug 2020 17:12:28 +0000 (17:12 +0000)]
qa/suites/rados/thrash: log-whitelist -> log-ignorelist

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoqa/suites/krbd/thrash: log-whitelist -> log-ignorelist
Neha Ojha [Fri, 7 Aug 2020 16:37:57 +0000 (16:37 +0000)]
qa/suites/krbd/thrash: log-whitelist -> log-ignorelist

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoqa/suites/multimds: log-whitelist -> log-ignorelist
Neha Ojha [Fri, 7 Aug 2020 16:35:30 +0000 (16:35 +0000)]
qa/suites/multimds: log-whitelist -> log-ignorelist

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agotest/librbd/managed_lock/test_mock_BreakRequest.cc: blacklist -> blocklist
Neha Ojha [Tue, 28 Jul 2020 14:37:51 +0000 (14:37 +0000)]
test/librbd/managed_lock/test_mock_BreakRequest.cc: blacklist -> blocklist

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agotest/librados_test_stub/TestRadosClient.cc: blacklist -> blocklist
Neha Ojha [Mon, 27 Jul 2020 21:50:02 +0000 (21:50 +0000)]
test/librados_test_stub/TestRadosClient.cc: blacklist -> blocklist

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agomon/ConfigMonitor: handle renamed config options
Sage Weil [Fri, 26 Jun 2020 22:05:31 +0000 (17:05 -0500)]
mon/ConfigMonitor: handle renamed config options

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agolibrados: fall back to legacy blacklist command if blocklist gets EINVAL
Sage Weil [Fri, 26 Jun 2020 22:04:51 +0000 (17:04 -0500)]
librados: fall back to legacy blacklist command if blocklist gets EINVAL

I would have expected ENOSYS or EOPNOTSUPP or similar, but the mon returns
EINVAL on an unrecognized command

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agomisc language changes: whitelist -> ignore etc
Sage Weil [Wed, 17 Jun 2020 19:43:47 +0000 (14:43 -0500)]
misc language changes: whitelist -> ignore etc

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agolibrbd: whitelisted_laggy_clients -> allowlisted_laggy_clients
Sage Weil [Wed, 17 Jun 2020 19:44:55 +0000 (14:44 -0500)]
librbd: whitelisted_laggy_clients -> allowlisted_laggy_clients

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoosd/OSDCap: whitelisted -> allowed
Sage Weil [Wed, 17 Jun 2020 19:43:29 +0000 (14:43 -0500)]
osd/OSDCap: whitelisted -> allowed

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoqa: log-whitelist -> log-ignorelist
Sage Weil [Wed, 17 Jun 2020 19:33:57 +0000 (14:33 -0500)]
qa: log-whitelist -> log-ignorelist

Signed-off-by: Sage Weil <sage@newdream.net>
4 years agoblacklist -> blocklist
Sage Weil [Mon, 15 Jun 2020 15:27:03 +0000 (10:27 -0500)]
blacklist -> blocklist

Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge PR #36394 into master
Patrick Donnelly [Mon, 24 Aug 2020 18:33:03 +0000 (11:33 -0700)]
Merge PR #36394 into master

* refs/pull/36394/head:
qa: add method run ceph cluster command with better interface
cephfs: allow only "good" characters

Reviewed-by: Varsha Rao <varao@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36772 from neha-ojha/wip-47119
Yuri Weinstein [Mon, 24 Aug 2020 18:28:21 +0000 (11:28 -0700)]
Merge pull request #36772 from neha-ojha/wip-47119

qa/suites/perf-basic/objectstore: remove filestore

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agolibrbd: drop deferred AsioEngine destruction 36774/head
Jason Dillaman [Mon, 24 Aug 2020 17:31:17 +0000 (13:31 -0400)]
librbd: drop deferred AsioEngine destruction

Commit 90bd1d7a857c0f3c57bda60975f58f9859940185 removed the need to
defer deletion of the AsioEngine but missed removing the original
code.

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