]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sage Weil [Fri, 21 Feb 2020 14:58:55 +0000 (08:58 -0600)]
mgr/ActivePyModules: drop GIL to register/unregister clients
We need to drop the GIL since we are taking ActivePyModules::lock.
Fixes: df507cde8d71063d5873a42f668156e4c32e86f9
Fixes: https://tracker.ceph.com/issues/44241
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Fri, 21 Feb 2020 13:17:09 +0000 (21:17 +0800)]
Merge pull request #33430 from rosinL/wip-testosdscrub
test/TestOSDScrub: fix mktime() error
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 21 Feb 2020 12:31:58 +0000 (06:31 -0600)]
Merge PR #33444 into master
* refs/pull/33444/head:
mgr/cephadm: no gibberish suffix for some services
mgr/cephadm: prometheus: scrape all mgrs
mgr/cephadm: make prometheus scrape all node-exporters
cephadm: reset-failed on reconfig
cephadm: fix reconfig for monitoring daemons
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Sage Weil [Fri, 21 Feb 2020 12:31:46 +0000 (06:31 -0600)]
Merge PR #33447 into master
* refs/pull/33447/head:
mgr/cephadm: fix upgrade wait loop
Reviewed-by: Michael Fritch <mfritch@suse.com>
Kefu Chai [Fri, 21 Feb 2020 11:38:33 +0000 (19:38 +0800)]
Merge pull request #33435 from tchaikov/wip-viva-la-module
deb,rpm,doc: s/plugin/module/
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Kefu Chai [Fri, 21 Feb 2020 11:34:31 +0000 (19:34 +0800)]
Merge pull request #33422 from tchaikov/wip-ceph-mgr-essentials
rpm,deb: package always-enabled plugins in a separated package
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sebastian Wagner [Fri, 21 Feb 2020 10:37:48 +0000 (11:37 +0100)]
Merge pull request #33088 from liewegas/wip-cephadm-doc
doc/bootstrap: add mds and rgw steps to bootstrap
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Kefu Chai [Fri, 21 Feb 2020 08:15:49 +0000 (16:15 +0800)]
Merge pull request #33453 from tchaikov/wip-seastar
seastar: pickup change to add pthread linkage
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Kefu Chai [Fri, 21 Feb 2020 06:23:04 +0000 (14:23 +0800)]
Merge pull request #33452 from tchaikov/wip-docker-centos8
test: remove Dockerfile for centos7 and add Dockerfile for centos8
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Kefu Chai [Fri, 21 Feb 2020 06:10:19 +0000 (14:10 +0800)]
cmake: drop Threads::Threads linkage from libcrimson
since seastar is now linked against pthread by itself.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 21 Feb 2020 06:07:21 +0000 (14:07 +0800)]
seastar: pickup change to add pthread linkage
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 Feb 2020 07:40:54 +0000 (15:40 +0800)]
test/centos-8: change to adapt to centos8
for more context, see
https://github.com/CentOS/sig-cloud-instance-images/issues/22
https://wiki.centos.org/AdditionalResources/Repositories/CR
https://fedoraproject.org/wiki/EPEL
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 Feb 2020 07:26:56 +0000 (15:26 +0800)]
test/centos-8: add centos8 Dockerfile
and drop centos-7 Dockerfile, as we've moved over centos8 for better
python3 support
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 21 Feb 2020 03:40:45 +0000 (21:40 -0600)]
Merge PR #33441 into master
* refs/pull/33441/head:
mgr/orchestrator: add ability to parse placementspec from strings
mgr/volumes: add arg to fs volume create for mds daemons placement
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Fri, 21 Feb 2020 03:40:34 +0000 (21:40 -0600)]
Merge PR #33443 into master
* refs/pull/33443/head:
cephadm: prepare-host: do not create Packager unless we need it
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Fri, 21 Feb 2020 03:40:23 +0000 (21:40 -0600)]
Merge PR #33445 into master
* refs/pull/33445/head:
cephadm: fix adoption safety check
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sage Weil [Fri, 21 Feb 2020 03:40:13 +0000 (21:40 -0600)]
Merge PR #33446 into master
* refs/pull/33446/head:
cephadm: pull: strip newline from version string
Reviewed-by: Michael Fritch <mfritch@suse.com>
Jason Dillaman [Fri, 21 Feb 2020 03:12:34 +0000 (22:12 -0500)]
Merge pull request #32882 from trociny/wip-41559-2
rbd: add 'mirror snapshot schedule' commands
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Fri, 21 Feb 2020 03:10:46 +0000 (21:10 -0600)]
Merge PR #33450 into master
* refs/pull/33450/head:
doc: add CephFS Octopus release notes
Reviewed-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Fri, 21 Feb 2020 03:09:34 +0000 (22:09 -0500)]
Merge pull request #33368 from trociny/wip-44161
rbd-mirror: don't expect image map is always initialized
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 21 Feb 2020 03:08:33 +0000 (22:08 -0500)]
Merge pull request #33411 from trociny/wip-44159
rbd-mirror: improve detection of blacklisted state
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Fri, 21 Feb 2020 02:01:55 +0000 (20:01 -0600)]
Merge PR #33426 into master
* refs/pull/33426/head:
mgr/dashboard: fix tasks.mgr.dashboard.test_rgw suite
Reviewed-by: Sage Weil <sage@redhat.com>
Patrick Donnelly [Fri, 21 Feb 2020 01:47:14 +0000 (17:47 -0800)]
doc: add CephFS Octopus release notes
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Fri, 21 Feb 2020 01:07:32 +0000 (19:07 -0600)]
mgr/cephadm: fix upgrade wait loop
This was succeeding after 4 tries even though it wasn't ok-to-stop.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 20 Feb 2020 22:57:48 +0000 (16:57 -0600)]
cephadm: fix adoption safety check
The 'type' file is only required for *osds*.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 20 Feb 2020 23:17:22 +0000 (17:17 -0600)]
cephadm: pull: strip newline from version string
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 20 Feb 2020 22:50:51 +0000 (16:50 -0600)]
Merge PR #33437 into master
* refs/pull/33437/head:
cephadm: allow multiple get_parm() calls
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Thu, 20 Feb 2020 22:47:05 +0000 (16:47 -0600)]
mgr/cephadm: no gibberish suffix for some services
Lots of services only need to appear once per node; no need to create a
unique name. (In fact, most of these *won't* run more than once per
node because they bind to a standard port.)
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 20 Feb 2020 22:09:50 +0000 (16:09 -0600)]
mgr/cephadm: prometheus: scrape all mgrs
Assume that all standby mgrs are running on the same port as the
active.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 20 Feb 2020 20:13:04 +0000 (14:13 -0600)]
mgr/cephadm: make prometheus scrape all node-exporters
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 20 Feb 2020 22:08:00 +0000 (16:08 -0600)]
cephadm: reset-failed on reconfig
Sometimes we had a bad config that reconfig will fix, so we need to
reset-failed before restart. If there was not failure this is harmless.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 20 Feb 2020 20:18:54 +0000 (14:18 -0600)]
cephadm: fix reconfig for monitoring daemons
We shouldn't check for port usage here.
Signed-off-by: Sage Weil <sage@redhat.com>
Daniel-Pivonka [Thu, 20 Feb 2020 15:22:35 +0000 (10:22 -0500)]
mgr/orchestrator: add ability to parse placementspec from strings
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
Daniel-Pivonka [Thu, 13 Feb 2020 18:56:13 +0000 (13:56 -0500)]
mgr/volumes: add arg to fs volume create for mds daemons placement
add placement arg for mds daemons created by fs volume create
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
Sage Weil [Thu, 20 Feb 2020 19:20:44 +0000 (13:20 -0600)]
cephadm: prepare-host: do not create Packager unless we need it
Otherwise, bootstrap may fail on an unrecognized/unsupported distro even
though all the dependencies are present.
Signed-off-by: Sage Weil <sage@redhat.com>
J. Eric Ivancich [Thu, 20 Feb 2020 19:06:23 +0000 (14:06 -0500)]
Merge pull request #31338 from ivancich/wip-clean-up-ordered-list
rgw: clean up ordered list
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Thu, 20 Feb 2020 17:03:52 +0000 (18:03 +0100)]
Merge pull request #33338 from smithfarm/wip-qa-cephadm-smoke-opensuse
qa/cephadm/smoke: run on opensuse_15.1
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Nathan Cutler [Thu, 20 Feb 2020 16:26:07 +0000 (17:26 +0100)]
qa/cephadm: "ls -l" cephadm after downloading it
For better debugging when the download goes awry.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Mykola Golub [Sun, 26 Jan 2020 14:10:45 +0000 (14:10 +0000)]
rbd: add 'mirror snapshot schedule' commands
Signed-off-by: Mykola Golub <mgolub@suse.com>
Mykola Golub [Sun, 26 Jan 2020 14:05:56 +0000 (14:05 +0000)]
mgr/rbd_support: rename 'dump' command to 'list'
and remove the old 'list' command -- we can live with one command.
Signed-off-by: Mykola Golub <mgolub@suse.com>
Nathan Cutler [Thu, 20 Feb 2020 11:12:56 +0000 (12:12 +0100)]
qa/cephadm.py: better check for cephadm download success
When the URL passed to "curl --silent ..." does not exist, the
resulting file will be populated with the string:
404: Not Found
If that (or something similar) happens, the file size will be
suspiciously low, like < 1000 bytes. Fail the test immediately in this
case.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Thu, 20 Feb 2020 10:59:53 +0000 (11:59 +0100)]
qa/tasks/cephadm.py: lop off .git more robustly
The line
rest.replace('.git/', '/')
was added to accommodate weird folks who run teuthology-suite
with an option like this:
--suite-repo https://github.com/ceph/ceph.git/
but they might just as well give the option like this:
--suite-repo https://github.com/ceph/ceph.git
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Sage Weil [Thu, 20 Feb 2020 16:03:24 +0000 (10:03 -0600)]
cephadm: allow multiple get_parm() calls
This fixes deployment of monitoring components when the config-json is
passed via stdin.
Signed-off-by: Sage Weil <sage@redhat.com>
Matt Benjamin [Thu, 20 Feb 2020 15:58:07 +0000 (10:58 -0500)]
Merge pull request #31994 from pritha-srivastava/wip-rgw-assume-role-web-id-doc
rgw: adding documentation for AssumeRoleWithWebIdentity.
Mykola Golub [Thu, 13 Feb 2020 17:09:12 +0000 (17:09 +0000)]
mgr/rbd_support: return 'rbd mirror snapshot schedule status' as json
Signed-off-by: Mykola Golub <mgolub@suse.com>
Kefu Chai [Thu, 20 Feb 2020 14:15:06 +0000 (22:15 +0800)]
doc/mgr/dashboard.rst: s/plugin/module/
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 20 Feb 2020 14:13:19 +0000 (22:13 +0800)]
rpm,deb: s/plugin/module/
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 Feb 2020 03:51:42 +0000 (11:51 +0800)]
rpm,deb: package always-enabled plugins in a separated package
ceph-mgr depends on it in the sense that these plugins are
a hard dependency of ceph-mgr. like cmake depends on cmake-data,
even if the later cannot function on its own without the former.
the reason why we need a separated package is that mgr modules
are written in python, and should be arch independent. this change
helps the downstream to understand this and help to minimize the
divergence between upstream and downstream, because distros like
debian and its derivatives encourage splitting architecture independent
data into its own package.
see
https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#architecture-independent-data
also, the python related runtime dependencies are also moved into
ceph-mgr-modules-core.
if a python dependency is shared by another ceph-mgr-* package and
ceph-mgr-modules-core. it's only added to ceph-mgr-modules-core for
simplicity and consistency. as the name of dependency might vary
on different distros, so it's tedious and error-prone to repeat
these conditons and checks.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Mykola Golub [Thu, 20 Feb 2020 13:53:56 +0000 (15:53 +0200)]
Merge pull request #33166 from dillaman/wip-43936
rbd-mirror: initial snapshot replay state machine
Reviewed-by: Mykola Golub <mgolub@suse.com>
Kefu Chai [Wed, 19 Feb 2020 16:47:42 +0000 (00:47 +0800)]
ceph.spec.in: update to adapt to el7
make sure ceph-mgr installs on el7
Signed-off-by: Kefu Chai <kchai@redhat.com>
luo rixin [Thu, 20 Feb 2020 12:07:39 +0000 (20:07 +0800)]
test/TestOSDScrub: fix mktime() error
The var tm tm isn't initialized, when the tm.tm_isdst is a
positive value, mktime(&tm) return -1 result in test failed
in ubuntu 19.10 for aarch64 GLIBC2.30.
Signed-off-by: luo rixin <luorixin@huawei.com>
Kefu Chai [Thu, 20 Feb 2020 11:11:46 +0000 (19:11 +0800)]
Merge pull request #33425 from tchaikov/wip-crimson-watcher
crimson/osd: capture watcher when calling its member function
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Kefu Chai [Thu, 20 Feb 2020 11:09:34 +0000 (19:09 +0800)]
Merge pull request #33423 from tchaikov/wip-doc-search
doc: fix errors in "search" page and use relative address for releases.json
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Nathan Cutler [Fri, 14 Feb 2020 17:24:54 +0000 (18:24 +0100)]
qa/cephadm/smoke: run on opensuse_15.1
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 14 Feb 2020 17:22:52 +0000 (18:22 +0100)]
qa/distros: add opensuse_15.2.yaml
We don't have a FOG image for this, yet, and Shaman is not building for
it (yet), either, but we might as well get this file in place now, since
we already know it will be needed at some point.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 14 Feb 2020 17:22:02 +0000 (18:22 +0100)]
qa/distros: drop obsolete opensuse distros
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Sébastien Han [Thu, 20 Feb 2020 10:41:01 +0000 (11:41 +0100)]
Merge pull request #33371 from leseb/raw-list
ceph-volume: silence 'ceph-bluestore-tool' failures
Lenz Grimmer [Thu, 20 Feb 2020 10:15:02 +0000 (10:15 +0000)]
Merge pull request #33407 from rhcs-dashboard/coverage-venv-python-version
mgr/dashboard: coverage venv python version same as mgr
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Alfonso Martínez [Thu, 20 Feb 2020 09:47:38 +0000 (10:47 +0100)]
mgr/dashboard: fix tasks.mgr.dashboard.test_rgw suite
Fixes: https://tracker.ceph.com/issues/44201
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
Kefu Chai [Thu, 20 Feb 2020 08:09:19 +0000 (16:09 +0800)]
crimson/osd: capture watcher when calling its member function
otherwise the extracted node handler will be destroyed, and so does the
watcher enclosed in it.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 20 Feb 2020 06:42:32 +0000 (14:42 +0800)]
doc: do not use absolute address
use relative address instead, to ease the pain when testing.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 20 Feb 2020 06:34:01 +0000 (14:34 +0800)]
doc: do not add suffix for search result links
since sphinx 1.5, SOURCELINK_SUFFIX is always added to the source file,
and search page always tries to add it to the highlighted source result.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 20 Feb 2020 05:05:45 +0000 (13:05 +0800)]
doc: do not try to patch #edit-on-github if not found
we add this element in _templates/page.html, which is only used for the
content pages, not in the "search" page. to avoid the js errors, just
disabled it if it's not found.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 19 Feb 2020 22:58:47 +0000 (16:58 -0600)]
Merge PR #33394 into master
* refs/pull/33394/head:
mgr/cephadm: trigger device refresh after osd creation
mgr/orch,cephadm: implement 'device zap'
mgr/cephadm: remove inventory_cache
mgr/cephadm: reimplement 'device ls' in terms of cache
mgr/cephadm: fix invalidate helpers
mgr/cephadm: scrape and cache devices, too
mgr/cephadm: rename DaemonCache methods etc to generalize
Reviewed-by: Michael Fritch <mfritch@suse.com>
Sage Weil [Wed, 19 Feb 2020 22:46:16 +0000 (16:46 -0600)]
Merge PR #33400 into master
* refs/pull/33400/head:
mgr/progress: 'progress clear' command should clear events in 'ceph -s'
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Wed, 19 Feb 2020 22:45:45 +0000 (16:45 -0600)]
Merge PR #33402 into master
* refs/pull/33402/head:
mgr/pg_autoscaler: fix division by zero
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Wed, 19 Feb 2020 22:45:01 +0000 (16:45 -0600)]
Merge PR #33352 into master
* refs/pull/33352/head:
ceph.in: catch KeyboardInterrupt from outer code
ceph.in: fix second exception on ^C
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 19 Feb 2020 22:35:10 +0000 (16:35 -0600)]
Merge PR #33374 into master
* refs/pull/33374/head:
cephadm: remove distutils dependency
mgr/cephadm: add prepare-host command
cephadm: prepare-host during bootstrap
cephadm: add prepare-host command
cephadm: include docker.io in image name
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Tue, 18 Feb 2020 19:18:47 +0000 (13:18 -0600)]
mgr/cephadm: trigger device refresh after osd creation
Presumably the new OSD(s) consumed one or more devices.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 18 Feb 2020 19:06:51 +0000 (13:06 -0600)]
mgr/orch,cephadm: implement 'device zap'
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 18 Feb 2020 18:40:20 +0000 (12:40 -0600)]
mgr/cephadm: remove inventory_cache
No longer used.
Clean up _get_hosts now that there is only one user.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 18 Feb 2020 18:36:04 +0000 (12:36 -0600)]
mgr/cephadm: reimplement 'device ls' in terms of cache
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 18 Feb 2020 19:07:13 +0000 (13:07 -0600)]
mgr/cephadm: fix invalidate helpers
These should wake up the serve() thread.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 18 Feb 2020 15:46:48 +0000 (09:46 -0600)]
mgr/cephadm: scrape and cache devices, too
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 18 Feb 2020 15:16:31 +0000 (09:16 -0600)]
mgr/cephadm: rename DaemonCache methods etc to generalize
The HostCache is going to store both daemon and device state.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Feb 2020 20:50:40 +0000 (14:50 -0600)]
Merge PR #32677 into master
* refs/pull/32677/head:
build/ops: make/install osd_support package
mgr/osd_support: move docs to docs/mgr/osd_support.rst
mgr/osd_support: new module for osd utility calls
Reviewed-by: Neha Ojha <nojha@redhat.com>
Sage Weil [Wed, 19 Feb 2020 20:50:20 +0000 (14:50 -0600)]
Merge PR #33123 into master
* refs/pull/33123/head:
qa/tasks/cephadm: deploy node-exporter
mgr/orch: deploy node-exporter
Reviewed-by: Sebastian Wagner <swagner@suse.com>
J. Eric Ivancich [Sat, 2 Nov 2019 21:54:54 +0000 (17:54 -0400)]
rgw: clean up interenal shard logic in ordered bucket list
The logic of RGWRados::cls_bucket_list_ordered is complex as it needs
to query multiple bucket index shards and manage their returned lists,
and walk through them in a manner to produce an appropriately ordered
set of dir entries to the caller. The previous implementation used
three of parallel std::vectors (e.g., the related data was spread
across the vectors), which needed to each be maintained
appropriately. This clean-up changes this to a single vector of
structs, and the struct both consolidates the related data and
encapsulates much of the related logic.
Additionally, const correctness is expanded.
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
Sage Weil [Wed, 19 Feb 2020 18:58:51 +0000 (12:58 -0600)]
Merge PR #33359 into master
* refs/pull/33359/head:
mgr/dashboard/tests/test_orchestrator: disable service test
mgr/cephadm: fix race between check_hosts and host rm
mgr/volumes: fix remove_mds call
mgr/rook: hackly describe_service -> list_daemons
mgr/tests/test_orchestrator: fix ServiceDescription test
mgr/test_orchestrator: describe_service -> list_daemons
mgr/orch: resurrect ServiceDescription, 'orch ls'
qa/tasks/mgr/dashboard/test_orchestrator: disable services test
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Tue, 18 Feb 2020 22:31:36 +0000 (16:31 -0600)]
mgr/dashboard/tests/test_orchestrator: disable service test
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 18 Feb 2020 22:28:22 +0000 (16:28 -0600)]
mgr/cephadm: fix race between check_hosts and host rm
Fixes: https://tracker.ceph.com/issues/44188
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Wed, 19 Feb 2020 17:03:10 +0000 (12:03 -0500)]
rbd-mirror: do not attempt to replay incomplete primary snapshots
In case we race with the creation of a primary mirror snapshot,
do not attempt to replay incomplete snapshots. Once the image
state has been successfully written, the snapshot will be flagged
as complete and an update notification will be sent.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Sat, 15 Feb 2020 15:10:52 +0000 (09:10 -0600)]
ceph.in: catch KeyboardInterrupt from outer code
This avoids getting random tracebacks when you control-C early in the
process.
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Wed, 19 Feb 2020 17:02:09 +0000 (12:02 -0500)]
librbd: delay marking primary mirror snapshot as completed
Until the image state object(s) are written, the snapshot should
be considered incomplete and not ready for replay.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Tue, 18 Feb 2020 22:31:36 +0000 (16:31 -0600)]
mgr/volumes: fix remove_mds call
Fixes: https://tracker.ceph.com/issues/44176
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 17 Feb 2020 01:32:07 +0000 (19:32 -0600)]
mgr/rook: hackly describe_service -> list_daemons
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 17 Feb 2020 01:31:22 +0000 (19:31 -0600)]
mgr/tests/test_orchestrator: fix ServiceDescription test
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 17 Feb 2020 01:27:46 +0000 (19:27 -0600)]
mgr/test_orchestrator: describe_service -> list_daemons
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 16 Feb 2020 16:17:27 +0000 (10:17 -0600)]
mgr/orch: resurrect ServiceDescription, 'orch ls'
This is a meta-service description that maps to multiple daemons. Remove
the old useless properties, and add in size and running counts.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 16 Feb 2020 15:39:27 +0000 (09:39 -0600)]
qa/tasks/mgr/dashboard/test_orchestrator: disable services test
We need to either fill out the list_daemons APIs in the dashboard and test
that, or redesign and reimplement the services abstractions in the
orchestration layer. Until then, disable this test.
Signed-off-by: Sage Weil <sage@redhat.com>
Sebastian Wagner [Wed, 19 Feb 2020 15:49:17 +0000 (16:49 +0100)]
Merge pull request #33333 from sebastian-philipp/cephadm-mon-apply-host-no-network
mgr/cephadm: mon: Don't show traceback for user errors
Reviewed-by: Sage Weil <sage@redhat.com>
Sebastian Wagner [Wed, 19 Feb 2020 15:48:47 +0000 (16:48 +0100)]
Merge pull request #33310 from sebastian-philipp/cephadm-add-host-exception
mgr/cephadm: Convert HostNotFound to OrchestratorError
Reviewed-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Fri, 14 Feb 2020 15:48:39 +0000 (10:48 -0500)]
rbd-mirror: snapshot replayer should only unlink peers for unneeded snaps
Once the snapshot will no longer be needed by the peer for delta sync,
it should be unlinked. This will ensure the primary image will not
remove snapshots that will be needed for the next sync point.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 6 Feb 2020 18:25:33 +0000 (13:25 -0500)]
rbd-mirror: initial snapshot-based mirroring replayer logic
This initial implementation will scan the remote image for new mirror
snapshots. If a new primary snapshot it detected, it will start syncing
it. If the remote was demoted, it will notify the image replayer to
shut down. If an in-progress sync was previously interrupted, it will
attempt to restart it.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 6 Feb 2020 20:12:46 +0000 (15:12 -0500)]
rbd-mirror: pass pool meta cache to replayer state machine
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Thu, 6 Feb 2020 15:52:29 +0000 (10:52 -0500)]
rbd-mirror: keep remote image open after bootstrap for snapshot mirroring
The snapshot-based mirroring requires an open remote image to watch for
snapshot creation and to handle the deep-copy from remote to local image.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Tue, 11 Feb 2020 21:08:30 +0000 (16:08 -0500)]
test/pybind/rbd: demoted images cannot be deleted
Now that we don't delete the last mirror snapshot, the test is failing
because you cannot delete a demoted image.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Sun, 9 Feb 2020 17:52:06 +0000 (12:52 -0500)]
librbd: permit last mirror peer to be removed from mirror snapshot
This applies only in the case where there are no additional mirror
snapshots in order to preserve the current state.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 7 Feb 2020 20:06:22 +0000 (15:06 -0500)]
librbd: tweak create non-primary mirror snapshot request
The replayer will need to pass in the demotion state as well as the
snapshot sequences for the copied snapshots.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 7 Feb 2020 19:54:52 +0000 (14:54 -0500)]
librbd: no longer re-create full mirror snapshot namespace to get id
Only the namespace type is required to locate the snap id by name.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>