]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sage Weil [Fri, 21 May 2021 16:32:49 +0000 (12:32 -0400)]
mgr/cephadm: resolve IP at 'orch host add' time
We prefer to always have a real IP for hosts in the cluster. This avoids
a reliance on DNS for most operations.
Perhaps more importantly, it means we are less sensitive to inconsistent
host lookup results, for example due to (1) mismatched /etc/hosts files
between machines, or (2) a lookup of the local hostname that returns
127.0.1.1.
Adjust with_hosts() fixture to take an addr, and adjust tests accordingly.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
3587a10b3eb5a35bfaad556a65eb83c6b062526c )
Zac Dover [Thu, 27 May 2021 01:28:38 +0000 (11:28 +1000)]
doc/cephadm: enrich "service status"
This PR improves the syntax of the "Service
Status" section of the "Service Managment"
section of the cephadm guide. This includes
pretty significant reworking of the information
in the section, so vetting this one might be
annoying. Anyway, I think I've lowered the
cognitive load on the reader.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
31558e5568da5b445b2da1b98ac2eb626d8efdf3 )
Adam King [Fri, 7 May 2021 14:04:31 +0000 (10:04 -0400)]
doc/cephadm: recommend redeploying monitoring stack daemon after changing image
Fixes: https://tracker.ceph.com/issues/50687
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
9be84658fbd5a51f631fcda050811ca0113fbea1 )
Michael Fritch [Thu, 13 May 2021 23:03:32 +0000 (17:03 -0600)]
cephadm: clean-up error message
use the standard error message from FileNotFound:
```
cephadm bootstrap --mon-ip 192.168.1.1 --config ~/foobar
ERROR: [Errno 2] No such file or directory: '/root/foobar'
```
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
870e9bddd2a059ae4930a2eed163bb862094dcaa )
Michael Fritch [Thu, 13 May 2021 23:03:10 +0000 (17:03 -0600)]
cephadm: raise an error when `--config` file is not found
extend the common logic used by the deploy, ceph-volume, and shell
commands for validating the `--config` arg during bootstrap
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
0e444191b93b76527eccb349bd0f68b1fc9302d4 )
Daniel Pivonka [Mon, 10 May 2021 14:20:38 +0000 (10:20 -0400)]
cephadm: manage cephadm log with logrotated
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit
6790b21bc5ba1e2ccdacefc7f067d5e760e6836d )
Sage Weil [Fri, 21 May 2021 18:43:24 +0000 (14:43 -0400)]
mgr/cephadm: progress item for service apply
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
089d2fb01b72366aed021caf34dacb85c09b93cc )
Sage Weil [Fri, 21 May 2021 22:49:58 +0000 (18:49 -0400)]
mgr: expose ceph.conf path to modules
This is useful for shelling back out to ceph utilities.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
3194b8d789ecf6d6b9cd8cadfd962011fa5f6ea0 )
Sage Weil [Fri, 21 May 2021 22:49:33 +0000 (18:49 -0400)]
common/config: track the path to the conf file we loaded
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
340c799bf924d61b355abb9c5e3e34b66634eb45 )
Sage Weil [Fri, 7 May 2021 19:01:10 +0000 (15:01 -0400)]
qa/tasks/cephfs/test_nfs: fix info test
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
218eec938d1c241a595384984aa9e002ffc68e0e )
Sage Weil [Mon, 24 May 2021 15:16:45 +0000 (11:16 -0400)]
doc/cephfs/fs-nfs-exports: document --ingress --virtual-ip
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
ada85604ab3845fcd2d321791051b8da77eee748 )
Sage Weil [Tue, 18 May 2021 22:02:25 +0000 (18:02 -0400)]
mgr/nfs: move ingress vs virtual_ip check to cluster interface
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
f2e78bf2e3009eb67a2e7ef06336371eddee7573 )
Sage Weil [Fri, 7 May 2021 15:01:57 +0000 (11:01 -0400)]
PendingReleaseNotes: clarify deprecated
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
fe03c85b434c058db2d9fdcab888f128a9006d78 )
Sage Weil [Fri, 7 May 2021 14:58:45 +0000 (10:58 -0400)]
PendingReleaseNotes: note breaking CLI changes
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
0ca1400e4bb586963ed5da699a91d57ad99b64bd )
Sage Weil [Thu, 6 May 2021 22:47:38 +0000 (18:47 -0400)]
doc/cephadm/nfs: document nfs+ingress
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
e51c3dcf015730b30ad917117c88b395335808ca )
Sage Weil [Fri, 30 Apr 2021 15:37:51 +0000 (11:37 -0400)]
qa/suites/rados/cephadm/smoke-roleless: test nfs, nfs + ingress
Still missing a full client mount test, though!
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
e2db373698a79adfe17927fb9bd0fb3e908a8f64 )
Sage Weil [Thu, 6 May 2021 22:47:27 +0000 (18:47 -0400)]
mgr/nfs: take --ingress argument to 'nfs cluster create'
It is likely that the rook/k8s variation of ingress will not take a
virtual_ip argument. We want to make sure that ingress yes/no can be
specified independent of the virtual_ip.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
81f0b6984fcfd90b470052b9de19b8b10d176972 )
Sage Weil [Thu, 6 May 2021 18:37:14 +0000 (14:37 -0400)]
mgr/cephadm: adjust debug output for device refresh
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
feb741dd734468eb24d9fac5814beda6112cd100 )
Sage Weil [Thu, 6 May 2021 18:16:43 +0000 (14:16 -0400)]
mgr/cephadm: ingress: fix log msg
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
d72d1b5c4e797d8217ab1152e5b05dba8aec15f7 )
Sage Weil [Thu, 6 May 2021 18:16:38 +0000 (14:16 -0400)]
mgr/cephadm: fix logging of config/placement errors
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
14af47070a8b05b8e8e9f94a7676d573407f3a16 )
Sage Weil [Thu, 3 Jun 2021 12:39:30 +0000 (07:39 -0500)]
common/options: enable nfs module for new clusters
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
8085a7e9cc6a409c59fc8a1542c3c94607fc4e0b )
# Conflicts:
# src/common/options/mgr.yaml.in
- common/options.cc
Sage Weil [Thu, 6 May 2021 14:57:46 +0000 (10:57 -0400)]
cephadm: --stop-signal=SIGTERM
haproxy's container image tells docker|podman to send SIGUSR1 for a "clean"
shutdown. For NFS, the connections never close, so we will always hit the
podman|docker 10s timeout and get a SIGKILL. That, in turn, causes haproxy
to exit with 143, and puts the systemd unit in a failed state.
This highlights a general problem(?) with stopping containers: if they don't
do it quickly then we'll end up in this error state. We don't directly
address that here.
Avoid this problem by always stopping containers with SIGTERM. In the
haproxy case, that means an immediate shutdown (no graceful drain of
open connections). In theory we could do this only for haproxy with
NFS, but we can easily imagine RGW connections that don't close in 10s
either, and we don't want containers exiting in error state--we just
want the proxy to stop quickly.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
9ab674579f51a89febec69a93d179505e85a066a )
Sage Weil [Mon, 3 May 2021 15:48:45 +0000 (11:48 -0400)]
mgr/orchestrator: default nfs pool, namespaces
Apply nfs default pool (currently 'nfs-ganesha'), and default the
namespace to the service_id.
There is no practical reason for users to ever need to change this, and
requiring them to provide this informaiton at config/apply time just
complicates life.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
09be2e14cc8d1d06609e876b6f0b0a579c11cd58 )
Sage Weil [Mon, 3 May 2021 15:42:13 +0000 (11:42 -0400)]
mgr/cephadm: nfs: create pool if it doesn't yet exist
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
548f1681e093ee7bda0629ce587724e00eeae1b3 )
Sage Weil [Wed, 5 May 2021 16:26:28 +0000 (12:26 -0400)]
doc/cephadm/nfs: update
- leave off pool/ns, since they should almost never be necessary.
- add port
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
0e0f89266898f350a31480cb4915d66dcba0d17f )
Sage Weil [Tue, 4 May 2021 17:10:14 +0000 (13:10 -0400)]
mgr/nfs: change 'nfs cluster info'
- include the virtual_ip and port at top level
- move backend server list into a sub-item
- include (haproxy) monitoring port
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
00aac5df9ea603d26c340279f97f45f366b6f26f )
Sage Weil [Tue, 4 May 2021 17:09:38 +0000 (13:09 -0400)]
mgr/nfs: take optional virtual_ip for deploying ingress
For 'nfs cluster create', optionally take a virtual_ip to deploy ingress.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
26cb491d196bb9257c7e959c3c9f180e6d9f136a )
Sage Weil [Wed, 5 May 2021 16:59:44 +0000 (12:59 -0400)]
mgr/nfs: remove 'nfs cluster update'
This command is very awkward to implement unless all service spec fields
are always required. That will soon mean both the placement *and*
virtual_ip (if any), making it much less useful for a human to make use
of.
Instead, let them update yaml, or adjust the nfs and/or ingress specs
directly. I don't think this command is needed.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
e5c1d4aa71ddf24304ec5d18b22bea739c20226d )
Sage Weil [Wed, 5 May 2021 16:34:56 +0000 (12:34 -0400)]
mgr/nfs: factor out ganesha pool creation
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
5585fdd5e384ca816a34d7918ccebc02b66d6abc )
Sage Weil [Tue, 4 May 2021 17:02:23 +0000 (13:02 -0400)]
mgr/nfs: delete -> rm for CLI
The rest of the CLI uses 'rm' in place of 'remove' or 'delete', so let's
deprecate 'delete' and add 'rm'.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
ad0a62dc9db196ada4c962e7dacb18b73ab54a25 )
Sage Weil [Wed, 5 May 2021 16:57:17 +0000 (12:57 -0400)]
mgr/nfs: add some type annotations
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
7a5b45268cdeef47968a8f901b79406c40b243c3 )
Sage Weil [Wed, 5 May 2021 19:44:44 +0000 (15:44 -0400)]
python-common: fix IngressSpec yaml dump
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
05fdbc8c76274952d2ef10e1ab1be3679efe479e )
Sage Weil [Mon, 3 May 2021 15:02:24 +0000 (11:02 -0400)]
mgr/cephadm: ingress: remove eth0 default
Better to raise an error; eth0 will never be correct.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
9dba27edfeaa24f758121d3032775bf89cd4856a )
Sage Weil [Sun, 2 May 2021 22:08:52 +0000 (18:08 -0400)]
qa/tasks/cephadm: allow mounting volumes in shell
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
b711a752775bb21bafa2ec376346eb7cd99f5c18 )
Sage Weil [Sun, 2 May 2021 22:08:33 +0000 (18:08 -0400)]
cephadm: add -v arg to shell
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
693fd30532760067a262f381fb3487deae52f689 )
Sage Weil [Fri, 30 Apr 2021 15:41:23 +0000 (11:41 -0400)]
qa/tasks/vip: add 'vip.exec' task
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
54542fdaab5b710eed8127be21111d4f3a030f69 )
Sage Weil [Fri, 30 Apr 2021 15:36:47 +0000 (11:36 -0400)]
mgr/orchestrator: add --port arg to 'orch apply nfs'
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
205bf35c4377607176be16b8144a2bfe8fc70eb6 )
Sage Weil [Thu, 29 Apr 2021 14:43:57 +0000 (10:43 -0400)]
mgr/cephadm: nfs: add purge
Remove the grace object if we purge the service.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
15bdaa74b51b70afc089567dbda68fee64e89109 )
Sage Weil [Mon, 26 Apr 2021 19:29:45 +0000 (15:29 -0400)]
mgr/cephadm: ingress: support nfs
- use consistent hashing
- statically map across ranks
- disable backend checks so that clients don't move
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
51f0dedbbb996fdaca4ba866791c2ac86d4429c6 )
Sage Weil [Mon, 26 Apr 2021 19:28:48 +0000 (15:28 -0400)]
mgr/cephadm: do not reconfigure daemons on deleted services
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
444663b740da4e91cdf318f2661fc5cc0b76557c )
Sage Weil [Mon, 26 Apr 2021 18:54:38 +0000 (14:54 -0400)]
mgr/cephadm: nfs: shell out to rados tool for conf creation
This avoids any hangs due to rados.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
917fb597673ade3b436854d17aef559447540a85 )
Sage Weil [Mon, 26 Apr 2021 18:48:03 +0000 (14:48 -0400)]
mgr/cephadm: nfs: add rank to grace file from mgr module
Do the grace file manipulation from the mgr module. For add, this isn't
especially important, but for remove it is very important. Clean out
old ranks from the grace table before we record that the rank has been
purged from the rank_map.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
74169045a9b212d4b549159a8f7870ed6e9119ea )
Sage Weil [Mon, 26 Apr 2021 13:17:31 +0000 (09:17 -0400)]
mgr/cephadm: nfs: bind ganesha to appropriate ip:port
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
ae4ab5d2041856c8a891e25df610b88bc07b14f1 )
Sage Weil [Fri, 23 Apr 2021 19:33:23 +0000 (15:33 -0400)]
mgr/cephadm: enable ranked daemons for nfs
Use ranked daemons for NFS. Ganesha does not like it if multiple
instances start up with the same rank, but we need stable ranks so that
a rank can "fail over" to a new instance of a new daemon on another host
(with the same rank) for NFS client reclaim to work.
Specify a nodeid of '{service_name}.{rank}' for ganesha.
Include a unique id in the daemon_id just because this avoids some issues
with the create/destroy ordering, and because the daemon_id doesn't matter
much anymore since we are using a stable rank.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
a7d65f00ea554078f6e8f058e9ec137230902964 )
Sage Weil [Fri, 23 Apr 2021 19:31:14 +0000 (15:31 -0400)]
mgr/cephadm: support creation of daemons with ranks
- we need to assign all names and update the rank_map before we start
creating daemons.
- if we are using ranks, we should delete old daemons first, and
fence them from the cluster (where possible).
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
e8b07982b50e35a546a52b092cac5a825c37981d )
Sage Weil [Fri, 23 Apr 2021 19:28:31 +0000 (15:28 -0400)]
mgr/cephadm: make _plan show removed daemon names
This is more informative than just the hostnames.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
1b0980752f159e93a72d73094125dd8d4ec582cc )
Sage Weil [Fri, 23 Apr 2021 19:28:13 +0000 (15:28 -0400)]
mgr/cephadm/schedule: assign/map ranks
If we are passed a rank_map, use it maintain one daemon per rank, where
the ranks are consecutive non-negative integers starting from 0.
A bit of refactoring in place() so that we only do the rank allocations
on slots we are going to use (no more than count).
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
de03942f806cb16e00259f2397446afb9322c3f1 )
Sage Weil [Fri, 23 Apr 2021 19:25:58 +0000 (15:25 -0400)]
mgr/cephadm: add rank[_generation] properties
DaemonDescription
CephadmDaemonDeploySpec
DaemonPlacement
unit.meta
get_unique_name() (we include it in the daemon_id)
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
5e8f184be8091fdea8d7856a243dca913180e2a9 )
Sage Weil [Fri, 23 Apr 2021 19:22:07 +0000 (15:22 -0400)]
mgr/cephadm/inventory: store optional rank_map along with specs
The rank_map is a bit of state to keep track of which ranks are
occupied by which generation and daemon_id.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
d0d2232c0542170b0908d8d79d6fc50eaa053d94 )
Sage Weil [Fri, 23 Apr 2021 19:13:05 +0000 (15:13 -0400)]
mgr/cephadm: include service_name is generated DaemonDescription
This makes 'orch ls' match up daemosn to services (and probably cleans up
other bits and pieces) when the old daemon id -> service name calc code
can't do its thing.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
11ff4842a207c82dd4ec8254aa370962cde24c82 )
Sage Weil [Fri, 23 Apr 2021 18:53:54 +0000 (14:53 -0400)]
mgr/orchestrator: include service_name in DaemonDescription dump
('orch ps')
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
15e5c0a3accf8284d22df3b8f98b0127eec02834 )
Sage Weil [Fri, 23 Apr 2021 18:07:19 +0000 (14:07 -0400)]
mgr/cephadm/inventory: fix deleted check
Look in dict, not encoded JSON string
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
a282c3c249fcd901bf8005f9f8e581ceb0ff6225 )
Sage Weil [Fri, 23 Apr 2021 15:17:14 +0000 (11:17 -0400)]
mgr/cephadm: simplify
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
991515aaaa19eeee93f6b98b6721ed2b3efbff1b )
Sage Weil [Thu, 22 Apr 2021 22:42:00 +0000 (18:42 -0400)]
mgr/cephadm/schedule: make placement shuffle deterministic
hash(str) is non-deterministic, probably because it is using the internal
object ID or something and not the string content?
In any case, explicitly hash the string content and use that instead.
Also, sort the input pre-shuffle to ensure that variations in the original
host list ordering don't screw with the result.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
adceaa9b28278601c56a7db1c3f42eaa592ec4d1 )
Sage Weil [Thu, 22 Apr 2021 17:57:21 +0000 (13:57 -0400)]
mgr/cephadm: document CephadmService flags
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
2fa80d8769a5b4ab1238a9b18627b9e28a540b66 )
Zac Dover [Tue, 25 May 2021 19:22:56 +0000 (05:22 +1000)]
doc/cephadm: fix prompts in service-management.rst
This PR formats the prompts in service-managment.rst
properly.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
db3af8e3d2c6aceced0176930717546496147a3b )
sunilkumarn417 [Wed, 19 May 2021 10:02:45 +0000 (15:32 +0530)]
qa/tasks/cephadm: Include bootstrap registry options for downstream
- registry-url, registry-username and registry-password bootstrap options are
supported now. This is needed to access monitoring service container images.
- usage of RHEL distribution based cephadm in download_cephadm task.
Signed-off-by: sunilkumarn417 <sunnagar@redhat.com>
(cherry picked from commit
364fb5899bc87ca0da802293946ef8f2dcbd3c4e )
Sage Weil [Thu, 20 May 2021 17:41:52 +0000 (12:41 -0500)]
qa/suites/rados: include rook test in rados
This just to make sure we don't break mgr/orchestrator.
Note that we already symlink ../orch/cephadm, so this makes rados
include all of orch/.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
5db5c8c292e70a643d91f19e1b21da3be65ecb34 )
Ernesto Puerta [Thu, 3 Jun 2021 12:09:32 +0000 (14:09 +0200)]
Merge pull request #41646 from rhcs-dashboard/wip-51063-pacific
pacific: mgr/dashboard: fix bucket objects and size calculations
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Yuri Weinstein [Wed, 2 Jun 2021 20:40:14 +0000 (13:40 -0700)]
Merge pull request #41320 from trociny/wip-50794-pacific
pacific: osd: don't assert in-flight backfill is always in recovery list
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 2 Jun 2021 18:54:38 +0000 (11:54 -0700)]
Merge pull request #41312 from k0ste/wip-50779-pacific
pacific: mgr/progress: ensure progress stays between [0,1]
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 2 Jun 2021 18:53:51 +0000 (11:53 -0700)]
Merge pull request #41236 from trociny/wip-50702-pacific
pacific: os/FileStore: fix to handle readdir error correctly
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Wed, 2 Jun 2021 18:53:01 +0000 (11:53 -0700)]
Merge pull request #41125 from sseshasa/wip-50606-pacific
pacific: osd: Override recovery, backfill and sleep related config options during OSD and mclock scheduler initialization.
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Wed, 2 Jun 2021 18:52:16 +0000 (11:52 -0700)]
Merge pull request #41113 from k0ste/wip-50602-pacific
pacific: osd: compute OSD's space usage ratio via raw space utilization
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Yuri Weinstein [Wed, 2 Jun 2021 18:51:33 +0000 (11:51 -0700)]
Merge pull request #40566 from singuliere/wip-49992-pacific
pacific: common/mempool: only fail tests if sharding is very bad
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Wed, 2 Jun 2021 15:13:26 +0000 (08:13 -0700)]
Merge pull request #41468 from batrick/i50873
pacific: mon,doc: deprecate min_compat_client
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Wed, 2 Jun 2021 15:12:25 +0000 (08:12 -0700)]
Merge pull request #40689 from singuliere/wip-50014-pacific
pacific: debian,cmake,cephsqlite: hide non-public symbols
Reviewed-by: Kefu Chai <kchai@redhat.com>
Avan Thakkar [Tue, 1 Jun 2021 14:21:16 +0000 (19:51 +0530)]
mgr/dashboard: fix bucket objects and size calculations
Fixes: https://tracker.ceph.com/issues/51035
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
9f5ef98d9c88a91b80e622f16f7061eddff79b2c )
Ernesto Puerta [Wed, 2 Jun 2021 12:16:36 +0000 (14:16 +0200)]
Merge pull request #41633 from rhcs-dashboard/wip-51036-pacific
pacific: mgr/dashboard: pass Grafana datasource in URL
Reviewed-by: Aashish Sharma <aasharma@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, 2 Jun 2021 12:14:20 +0000 (14:14 +0200)]
Merge pull request #41528 from rhcs-dashboard/wip-50968-pacific
pacific: mgr/dashboard: show RGW tenant user id correctly in 'NFS create export' form
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Patrick Donnelly [Wed, 2 Jun 2021 05:24:31 +0000 (22:24 -0700)]
Merge PR #41053 into pacific
* refs/pull/41053/head:
cephfs-top: set the cursor to be invisible
cephfs-top: self-adapt the display according the window size
cephfs-top: use the default window object from curses.wrapper()
cephfs-top: improve the output
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Wed, 2 Jun 2021 04:59:08 +0000 (21:59 -0700)]
Merge PR #41389 into pacific
* refs/pull/41389/head:
qa/tasks/nfs: add test to check if cmds fail on not passing required arguments
mgr/nfs: fix flake8 missing whitespace around parameter equals error
mgr/nfs: annotate _cmd_nfs_* methods return value
doc/cephfs/nfs: add section about ganesha logs
doc/cephfs/nfs: Replace volume/nfs with nfs
doc/cephfs/nfs: add note about export management with volume/nfs interface only
spec: add nfs to spec file
mgr/nfs: Don't enable nfs module by default
mgr/nfs: check for invalid chars in cluster id
mgr/nfs: Use CLICommand wrapper
mgr/nfs: reorg nfs files
mgr/nfs: Check if transport or protocol are list instance
mgr/nfs: reorg cluster class and common helper methods
mgr/nfs: move common export helper methods to ExportMgr class
mgr/nfs: move validate methods into new ValidateExport class
mgr/nfs: add custom exception module
mgr/nfs: create new module for export utils
mgr/nfs: rename fs dir to export
mgr/volumes/nfs: Move nfs code out of volumes plugin
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Wed, 2 Jun 2021 04:49:17 +0000 (21:49 -0700)]
Merge PR #40634 into pacific
* refs/pull/40634/head:
qa: check mounts attribute in ctx
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Wed, 2 Jun 2021 04:11:47 +0000 (21:11 -0700)]
Merge PR #41169 into pacific
* refs/pull/41169/head:
pacific: qa: drop the distro~HEAD directory from the fs suite.
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Ilya Dryomov [Tue, 1 Jun 2021 16:39:34 +0000 (18:39 +0200)]
Merge pull request #41629 from ideepika/wip-pr-41514
pacific: qa/upgrade: conditionally disable update_features tests
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Ernesto Puerta [Mon, 31 May 2021 11:45:40 +0000 (13:45 +0200)]
mgr/dashboard: pass Grafana datasource in URL
PR https://github.com/ceph/ceph/pull/24314 added support for
specifying the Grafana datasource via $datasource template variable, but
this hadn't been used from the Dashboard side so far.
As per https://grafana.com/docs/grafana/latest/variables/#templates, by
adding `var-datasource=Dashboard1`, Dashboard can specify the
datasource.
Fixes: https://tracker.ceph.com/issues/51026
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit
957c9c304bca8ef8416041f96b0e2d5bb0f0a0dc )
Deepika [Mon, 24 May 2021 21:20:39 +0000 (21:20 +0000)]
qa/upgrade: conditionally disable update_features tests
with the recent support for async rbd operations from pacific+ when an
older client(non async support) goes on upgrade, and simultaneously
interacts with a newer client which expects the requests to be async,
experiences hang; considering the return code for request completion to
be acknowledgement for async request, which then keeps waiting for
another acknowledgement of request completion.
this if happens should be a rare only when lockowner is an old client
and should be deferred if compatibility issues arises.
see also:
541230475d3b25ab18c4eb9bc5011060462594a6 (octopus)
Signed-off-by: Deepika <dupadhya@redhat.com>
(cherry picked from commit
9c0b239d70cdeb0c5705fa89fa5aac111152671b )
Ernesto Puerta [Tue, 25 May 2021 16:39:25 +0000 (18:39 +0200)]
Merge pull request #41428 from rhcs-dashboard/wip-50774-pacific
pacific: mgr/dashboard: ingress service creation follow-up
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Tue, 25 May 2021 16:38:41 +0000 (18:38 +0200)]
Merge pull request #41427 from rhcs-dashboard/wip-50882-pacific
pacific: mgr/dashboard: fix ESOCKETTIMEDOUT E2E failure
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Ernesto Puerta [Tue, 25 May 2021 16:37:37 +0000 (18:37 +0200)]
Merge pull request #41505 from rhcs-dashboard/wip-50959-pacific
pacific: mgr/dashboard: drop container image name and id from services list
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Tue, 25 May 2021 16:36:10 +0000 (18:36 +0200)]
Merge pull request #41507 from rhcs-dashboard/wip-50962-pacific
pacific: mgr/dashboard: fix API docs link
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Tue, 25 May 2021 16:34:54 +0000 (18:34 +0200)]
Merge pull request #41440 from rhcs-dashboard/wip-50864-pacific
pacific: mgr/dashboard: Fix for query params resetting on change-password
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Alfonso Martínez [Thu, 20 May 2021 15:51:35 +0000 (17:51 +0200)]
mgr/dashboard: show RGW tenant user id correctly in 'NFS create export' form.
Fixes: https://tracker.ceph.com/issues/50909
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
440d6d643c172252790791ec38ce27364ccc183e )
Avan Thakkar [Wed, 19 May 2021 23:57:29 +0000 (05:27 +0530)]
mgr/dashboard: fix API docs link
Fixes: https://tracker.ceph.com/issues/50890
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
e79c9d3f51970fbe275087e92e468205f70e6f12 )
Ernesto Puerta [Mon, 24 May 2021 18:41:25 +0000 (20:41 +0200)]
Merge pull request #41494 from aaSharma14/wip-50902-pacific
pacific: mgr/dashboard: provide the service events when showing a service in the UI
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Avan Thakkar [Wed, 19 May 2021 21:34:01 +0000 (03:04 +0530)]
mgr/dashboard: drop container image name and id from services list
Fixes: https://tracker.ceph.com/issues/50889
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Dropping container image name and id columns from services list.
(cherry picked from commit
ee98d73a231ce99e9a5a74ed602724c2111ee93d )
Aashish Sharma [Thu, 18 Mar 2021 09:40:43 +0000 (15:10 +0530)]
mgr/dashboard: provide the service events when showing a service in the UI
When service deployment failures occur, events are generated and associated with the service. This PR intends to add these events as Daemon Logs and Service Logs to the UI for troubleshooting and doing diagnostics for the same.
Fixes: https://tracker.ceph.com/issues/49262
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit
00ce7c90ef19f02beea9431ab360d23744efde2d )
Sage Weil [Fri, 21 May 2021 18:10:43 +0000 (13:10 -0500)]
Merge PR #41463 into pacific
* refs/pull/41463/head:
cephadm: write config files as utf-8
cephadm: reduce `noqa` usage
cephadm: apply autopep8 changes
cephadm: introduce autopep8
cephadm: remove `verify-prereqs` subcommand
cephadm: add HAProxy sysctl settings
cephadm: move keepalived sysctl settings
cephadm: apply osd sysctl settings
mgr/cephadm: warn users if they try to pass a daemon to 'orch rm'
qa/suites/orch/rook: disable centos for now
qa/suites/orch/rook/smoke: initial smoke suite
qa/tasks/rook: ROOK_HOSTPATH_REQUIRES_PRIVILEGED=true on centos
qa/tasks/rook: simplify shutdown
qa/tasks/rook: archive logs
qa/tasks/rook: more orderly cluster teardown
qa/tasks/rook: deploy ceph via rook on top of kubernetes
qa/tasks/kubeadm: install kubernetes with kubeadm
qa/suites: move rados/cephadm -> orch/cephadm; symlink
qa/tasks/cephadm: add whitespace between functions
qa/tasks/cephadm: clean up ctx.manager setup
mgr/cephadm: pin haproxy image to 2.3.z
mgr/cephadm: fix issue with missing prometheus alerts
mgr/cephadm: check version in upgrade check
mgr/cephadm: Fix OSD replacement in hosts with FQDN host name
mgr/cephadm: fix prometheus jinja template
doc/cephadm: rewrite "disabling monitoring"
mgr/cephadm: induce retune of osd memory on osd creation
qa/tasks/cephadm.conf: autotune osd memory by default
mgr/cephadm: do not autotune when _no_autotune_memory label is present
mgr/cephadm: autotune osd memory
common/options: add osd_memory_target_autotune
mgr/cephadm: report memory usage, request (limit) in 'orch ps'
doc/cephadm/host-management: document _admin group
mgr/orchestrator: fix help formatting
mgr/cephadm/schedule: fix filter message
mgr/cephadm: Use `cephfs-mirror` caps profile
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Ilya Dryomov [Fri, 21 May 2021 10:14:18 +0000 (12:14 +0200)]
Merge pull request #41281 from idryomov/wip-rbd-pwl-status-pacific
pacific: rbd: don't attempt to interpret image cache state json
Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
Ilya Dryomov [Fri, 21 May 2021 10:13:50 +0000 (12:13 +0200)]
Merge pull request #41244 from idryomov/wip-rbd-pwl-reopen-pacific
pacific: librbd/cache/pwl: fix parsing of cache_type in create_image_cache_state()
Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
Ilya Dryomov [Fri, 21 May 2021 07:19:17 +0000 (09:19 +0200)]
Merge pull request #41195 from idryomov/wip-rbd-qemu-iotests-focal-pacific
pacific: qa/workunits/rbd: use bionic version of qemu-iotests for focal
Reviewed-by: Sunny Kumar <sunkumar@redhat.com>
Patrick Donnelly [Fri, 14 May 2021 19:19:37 +0000 (12:19 -0700)]
mon,doc: deprecate CephFS min_compat_client
Instead admins should specify specific features to require.
Fixes: https://tracker.ceph.com/issues/50819
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
d0e5a2bfac3a05bc60a34a815264b1f5baec944b )
Patrick Donnelly [Fri, 14 May 2021 19:19:11 +0000 (12:19 -0700)]
doc: add alternate_name cephfs feature to table
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
5180c39db5621224359e62cf812877c4b1f2b068 )
Sage Weil [Tue, 18 May 2021 12:23:36 +0000 (08:23 -0400)]
cephadm: write config files as utf-8
If we don't specify the encoding, python may use something like 'latin-1',
which cannot handle unicode characters.
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit
fa2cf2987cccea9f152c04862fc684e146c4692e )
Michael Fritch [Tue, 4 May 2021 18:37:56 +0000 (12:37 -0600)]
cephadm: reduce `noqa` usage
- E722 do not use bare 'except'
- W504 line break occurred after a binary operator
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
fa75096e68110e8673d3c1cfede92c50af97a676 )
Michael Fritch [Tue, 4 May 2021 18:35:47 +0000 (12:35 -0600)]
cephadm: apply autopep8 changes
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
6eaf23231d6048e6e583eff850395666b370c631 )
Michael Fritch [Tue, 4 May 2021 18:29:45 +0000 (12:29 -0600)]
cephadm: introduce autopep8
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
0efb4b546c6c24d8a5d109a31d859c6ada77556e )
Michael Fritch [Mon, 10 May 2021 19:49:37 +0000 (13:49 -0600)]
cephadm: remove `verify-prereqs` subcommand
sysctl settings are now managed per-host, rather than per-daemon
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
bd308816746431331a047ab5f39d47272125685a )
Michael Fritch [Wed, 12 May 2021 23:27:50 +0000 (17:27 -0600)]
cephadm: add HAProxy sysctl settings
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
465e7ef243f85db27642b2cd626841e9e4be848e )
Michael Fritch [Mon, 10 May 2021 19:36:20 +0000 (13:36 -0600)]
cephadm: move keepalived sysctl settings
from container pre-start to sysctl file
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
04127a0d2226c0499af53503a936134aa744a2b3 )