Yuri Weinstein [Wed, 12 May 2021 19:26:16 +0000 (12:26 -0700)]
Merge pull request #41313 from ceph/wip-yuriw-p2p-pacific
pacific: qa/tests: corrected point versions to reflect latest releases
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 12 May 2021 16:25:07 +0000 (09:25 -0700)]
qa/tests: corrected point versions to reflect latest releases
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Wed, 12 May 2021 15:52:38 +0000 (08:52 -0700)]
Merge pull request #41208 from ceph/wip-yuriw-p2p-pacific2
pacific: qa/tests: initial checkin for pacific-p2p suite (2)
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Wed, 12 May 2021 15:28:47 +0000 (08:28 -0700)]
Merge pull request #41079 from tchaikov/pacific-rocksdb
pacific: rocksdb: pickup fix to detect PMULL instruction
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 12 May 2021 15:00:17 +0000 (08:00 -0700)]
Merge pull request #41232 from neha-ojha/wip-50381-pacific
pacific: systemd: remove `ProtectClock=true` for `ceph-osd@.service`
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Wed, 12 May 2021 12:09:08 +0000 (07:09 -0500)]
Merge PR #41182 into pacific
* refs/pull/41182/head:
ceph_test_rados_api_service: stop threads before asserting
ceph_test_rados_api_service: more retries for servicemkap
Reviewed-by: Neha Ojha <nojha@redhat.com>
Sage Weil [Wed, 12 May 2021 12:07:53 +0000 (07:07 -0500)]
Merge PR #40729 into pacific
* refs/pull/40729/head:
qa/distros/podman: preserve registries.conf
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 12 May 2021 12:07:42 +0000 (07:07 -0500)]
Merge PR #41219 into pacific
* refs/pull/41219/head:
mgr/cephadm: misc. autopep8 changes
mgr/cephadm: add timeout when removing iscsi gateway.conf
mgr/cephadm: mock subprocess calls in tests that remove iscsi daemons
qa/tasks/cephadm_cases: longer wait for osd to start
mgr/cephadm: apply hostname/addr checks to 'orch host set-addr' too
mgr/cephadm: make 'host add' idempotent
mgr/cephadm: set host crush location based on HostSpec
python-common: add location property to HostSpec, + tests
doc/cephadm: rewriting "starting the upgrade"
doc/cephadm: rewrite "monitoring the upgrade"
doc/cephadm: rewrite "cancelling the upgrade"
doc/cephadm: rewrite "potential problems"
doc/cephadm: rewrite "using customized con..."
Add Rocky Linux to supported DISTRO_NAMES
mgr/cephadm: remove haproxy+keepalived container image from service spec
mgr/cephadm: extend disk selector test which disk size may be decimal
mgr/cephadm: When device size contains the decimal, it can not match size exactly.
mgr/dashboard: fix HAProxy (now called ingress)
mgr/cephadm: Purge iscsi configuration from pool and ceph config
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Ernesto Puerta [Wed, 12 May 2021 10:35:29 +0000 (12:35 +0200)]
Merge pull request #40813 from rhcs-dashboard/wip-50034-pacific
pacific: build(deps): bump node-notifier from 8.0.0 to 8.0.1 in /src/pybind/mgr/dashboard/frontend
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Wed, 12 May 2021 08:10:55 +0000 (10:10 +0200)]
Merge pull request #40982 from rhcs-dashboard/wip-50427-pacific
pacific: mgr/Dashboard: Remove erroneous elements in hosts-overview Grafana dashboard
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Kefu Chai [Wed, 12 May 2021 06:57:22 +0000 (14:57 +0800)]
Merge pull request #41259 from petrutlucian94/wip-50726-pacific
pacific: Update boost url, fixing windows build
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Tue, 11 May 2021 20:02:05 +0000 (13:02 -0700)]
Merge pull request #40484 from gregsfortytwo/wip-stretch-mon-location-pacific-base
pacific: Improve mon location handling for stretch clusters
Reviewed-by: Neha Ojha <nojha@redhat.com>
Ernesto Puerta [Tue, 11 May 2021 16:00:30 +0000 (18:00 +0200)]
Merge pull request #41203 from rhcs-dashboard/wip-50680-pacific
pacific: mgr/dashboard: avoid data processing in crush-map component
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Tue, 11 May 2021 15:10:59 +0000 (17:10 +0200)]
Merge pull request #41197 from rhcs-dashboard/wip-50674-pacific
pacific: mgr/dashboard: fix bucket versioning when locking is enabled
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Tue, 11 May 2021 07:47:24 +0000 (09:47 +0200)]
Merge pull request #41251 from rhcs-dashboard/wip-50723-pacific
pacific: mgr/dashboard: fix base-href: revert it to previous approach
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Casey Bodley [Mon, 10 May 2021 20:40:22 +0000 (16:40 -0400)]
Merge pull request #40054 from alimaredia/wip-rgw-dpp-pacific
Pacific: Add DoutPrefixProvider for RGW Log Messages in Pacfic
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Lucian Petrut [Fri, 7 May 2021 09:23:30 +0000 (09:23 +0000)]
win*.sh,cmake: Fix Windows linking errors
The Windows build is hitting linking errors after
bumping the Boost version to 1.75. The issue is that Boost
is now setting the zlib dependecy using INTERFACE_LINK_LIBRARIES,
which means that it's no longer located using the standard
"find_package" mechanism.
In order for the linker to locate zlib, we'll add it to the
linker search path.
[1] https://github.com/boostorg/boost_install/issues/47
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit
0af38d179e48a48354a863e2b7f6478ecd5db318)
Lucian Petrut [Fri, 7 May 2021 07:18:39 +0000 (07:18 +0000)]
win32*.sh: ensure that the build dir exists
The Windows build scripts try to use the build dir before
actually creating it.
We'll have to move up the "mkdir" command a few lines.
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit
c6404e15cb2cde046224433403349e7437f3044e)
Lucian Petrut [Thu, 6 May 2021 12:39:00 +0000 (12:39 +0000)]
win32*.sh: bump boost version to 1.75
We're updating the Windows build scripts to use Boost 1.75, the same
as the Linux build.
We can now drop the custom Boost patches that were needed in order
to use mingw. Those have been merged upstream in the meantime.
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit
b683c55283f79fef2de349d08736fe1781e8f6b0)
Lucian Petrut [Thu, 6 May 2021 07:18:56 +0000 (07:18 +0000)]
win32*.sh: improve logging
We'll use a log file when building the Ceph dependencies. Also, we'll
log some details about the operation that's about to be performed.
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit
9cad7db13a1176ac3b3fee89983d6d21420f5429)
Lucian Petrut [Thu, 6 May 2021 07:10:36 +0000 (07:10 +0000)]
win32*.sh: fix boost url
The boost download location has changed, breaking the Windows build.
Ths commit updates the boost download url.
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit
f1a8044f1da0f7171ee189b1c0c5f1e519694777)
Avan Thakkar [Fri, 7 May 2021 09:38:11 +0000 (15:08 +0530)]
mgr/dashboard: fix base-href: revert it to previous approach
Fixes: https://tracker.ceph.com/issues/50684
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
b6f92922f5c80223fd288d98ce85405a650c0135)
Wong Hoi Sing Edison [Wed, 14 Apr 2021 07:36:17 +0000 (15:36 +0800)]
systemd: remove `ProtectClock=true` for `ceph-osd@.service`
Ceph 16.2.0 Pacific by https://github.com/ceph/ceph/commit/
9a84d5a introduce following new systemd restriction:
ProtectClock=true
ProtectHostname=true
ProtectKernelLogs=true
RestrictSUIDSGID=true
BTW, `ceph-osd@.service` failed with `ProtectClock=true` unexpectly, also see:
- <https://lists.ceph.io/hyperkitty/list/ceph-users@ceph.io/thread/TNBGGNN6STGDKARAQTQCIPTU4KLIVJQV/>
- <https://serverfault.com/questions/
1059317/bluestore-var-lib-ceph-osd-ceph-2-block-read-bdev-label-failed-to-open-var-l>
This PR intruduce:
- Remove `ProtectClock=true` for our systemd service templates
Fixes: https://tracker.ceph.com/issues/50347
Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
(cherry picked from commit
85bc551b179d940a50cbdfd0c20848e3187c70a6)
Neha Ojha [Fri, 7 May 2021 20:16:20 +0000 (13:16 -0700)]
Merge pull request #41212 from neha-ojha/wip-41211-pacific
pacific: qa/suites/rados/standalone: remove mon_election symlink
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Adam King [Wed, 5 May 2021 17:47:39 +0000 (13:47 -0400)]
mgr/cephadm: misc. autopep8 changes
Some of the file in mgr/cephadm are getting changed
every time I want to run the mgr tox tests to check
changes and it's inconvenient to have to check the
files out every time
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
7a3ec28cc47ffba044f3820deee77f70b496fce7)
Adam King [Wed, 5 May 2021 17:40:32 +0000 (13:40 -0400)]
mgr/cephadm: add timeout when removing iscsi gateway.conf
We already catch TimeoutExpired exceptions here but we don't
actually specify a timeout
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
ade46fda791ee2c2e1cac1c2376d56acf7ae4766)
Adam King [Wed, 5 May 2021 17:59:54 +0000 (13:59 -0400)]
mgr/cephadm: mock subprocess calls in tests that remove iscsi daemons
tests that remove iscsi daemons use subprocess.run to make
a call to rados to clear out the gateway.conf. We don't want
the tests to actually make that call.
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
c5b984b10c2d6f2eef02e9dbf74aea64bf11f19a)
Ali Maredia [Fri, 11 Dec 2020 21:19:39 +0000 (16:19 -0500)]
rgw: add DPP's to logging for most ops
This commit contains the following major
changes:
- Most log output lines for major ops now have
DoutPrefixProviders.
- Create new macro ldpp_subdout. This macro is meant
as a replacement for lsubdout for headerfiles that
do not define the rgw subsys.
- Changes to RGWObjManifest begin and end iterators.
- Make it so that rgw_dencoder.cc should only contain the
logic related to encoding.
Also add dpp to ldouts and lderr's already using
req_state and replace sync_env/env->dpp's with dpp's
Signed-off-by: Ali Maredia <amaredia@redhat.com>
Signed-off-by: Kalpesh Pandya <kapandya@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
6cfc2ce2ce669e139acb682898c53c5602075e31)
Ernesto Puerta [Fri, 7 May 2021 15:18:16 +0000 (17:18 +0200)]
Merge pull request #41204 from rhcs-dashboard/wip-50652-pacific
pacific: mgr/dashboard: Generate NPM dependencies manifest
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Sage Weil [Wed, 5 May 2021 16:03:02 +0000 (11:03 -0500)]
qa/tasks/cephadm_cases: longer wait for osd to start
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
a103fd6955bb89f857f56a4ec73d77c3a8818d78)
Sage Weil [Mon, 3 May 2021 16:09:09 +0000 (12:09 -0400)]
mgr/cephadm: apply hostname/addr checks to 'orch host set-addr' too
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
b5d39be1881775f141dfb3f10ebe4ae3601b75e6)
Sage Weil [Mon, 3 May 2021 16:04:28 +0000 (12:04 -0400)]
mgr/cephadm: make 'host add' idempotent
Do not let prime_empty_host blow away inventory.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
a8acc354dc7dc1245f5030a751f4fc5ddb689b18)
Sage Weil [Fri, 30 Apr 2021 15:10:38 +0000 (11:10 -0400)]
mgr/cephadm: set host crush location based on HostSpec
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
2f2c997652539795845184f938a70e67d245705c)
Sage Weil [Fri, 30 Apr 2021 15:10:26 +0000 (11:10 -0400)]
python-common: add location property to HostSpec, + tests
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
d2a9a35993e11b726e94d5dec9a5fe098f6e6eba)
Zac Dover [Thu, 6 May 2021 00:03:21 +0000 (10:03 +1000)]
doc/cephadm: rewriting "starting the upgrade"
This PR fixes the prompts in this section and
makes the sentences a tiny bit less onerous for
the reader.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
9dc63ab22aa14f0790f11f672a3f865abfa738cc)
Zac Dover [Thu, 6 May 2021 00:30:02 +0000 (10:30 +1000)]
doc/cephadm: rewrite "monitoring the upgrade"
This PR adds correctly-formatted prompts and
makes slight alterations to the readability
of the text.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
f4c16f05b51fa4b2ff0095f331f7d2a4e1e3ca68)
Zac Dover [Thu, 6 May 2021 00:34:26 +0000 (10:34 +1000)]
doc/cephadm: rewrite "cancelling the upgrade"
This PR corrects a single prompt in the section
"Cancelling the Upgrade".
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
8d531a754890f054c3533c0a985599b10acf8dc7)
Zac Dover [Thu, 6 May 2021 00:44:23 +0000 (10:44 +1000)]
doc/cephadm: rewrite "potential problems"
This PR adds correct prompts and slightly
reduces the cognitive load of the reader.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
39c05445f211d3033571afa907443d5e7eb88f91)
Zac Dover [Thu, 6 May 2021 00:54:24 +0000 (10:54 +1000)]
doc/cephadm: rewrite "using customized con..."
This PR rewrites the text in "Using Customized
Container Images" so that it is just a bit
clearer, and it also formats the prompt in the
text correctly.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
630f0c8ad305c074c399c35b9547a9a6a501af3b)
Dennis Körner [Tue, 4 May 2021 15:59:59 +0000 (17:59 +0200)]
Add Rocky Linux to supported DISTRO_NAMES
Rocky Linux is a RHEL clone. I did a test-installation of ceph pacific on Rocky Linux RC1 with cephadm. As far as I can see, everything works as expected.
Signed-off-by: Dennis Körner <koerner@netzwerge.de>
(cherry picked from commit
188e6b3fc56960ea731c71e57af64eb8c1fc76ea)
Sage Weil [Tue, 4 May 2021 16:12:53 +0000 (12:12 -0400)]
mgr/cephadm: remove haproxy+keepalived container image from service spec
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
729ebaabd539f1a09c7cfcdc69dff1e2cb409b0d)
jianglong01 [Mon, 15 Mar 2021 10:09:19 +0000 (18:09 +0800)]
mgr/cephadm: extend disk selector test which disk size may be decimal
Signed-off-by: jianglong01 <jianglong01@qianxin.com>
(cherry picked from commit
9acd4be8bd56c9d0e848a336be4552b705654a62)
jianglong01 [Fri, 12 Mar 2021 03:03:10 +0000 (11:03 +0800)]
mgr/cephadm: When device size contains the decimal, it can not match size exactly.
for example, osd.yaml:
service_type: osd
service_name: test
placement:
host_pattern: '*'
spec:
data_devices:
size: 3.6TB
Signed-off-by: jianglong01 <jianglong01@qianxin.com>
(cherry picked from commit
fd30aff672a1908a37163472f9c6478eca4e98e2)
Avan Thakkar [Tue, 20 Apr 2021 12:19:23 +0000 (17:49 +0530)]
mgr/dashboard: fix HAProxy (now called ingress)
Fixes: https://tracker.ceph.com/issues/50319
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Support from Dashboard UI to create Ingress service type.
(cherry picked from commit
21318e8fa965c352e00d84c04ee072dd9fe45e4f)
Juan Miguel Olmo Martínez [Mon, 22 Mar 2021 15:14:03 +0000 (16:14 +0100)]
mgr/cephadm: Purge iscsi configuration from pool and ceph config
Remove gateway.conf from iscsi pool when service is removed
Remove iscsi ceph config keys
Remove iscsi dashboard gateways config from dashboard
fixes: https://tracker.ceph.com/issues/48930
Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit
1b9e3edcfd1c1a3dd02d6eb14072494f57b086a8)
Sage Weil [Fri, 7 May 2021 12:06:31 +0000 (07:06 -0500)]
Merge remote-tracking branch 'origin/pacific-saved' into pacific
Sage Weil [Fri, 7 May 2021 12:05:36 +0000 (07:05 -0500)]
Merge PR #40557 into pacific
* refs/pull/40557/head:
win32*.sh: disable libcephsqlite when targeting Windows
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Avan Thakkar [Tue, 27 Apr 2021 19:21:28 +0000 (00:51 +0530)]
mgr/dashboard: fix bucket versioning when locking is enabled
Fixes: https://tracker.ceph.com/issues/50545
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
e90ce333c69725f870acc6665c5e9bb4aa33de3f)
Neha Ojha [Fri, 7 May 2021 00:35:35 +0000 (00:35 +0000)]
qa/suites/rados/standalone: remove mon_election symlink
The standalone tests need parameters to be passed as ceph_args to
override defaults.
This was just doubling the number of standalone tests being run in each rados
run with no effect!
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
c8e48c5c2517c5a28705a99339e99fa8fd8d3e96)
Yuri Weinstein [Thu, 6 May 2021 21:20:36 +0000 (14:20 -0700)]
qa/tests: try focal instead of bionic
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Thu, 6 May 2021 19:43:10 +0000 (12:43 -0700)]
qa/tests: initial checkin for pacific-p2p suite (2)
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Nizamudeen A [Sun, 25 Apr 2021 11:01:00 +0000 (16:31 +0530)]
mgr/dashboard: Generate NPM dependencies manifest
A txt file with all the dependencies and its version & url link.
Fixes: https://tracker.ceph.com/issues/50515
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
825ea98915bcb0ab4bbaefb478ee0a0b8e506933)
Avan Thakkar [Mon, 22 Mar 2021 14:40:20 +0000 (20:10 +0530)]
mgr/dashboard: avoid data processing in crush-map component
Fixes: https://tracker.ceph.com/issues/49236
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
5454426a0a72ab9a44388c81ede8c2f20e35de6e)
Jenkins Build Slave User [Thu, 6 May 2021 15:47:00 +0000 (15:47 +0000)]
16.2.3
Sage Weil [Wed, 5 May 2021 18:42:36 +0000 (14:42 -0400)]
cephadm: normalize image digest in 'ls' output too
We were previously only normalizing the 'inspect' output.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
06d849acfb77a189abf6e9c26b27aaaefdd77f14)
Sage Weil [Thu, 6 May 2021 15:00:11 +0000 (10:00 -0500)]
Merge PR #41151 into pacific
* refs/pull/41151/head:
mgr/cephadm: ceph-volume verbose only when fails
qa/workunits/cephadm/test_cephadm: test zap-osds
cephadm: add --zap-osds argument to rm_cluster
cephadm: implement zap-osds --fsid ... command
doc/cephadm: add podman version note to install
mgr/cephadm: check hostname resolution before adding host
cephadm: provide a way to checkhost connection without /etc/hosts passed the shell
doc/cephadm: remove /etc/hosts from list of hostname resoltion methods
qa/suites/rados/cephadm/smoke-roleless: test client-keyring
qa/tasks/cephadm.py: adjust client.admin key mode; place on all hosts
cephadm: distribute client.admin keyring+conf to label:_admin on bootstrap
doc/cephadm: document the default 'admin' label
mgr/cephadm: 'ceph orch client-keyring ...' commands to manage keyring files
mgr/cephadm: reimplement ceph.conf pushing
mgr/cephadm: use _write_remote_file for ceph.conf
mgr/cephadm: _write_remote_file helper
mgr/cephadm: add placementspec for which hosts get ceph.conf
mgr/cephadm: skip ok-to-stop for mons in upgrade if < 3 mons
mgr/cephadm: don't allow upgrade start with less than 2 mgrs
cephadm: re-assimilate user provided conf after mgr created
cephadm: allow several public networks be matched
mgr/cephadm: The command of 'ceph orch daemon restart mgr.xxx' may case mgr daemon loop to restart
doc/cephadm: add a single word
doc/cephadm: adding "device" to a sentence
doc/cephadm: rewrite "nfs.rst"
mgr/cephadm: s/_hosts_with_daemon_inventory/_schedulable_hosts/
mgr/cephadm: don't remove daemons from hosts in maintenance or offline mode
mgr/cephadm: default status for daemons on maintenance hosts to stopped
qa/tasks/cephadm: fix ctx archive check for teuthology
python-common: use OrderedDict instead of Set to remove duplicates from host labels list
mgr/cephadm: less noise about osd specs
mgr/cephadm: kick serve loop when adding/removing labels
mgr/cephadm: do not place osds on _no_schedule hosts
doc/cephadm: document _no_schedule label
mgr/cephadm: fix 'orch ls' count to reflect schedulable hosts
mgr/cephadm: do not schedule on _no_schedule hosts
doc/cephadm: osd.rst -- removing colons
doc/cephadm: osd: rewrite "additional opts"
doc/cephadm: rewrite "advanced osd s. specs"
doc/cephadm: rewrite "delcarative state" in osd.rst
mgr/MgrStandby: fix config observer
mgr/MgrStandby: respawn if mgr_standby_modules changes
qa/tasks/mgr/test_dashboard: skip test_standby if mgr_standby_modules=false
qa/suites/rados/cephadm/smoke-*: use cephadm.wait_for_service
qa/suites/rados/cephadm/smoke-singlehost: test --single-host-defaults
cephadm: add --single-host-defaults option to bootstrap
mgr/cephadm: allow mgr colo if mgr_standby_modules=false
mgr/MgrStandby: add mgr_standby_modules option
cephadm: ignore apparmor if profiles file is empty
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Ernesto Puerta [Thu, 6 May 2021 10:02:12 +0000 (12:02 +0200)]
Merge pull request #41069 from rhcs-dashboard/wip-50498-pacific
pacific: mgr/dashboard: set required env. variables in run-backend-api-tests.sh
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Thu, 6 May 2021 09:58:49 +0000 (11:58 +0200)]
Merge pull request #41096 from aaSharma14/wip-50583-pacific
pacific: mgr/dashboard: OSDs placement text is unreadable
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Thu, 6 May 2021 09:49:43 +0000 (11:49 +0200)]
Merge pull request #41056 from rhcs-dashboard/wip-50542-pacific
pacific: mgr/dashboard: Host Maintenance Follow ups
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Ernesto Puerta [Thu, 6 May 2021 09:47:18 +0000 (11:47 +0200)]
Merge pull request #41170 from rhcs-dashboard/wip-50649-pacific
pacific: mgr/dashboard: fix set-ssl-certificate{,-key} commands
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Yuri Weinstein [Wed, 5 May 2021 19:26:22 +0000 (12:26 -0700)]
Merge pull request #41090 from neha-ojha/wip-49918-pacific
pacific: mon/OSDMonitor: drop stale failure_info after a grace period
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Wed, 5 May 2021 19:25:47 +0000 (12:25 -0700)]
Merge pull request #41089 from batrick/i50385
pacific: pybind/mgr/devicehealth: scrape-health-metrics command accidentally renamed to scrape-daemon-health-metrics
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 5 May 2021 19:25:16 +0000 (12:25 -0700)]
Merge pull request #40918 from neha-ojha/wip-50402-pacific
pacific: common/options/global.yaml.in: increase default value of bluestore_cache_trim_max_skip_pinned
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Tue, 4 May 2021 16:06:17 +0000 (11:06 -0500)]
ceph_test_rados_api_service: stop threads before asserting
Otherwise, if we assert, we'll hang here:
Thread 1 (Thread 0x7f74eba79580 (LWP
1688617)):
#0 0x00007f74eb2aa529 in futex_wait (private=<optimized out>, expected=132, futex_word=0x7ffd642b4b54) at ../sysdeps/unix/sysv/linux/futex-internal.h:61
#1 futex_wait_simple (private=<optimized out>, expected=132, futex_word=0x7ffd642b4b54) at ../sysdeps/nptl/futex-internal.h:135
#2 __pthread_cond_destroy (cond=0x7ffd642b4b30) at pthread_cond_destroy.c:54
#3 0x0000563ff2e5a891 in LibRadosService_StatusFormat_Test::TestBody (this=<optimized out>) at /usr/include/c++/7/bits/unique_ptr.h:78
#4 0x0000563ff2e9dc3a in testing::internal::HandleSehExceptionsInMethodIfSupported<testing::Test, void> (location=0x563ff2ea72e4 "the test body", method=<optimized out>, object=0x563ff422a6d0)
at ./src/googletest/googletest/src/gtest.cc:2605
#5 testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void> (object=object@entry=0x563ff422a6d0, method=<optimized out>, location=location@entry=0x563ff2ea72e4 "the test body")
at ./src/googletest/googletest/src/gtest.cc:2641
#6 0x0000563ff2e908c3 in testing::Test::Run (this=0x563ff422a6d0) at ./src/googletest/googletest/src/gtest.cc:2680
#7 0x0000563ff2e90a25 in testing::TestInfo::Run (this=0x563ff41a3b70) at ./src/googletest/googletest/src/gtest.cc:2858
#8 0x0000563ff2e90ec1 in testing::TestSuite::Run (this=0x563ff41b6230) at ./src/googletest/googletest/src/gtest.cc:3012
#9 0x0000563ff2e92bdc in testing::internal::UnitTestImpl::RunAllTests (this=<optimized out>) at ./src/googletest/googletest/src/gtest.cc:5723
#10 0x0000563ff2e9e14a in testing::internal::HandleSehExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool> (location=0x563ff2ea8728 "auxiliary test code (environments or event listeners)",
method=<optimized out>, object=0x563ff41a2d10) at ./src/googletest/googletest/src/gtest.cc:2605
#11 testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl, bool> (object=0x563ff41a2d10, method=<optimized out>,
location=location@entry=0x563ff2ea8728 "auxiliary test code (environments or event listeners)") at ./src/googletest/googletest/src/gtest.cc:2641
#12 0x0000563ff2e90ae8 in testing::UnitTest::Run (this=0x563ff30c0660 <testing::UnitTest::GetInstance()::instance>) at ./src/googletest/googletest/src/gtest.cc:5306
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
ee5a0c96a0f189d809924659e98e33a98ea31297)
Sage Weil [Tue, 4 May 2021 16:01:38 +0000 (11:01 -0500)]
ceph_test_rados_api_service: more retries for servicemkap
Otherwise, this fails intermittently with
/build/
ceph-16.2.1-257-g717ce59b/src/test/librados/service.cc:166: Failure
Expected: (0) != (retry), actual: 0 vs 0
Fixes: https://tracker.ceph.com/issues/50595
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
f130f15a454c8da2bbcaac445a979a1ef5abdf80)
Juan Miguel Olmo Martínez [Tue, 27 Apr 2021 13:54:46 +0000 (15:54 +0200)]
mgr/cephadm: ceph-volume verbose only when fails
Resolves: https://tracker.ceph.com/issues/50526
Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit
7f67a758d001e3f92be87b262dd81ad48afdc86b)
Alfonso Martínez [Mon, 3 May 2021 16:46:08 +0000 (18:46 +0200)]
mgr/dashboard: fix set-ssl-certificate{,-key} commands
- Now create-self-signed-cert command relies on set-ssl-certificate{,-key} commands.
- Simplify the command testing and increase the test coverage.
Fixes: https://tracker.ceph.com/issues/50519
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
fb20990bca55ffe1712a905c3a9741e8df004e74)
Jenkins Build Slave User [Tue, 4 May 2021 18:38:23 +0000 (18:38 +0000)]
16.2.2
Sage Weil [Fri, 30 Apr 2021 14:16:16 +0000 (10:16 -0400)]
qa/workunits/cephadm/test_cephadm: test zap-osds
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
4b4f4ad7bf5a6662d5d8555f73de7fb05ad5d47c)
Sage Weil [Fri, 30 Apr 2021 14:13:23 +0000 (10:13 -0400)]
cephadm: add --zap-osds argument to rm_cluster
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
14c95b54fb325240635be01dd95517d11f37106b)
Sage Weil [Fri, 30 Apr 2021 13:54:40 +0000 (09:54 -0400)]
cephadm: implement zap-osds --fsid ... command
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
a6a20bafc4a9e780cfd86887418850a6b4ee782c)
Zac Dover [Tue, 30 Mar 2021 15:31:28 +0000 (01:31 +1000)]
doc/cephadm: add podman version note to install
This PR adds a note to the cephadm installation
guide that informs users that only podman version
2.0.0 and higher work with Ceph, with the
exception of podman version 2.2.1, which does
not work with Ceph. There is also a note regarding
kubic stable 3.0.1 working, but only with newer
kernels.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
3043aaaa8a880107fab9a755df948c0e9e8db358)
Daniel Pivonka [Mon, 19 Apr 2021 21:21:06 +0000 (17:21 -0400)]
mgr/cephadm: check hostname resolution before adding host
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit
459ffb52a15f8870dd45d3ec163ed27c1467623e)
Daniel Pivonka [Mon, 19 Apr 2021 21:18:55 +0000 (17:18 -0400)]
cephadm: provide a way to checkhost connection without /etc/hosts passed the shell
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit
35da4de8ee888d54d74d05a9d16345cd5c112d23)
Daniel Pivonka [Mon, 19 Apr 2021 21:15:44 +0000 (17:15 -0400)]
doc/cephadm: remove /etc/hosts from list of hostname resoltion methods
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit
c18932ef9fc9f56dee37a03068f3b079c03dfb33)
Sage Weil [Thu, 22 Apr 2021 17:43:49 +0000 (13:43 -0400)]
qa/suites/rados/cephadm/smoke-roleless: test client-keyring
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
e41931d042a1ae854523fc6229c749f0dcc563f4)
Sage Weil [Mon, 26 Apr 2021 13:00:11 +0000 (09:00 -0400)]
qa/tasks/cephadm.py: adjust client.admin key mode; place on all hosts
Except during upgrades, since it is not supported there.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
b0dcaf2cfa02be0695ec8be4cadeaee465a5b2fb)
Sage Weil [Thu, 22 Apr 2021 12:12:49 +0000 (08:12 -0400)]
cephadm: distribute client.admin keyring+conf to label:_admin on bootstrap
If we are placing ceph.conf in /etc/ceph (the default), tell the cluster
to continue doing this going forward to hosts with the '_admin' label.
This doesn't induce the user to add the admin label to other hosts too,
unfortunately--e probably want them to add the admin label to other mons,
for instance--but it is a start.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
08d21ccc949aa19c08c7e806a5b58c0180f5cbe2)
Sage Weil [Thu, 22 Apr 2021 17:32:50 +0000 (13:32 -0400)]
doc/cephadm: document the default 'admin' label
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
b6b85edfe5f1dacd84ed96b4dd0980b5d1774302)
Sage Weil [Wed, 21 Apr 2021 17:06:21 +0000 (13:06 -0400)]
mgr/cephadm: 'ceph orch client-keyring ...' commands to manage keyring files
Teach cephadm to manage keyring files on cluster hosts. These keys must
already exist in the mon auth database--cephadm does not create them if
they don't exist (and will issue warnings to the log if they do not).
A ceph.conf is pushed implicitly along with the keyring file.
Each keyring added will be pushed to the hosts described by the placement
spec with the appropriate ownership and mode. If the ownership, mode, or
path are modified, the files are rewritten or removed as need.
If the client-keyring entry is removed, the keyring files are removed.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
b7e4f6017875dfbe6dc914136c7de64c8c71254e)
Sage Weil [Tue, 20 Apr 2021 22:19:26 +0000 (18:19 -0400)]
mgr/cephadm: reimplement ceph.conf pushing
Use a more generic inventory map of paths to digests to track what we've
pushed.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
77411e7df313f1488e9636c871973818474f9401)
Sage Weil [Tue, 20 Apr 2021 22:19:00 +0000 (18:19 -0400)]
mgr/cephadm: use _write_remote_file for ceph.conf
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
67718f53d189a9afa5fc48016df7c3acdbea5899)
Sage Weil [Tue, 20 Apr 2021 22:18:46 +0000 (18:18 -0400)]
mgr/cephadm: _write_remote_file helper
This is careful is ownership, mode, and fsyncs before renaming into
position.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
64926f3da07b821ef394abb36321917327c82806)
Sage Weil [Tue, 20 Apr 2021 16:58:13 +0000 (12:58 -0400)]
mgr/cephadm: add placementspec for which hosts get ceph.conf
Add a config option to control which hosts (by default, *) get a
ceph.conf (if the bool manage_etc_ceph_ceph_conf option is enabled).
We don't modify the existing option because changing a type makes for a
messy migration: we have to sort out which section the config option is
in to change it. Also, a simple on/off which is more friendly than
specifying "*" to enable something.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
f1096030d9b6caeeaf7c1982b770b5f3fbe913bc)
Adam King [Thu, 22 Apr 2021 21:39:32 +0000 (17:39 -0400)]
mgr/cephadm: skip ok-to-stop for mons in upgrade if < 3 mons
Fixes: https://tracker.ceph.com/issues/50443
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
4c7bfdbdd133820a1c0e8d129980ed810a77168d)
Adam King [Thu, 22 Apr 2021 19:00:44 +0000 (15:00 -0400)]
mgr/cephadm: don't allow upgrade start with less than 2 mgrs
Fixes: https://tracker.ceph.com/issues/50443
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
06d767ee6d36dc5f74044dc3a030c5c46cb09cbe)
Adam King [Tue, 27 Apr 2021 18:32:05 +0000 (14:32 -0400)]
cephadm: re-assimilate user provided conf after mgr created
Fixes: https://tracker.ceph.com/issues/50544
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
adc8a9c0a812c3dc8de118a698cc5b9ca3bc8500)
Stanislav Datskevych [Tue, 27 Apr 2021 06:16:33 +0000 (08:16 +0200)]
cephadm: allow several public networks be matched
Fixes: https://tracker.ceph.com/issues/50548
Signed-off-by: Stanislav Datskevych <me@nek0.net>
(cherry picked from commit
cdd7d20b35676c4627a5caa58e4838fc59e57554)
jianglong01 [Fri, 23 Apr 2021 10:10:30 +0000 (18:10 +0800)]
mgr/cephadm: The command of 'ceph orch daemon restart mgr.xxx' may case mgr daemon loop to restart
Scene:
The mgr daemon is active. After execing restart command, it may be save "scheduled_daemon_actions": {"mgr.xxx": "restart"}}" to config-key.
So the mgr daemon will restart before call rm_scheduled_daemon_action which case mgr daemon will load restart forever.
Fix mgr infinite restart issue refering to the same solution as 'ceph orch daemon redeploy'.
Signed-off-by: jianglong01 <jianglong01@qianxin.com>
(cherry picked from commit
cc5b77ee870e60c2c9d241d5826810eedb295e26)
Zac Dover [Mon, 26 Apr 2021 14:32:21 +0000 (00:32 +1000)]
doc/cephadm: add a single word
s/If the nfs-ganesha doesn't/If the
nfs-ganesha pool doesn't/
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
3af9fe3fd8de16e2b2766fd5c7b19ccb4583e5db)
Zac Dover [Thu, 22 Apr 2021 17:36:59 +0000 (03:36 +1000)]
doc/cephadm: adding "device" to a sentence
This tiny PR fixes an issue that I thought
I had squashed into PR#40914: a missing
word, "device", which was caught by Josh
Durgin during review.
Alas. I had not then caught it.
Here then it is, corrected at last.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
72445fb724044e42a1ceacbbf076ea3b8a88e2ae)
Zac Dover [Mon, 26 Apr 2021 13:04:04 +0000 (23:04 +1000)]
doc/cephadm: rewrite "nfs.rst"
This PR makes a few (very small) stylistic
corrections, mostly typographical, to the text.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
36426d6df56cadb33f20605a47e369bd8c01a813)
Kefu Chai [Sat, 24 Apr 2021 07:37:43 +0000 (15:37 +0800)]
mgr/cephadm: s/_hosts_with_daemon_inventory/_schedulable_hosts/
`_hosts_with_daemon_inventory` was renamed to `_schedulable_hosts`
in
f260c48f723641a5f82c64c0e31451199aa191f8 which was merged before
eebb842d0487660c93baf9eafda28a2f87e482f3 got merged, hence the
regression.
this change just updates the test with the new method name.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
782fc0e7cac7229b2425e706c8f0fae6f4bb6884)
Adam King [Wed, 14 Apr 2021 19:29:58 +0000 (15:29 -0400)]
mgr/cephadm: don't remove daemons from hosts in maintenance or offline mode
Fixes: https://tracker.ceph.com/issues/50364
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
eebb842d0487660c93baf9eafda28a2f87e482f3)
Adam King [Wed, 14 Apr 2021 20:07:46 +0000 (16:07 -0400)]
mgr/cephadm: default status for daemons on maintenance hosts to stopped
we do not refresh the daemons on maintenance hosts so our info
on them is always outdated. Therefore, the best option is to
assume maintenance mode is working correctly and the daemons
are stopped
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
56641742a75bc753b473209b63fcefabcde7615b)
Deepika Upadhyay [Mon, 19 Apr 2021 14:18:47 +0000 (19:48 +0530)]
qa/tasks/cephadm: fix ctx archive check for teuthology
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
(cherry picked from commit
ec2a402f55e1f61c82d65f7609be16c675bfd7aa)
Daniel Pivonka [Tue, 20 Apr 2021 19:30:28 +0000 (15:30 -0400)]
python-common: use OrderedDict instead of Set to remove duplicates from host labels list
this preserves the order of the list instead of randomizing the order
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit
4d3ff90e8676e2403f0a0ca2f968aa49aab9bbdd)
Sage Weil [Tue, 20 Apr 2021 14:27:40 +0000 (10:27 -0400)]
mgr/cephadm: less noise about osd specs
We don't want this message every time around the serve() loop
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
98c8baf165445ee06de9cbbe2e9c6c337a397681)
Sage Weil [Tue, 20 Apr 2021 14:26:08 +0000 (10:26 -0400)]
mgr/cephadm: kick serve loop when adding/removing labels
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
695dc80535a389dd58d9ebbe9239855ea948e571)
Sage Weil [Tue, 20 Apr 2021 14:08:56 +0000 (10:08 -0400)]
mgr/cephadm: do not place osds on _no_schedule hosts
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
f5cee666d2277fcf06c15930dc00617b86aa0c0e)