]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agomgr/orchestrator: Add test for readable yaml
Sebastian Wagner [Thu, 11 Jun 2020 08:06:49 +0000 (10:06 +0200)]
mgr/orchestrator: Add test for readable yaml

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 87a150358eb0a1cfa8b38a6df4135b57a21f7130)

5 years agopybind/mgr: move test_orchestrator to orchestrator module
Sebastian Wagner [Thu, 11 Jun 2020 07:53:04 +0000 (09:53 +0200)]
pybind/mgr: move test_orchestrator to orchestrator module

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 888addc4680ea8fb6c9f2c88c418c53e910a2ba9)

5 years agomgr/orch: make YAML of ServiceDescription readable
Sebastian Wagner [Thu, 11 Jun 2020 09:55:00 +0000 (11:55 +0200)]
mgr/orch: make YAML of ServiceDescription readable

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit fd29e1c4a8ccaa84f3f2e73920b637576d565015)

5 years agomgr/orch: YAML of DaemonDescription readable
Sebastian Wagner [Thu, 11 Jun 2020 10:00:11 +0000 (12:00 +0200)]
mgr/orch: YAML of DaemonDescription readable

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 4c7ad07b20fd5ae125bad34fcebdd84a886432b9)

5 years agopython-common: Make YAML or OSD Specs readable
Sebastian Wagner [Thu, 11 Jun 2020 09:52:45 +0000 (11:52 +0200)]
python-common: Make YAML or OSD Specs readable

* Changes: An empty OSD Spec is now invalid.
* OSDSpec.validate() now fails, if service-id is empty

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit cd6a488ab2ca036dd4fb36751b938f605e97e1c8)

5 years agopython-common: make YAML representaition of ServiceSpec readable
Sebastian Wagner [Thu, 11 Jun 2020 09:54:45 +0000 (11:54 +0200)]
python-common: make YAML representaition of ServiceSpec readable

* Add test for new yaml representation

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 4ddb111dd1491a4456bdc0379b6fbc5d641f4291)

5 years agocephadm: error trying to get ceph auth entry for crash daemon
Juan Miguel Olmo Martínez [Wed, 27 May 2020 11:24:38 +0000 (13:24 +0200)]
cephadm: error trying to get ceph auth entry for crash daemon

If your cluster has nodes with a . in the name. This will happen.

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit 68cfa109b46bb627cfdfe624815aa01ed6b6c39b)

5 years agomgr/cephadm: add test for ok-to-stop
Sebastian Wagner [Tue, 9 Jun 2020 13:51:28 +0000 (15:51 +0200)]
mgr/cephadm: add test for ok-to-stop

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 5c91f1b897beaca476bb1ef178ef332fe092bae3)

5 years agomgr/cephadm: scheduler: make use of ok-to-stop
Sebastian Wagner [Tue, 9 Jun 2020 12:57:48 +0000 (14:57 +0200)]
mgr/cephadm: scheduler: make use of ok-to-stop

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f42182587057e8e18661f0b7570c7af1617e3506)

5 years agomgr/cephadm: move _check_safe_to_destroy_mon to MonService
Sebastian Wagner [Tue, 9 Jun 2020 12:57:07 +0000 (14:57 +0200)]
mgr/cephadm: move _check_safe_to_destroy_mon to MonService

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit cb92429d52319deb2bc626495ea58ac82e50e558)

5 years agomgr/cephadm: move ok_to_stop to CephadmService
Sebastian Wagner [Tue, 9 Jun 2020 12:36:38 +0000 (14:36 +0200)]
mgr/cephadm: move ok_to_stop to CephadmService

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 2b41d0a470c91d4395a2af4ee88b2f26253791ca)

5 years agomgr/cephadm: use fixed Grafana version
Patrick Seidensal [Tue, 16 Jun 2020 10:58:38 +0000 (12:58 +0200)]
mgr/cephadm: use fixed Grafana version

Fixes: https://tracker.ceph.com/issues/45859
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 571960562187d8588826c6616e90e23948376e8d)

5 years agomgr/cephadm: speedup _refresh_hosts_and_daemons by 10x
Sebastian Wagner [Fri, 19 Jun 2020 15:27:58 +0000 (17:27 +0200)]
mgr/cephadm: speedup _refresh_hosts_and_daemons by 10x

by calling 10 hosts in parallel.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 0716b0556996ce34b628611274064cbf05fef97c)

5 years agomgr/cephadm: fix broken "already in use" exception message
Sebastian Wagner [Thu, 18 Jun 2020 09:31:22 +0000 (11:31 +0200)]
mgr/cephadm: fix broken "already in use" exception message

Fixes:

```
orchestrator._interface.OrchestratorValidationError: ('name %s already in use', 'b')
```

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 9a45c39c68956c87e55ec4cce90a7bb4df524b97)

5 years agocephadm: Set ms bind ipv6 when mon-ip is ipv6
Matthew Oliver [Thu, 18 Jun 2020 01:39:39 +0000 (01:39 +0000)]
cephadm: Set ms bind ipv6 when mon-ip is ipv6

If you use cephadm bootstrap with an ipv6 mon ip then currently you'll
get into a address family split-brain state, where the mon's messenger
connects and binds to ipv6 but the mgr's binds to ipv4 (usually
0.0.0.0). In this state the bootstrap process hangs as it attempts to
talk and get the mgr state.

A work around is to have `ms bind ipv6 = true` in a ceph conf
you can then pass to bootstrap which gets pulled in and set in mon's
config store.

This patch sets `ms bind ipv6 = true` to the global section in the
mon config store when the mon-ip argument is an ipv6 address.

Fixes: https://tracker.ceph.com/issues/45016
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit 08ba08f7bb5b577ad3c3895e2c7f9f4d4555f185)

5 years agomgr/cephadm: exclude osds without osdspec_affinity
Joshua Schmid [Tue, 16 Jun 2020 09:53:25 +0000 (11:53 +0200)]
mgr/cephadm: exclude osds without osdspec_affinity

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 343cf0386264e0c6c4851614b7251c18792e2d8b)

5 years agocephadm: restrict mds caps to cephfs pools
Patrick Donnelly [Thu, 18 Jun 2020 17:00:05 +0000 (10:00 -0700)]
cephadm: restrict mds caps to cephfs pools

Fixes: https://tracker.ceph.com/issues/46081
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 1ef958085d1fa86f3c79ba25b0e20be2e6fc5dd5)

5 years agocephadm: unit.run: add `set -e`
Sebastian Wagner [Thu, 18 Jun 2020 14:13:00 +0000 (16:13 +0200)]
cephadm: unit.run: add `set -e`

In case LVM activates fails for some
unknown reason, prevent the script from
continuing with starting the OSD container.

This leads to faild systemd services with active OSD containers.

Fixes: https://tracker.ceph.com/issues/46036
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f9e5dd509bcc5d5b7c9849f58183a9de6f56ee1e)

5 years agomgr/orch: read untrusted input using the yaml SafeLoader
Michael Fritch [Thu, 18 Jun 2020 20:55:21 +0000 (14:55 -0600)]
mgr/orch: read untrusted input using the yaml SafeLoader

https://msg.pyyaml.org/load

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d5175e3a443a4e17b6f73a2ced35d224ab4d93e2)

5 years agomgr/cephadm: make `orch status` fail, if ssh key is not set
Sebastian Wagner [Fri, 19 Jun 2020 15:50:04 +0000 (17:50 +0200)]
mgr/cephadm: make `orch status` fail, if ssh key is not set

ceph-salt relies on the output of `orch status` to determine the
end of the bootstrap process.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f4e7d33d173f6e1236af531fac8e7a2a2c27af53)

5 years agopython-common: remove old `cephadm_orchestrator.py`
Sebastian Wagner [Thu, 18 Jun 2020 10:38:30 +0000 (12:38 +0200)]
python-common: remove old `cephadm_orchestrator.py`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 0111c880f4951ed0ee395190a9bf67bd7ebb0228)

5 years agodoc/cephadm: adopt: fix misleading `apply` examples
Sebastian Wagner [Thu, 18 Jun 2020 08:56:35 +0000 (10:56 +0200)]
doc/cephadm: adopt: fix misleading `apply` examples

Fixes: https://tracker.ceph.com/issues/46052
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit e74fc0671b73b6da3669f5389f372342d4e62843)

5 years agodoc/mgr/orch: Update documentation to the new CLI
Sebastian Wagner [Tue, 16 Jun 2020 09:02:37 +0000 (11:02 +0200)]
doc/mgr/orch: Update documentation to the new CLI

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit b0bbef91f0fb0afcd962f1ea26e99faa5031cf52)

5 years agocephadm: Give iscsci a RO /lib/modules bind mounted
Matthew Oliver [Wed, 20 May 2020 00:22:45 +0000 (10:22 +1000)]
cephadm: Give iscsci a RO /lib/modules bind mounted

The ceph iscsi container needs to be able to insert the iscsi_target_mod
but it doesn't exist in the container. for security reasons bind
mounting /lib/modules seems a little dangerous unless we can mount it
RO.
Unfortuntly the docker volume mount (-v) doesn't allow you mount
readonly, adding a `--read-only` actaully does the opposite, makes the
root on the container RO and expects you to write to the mounted volumes
(-v).

However, we get more grainular control over bind mount options if we use
`--mount`[0]. Here we can still bind mound the volume into the container,
but can also add additional options, like bind mounting RO.

This patch adds at addiontal `bind_mounts` option to the CephContainer
along side `volume_mounts`. The `bind_mounts` take a List[List[str]]:

 binds = []
 lib_modules = ['type=bind',
                'source=/lib/modules',
                'destination=/lib/modules',
                'ro=true']
 binds.append(lib_modules)

And this is plumbed through into cephadm. Bind_mounts only needs to be
used if you need a little more control over the mounting, otherwise the
volume_mounts are easier to use.

[0] - https://docs.docker.com/engine/reference/commandline/service_create/#add-bind-mounts-volumes-or-memory-filesystems

Fixes: https://tracker.ceph.com/issues/45252
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit d9b5371478b744920cf14e1b34b7d63226c71050)

5 years agostop.sh: do not block script when there is no running cluster
Kiefer Chang [Thu, 18 Jun 2020 07:42:50 +0000 (15:42 +0800)]
stop.sh: do not block script when there is no running cluster

A query for current fsid is called inside `do_killcephadm`. This blocks
the script when there is no running cluster. The fix avoids entering the
function if cephadm command fails or returns no daemons.

The change also hides the following output for non-cephadm environments:

```
Unable to locate any of ['podman', 'docker']
```

Fixes: https://tracker.ceph.com/issues/46067
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 9884b9313db506a35b4e49d46c754965d90476ed)

5 years agodoc/man: add missing cephadm shell `--mount` option
Michael Fritch [Wed, 17 Jun 2020 16:26:32 +0000 (10:26 -0600)]
doc/man: add missing cephadm shell `--mount` option

also clean-up `--mount` help usage

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 00baed29f52965e17bb0a7d9db7f9a5b0f696290)

5 years agocephadm: skip any invalid fsid(s) during infer
Michael Fritch [Mon, 15 Jun 2020 21:22:23 +0000 (15:22 -0600)]
cephadm: skip any invalid fsid(s) during infer

Fixes: https://tracker.ceph.com/issues/45999
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d2e8b812051323cdea0d594df1d2ae2cb3e287b1)

5 years agocephadm: sort the list of inferred fsids
Michael Fritch [Mon, 15 Jun 2020 21:22:08 +0000 (15:22 -0600)]
cephadm: sort the list of inferred fsids

$ cephadm shell
ERROR: Cannot infer an fsid, one must be specified: ['1d5df33f-eb94-4a4f-b192-1d5e770ed0e7', 'unknown']
$ cephadm shell
ERROR: Cannot infer an fsid, one must be specified: ['unknown', '1d5df33f-eb94-4a4f-b192-1d5e770ed0e7']

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 320956eb5ea5a43f0a0cd93fe580bc8d699eff1b)

5 years agomgr/cephadm: annotate scheduling code with comments
Joshua Schmid [Mon, 15 Jun 2020 10:13:25 +0000 (12:13 +0200)]
mgr/cephadm: annotate scheduling code with comments

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 856ab3bdcf9a4ee364377c569490cca8094a4b04)

5 years agodoc/cephadm: document pool requirement for NFS-Ganesha service
Kiefer Chang [Tue, 16 Jun 2020 03:33:36 +0000 (11:33 +0800)]
doc/cephadm: document pool requirement for NFS-Ganesha service

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 71140f47e50d4aa95aa56996e9bafbdf6ad65b14)

5 years agocephadm: UX: Change error message when 'orch host add <host>' fails
Adam King [Thu, 11 Jun 2020 18:03:24 +0000 (14:03 -0400)]
cephadm: UX: Change error message when 'orch host add <host>' fails

Instead of printing out a traceback if adding the host fails
during bootstrapping process, should now print error message
telling user host failed to be added

Fixes: https://tracker.ceph.com/issues/45097
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 0e2dd36aec24f54d51af5551a75a184fdefd325d)

5 years agocephadm: strip whitespace from iscsi version
Michael Fritch [Thu, 11 Jun 2020 21:03:25 +0000 (15:03 -0600)]
cephadm: strip whitespace from iscsi version

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit f23649cb5412735e37f3775ebb086f1dc6c7d235)

5 years agopython-common: validate the service_id during apply
Michael Fritch [Mon, 8 Jun 2020 23:58:01 +0000 (17:58 -0600)]
python-common: validate the service_id during apply

the service_id needs to be validated during `orch apply`, but not during
`orch daemon add`

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit c83144517caaf217f7f10573842f12472bef1cc2)

5 years agopython-common: Add missing IscsiServiceSpec test
Michael Fritch [Mon, 8 Jun 2020 22:32:53 +0000 (16:32 -0600)]
python-common: Add missing IscsiServiceSpec test

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit dcf7fb520e3e55fbb5daf035c0cb7525e899b5b0)

5 years agopython-common: Add NFSServiceSpec validate
Michael Fritch [Mon, 8 Jun 2020 22:31:23 +0000 (16:31 -0600)]
python-common: Add NFSServiceSpec validate

the ServiceSpec needs to be validated during `orch apply`, but not
during `orch daemon add`

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 45391a1270178de87c6d2305f657809d5e1e6072)

5 years agocephadm: only SIGKILL once during timeout
Michael Fritch [Fri, 12 Jun 2020 14:24:16 +0000 (08:24 -0600)]
cephadm: only SIGKILL once during timeout

no need to continually SIGKILL a process that is already exiting

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 1b637144a6bbbeb752f1a006ce0f7647b084783a)

5 years agocephadm: add profile log line to Popen wrappers
Michael Fritch [Fri, 12 Jun 2020 13:59:55 +0000 (07:59 -0600)]
cephadm: add profile log line to Popen wrappers

add debug log line to profile the Popen wrapper read loop
exec runtime, exitcode, stop, fds to read, etc.

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 49887ab4554576249fe6c205a46bff2a674b5ec2)

5 years agocephadm: increase is_available timeout 30s -> 60s
Michael Fritch [Tue, 9 Jun 2020 20:35:46 +0000 (14:35 -0600)]
cephadm: increase is_available timeout 30s -> 60s

bootstrap fails because `ceph -s` might take longer
than 30 sec to return on resource limited hardware

Fixes: https://tracker.ceph.com/issues/45961
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit de734aa05fdad770c96c70d4b1b6cdddc98ce71b)

5 years agodoc/cephadm: Add chapter about FQDNs
Sebastian Wagner [Fri, 5 Jun 2020 10:42:54 +0000 (12:42 +0200)]
doc/cephadm: Add chapter about FQDNs

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 55e608d796952881083f3620c91edb5596da8220)

5 years agocephadm: call `podman rm --storage`
Sebastian Wagner [Wed, 10 Jun 2020 12:20:20 +0000 (14:20 +0200)]
cephadm: call `podman rm --storage`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit decfbca835ae0a2f03ae169f79fafa1d0babbbcb)

5 years agostop.sh: Remove cephadm deployed daemons
Varsha Rao [Mon, 8 Jun 2020 10:51:16 +0000 (16:21 +0530)]
stop.sh: Remove cephadm deployed daemons

Fixes: https://tracker.ceph.com/issues/44746
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 4930dc71b5d808c987a5d5f1d8ed62c8f0c87765)

5 years agocephadm: Manually remove containers
Sebastian Wagner [Tue, 12 May 2020 12:07:32 +0000 (14:07 +0200)]
cephadm: Manually remove containers

This fixes:
```
Error: error creating container storage: the container name "ceph-<fsid>-mon.b" is already in use by "<container-id>". You have to remove that container to be able to reuse that name.: that name is already in use
```

Relates to https://tracker.ceph.com/issues/44990

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit b3fbc0329c15d0a7d73d9e0ad6f0065d724b12a7)

5 years agoMerge pull request #35988 from votdev/adapt_cephadm_vagrant
Sebastian Wagner [Tue, 14 Jul 2020 09:04:14 +0000 (11:04 +0200)]
Merge pull request #35988 from votdev/adapt_cephadm_vagrant

octopus: mgr/cephadm: Adapt Vagrantfile to use octopus instead of master repo on shaman

Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #36063 from varshar16/wip-update-nfs-doc-backport
Nathan Cutler [Tue, 14 Jul 2020 04:26:13 +0000 (06:26 +0200)]
Merge pull request #36063 from varshar16/wip-update-nfs-doc-backport

octopus: Update nfs-ganesha package requirements doc backport

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #36061 from idryomov/wip-krbd-58-options-octopus
Ilya Dryomov [Mon, 13 Jul 2020 14:03:07 +0000 (16:03 +0200)]
Merge pull request #36061 from idryomov/wip-krbd-58-options-octopus

octopus: rbd: recognize crush_location, read_from_replica and compression_hint map options

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agodoc: Update nfs-ganesha package requirements 36063/head
Varsha Rao [Fri, 10 Jul 2020 11:25:41 +0000 (16:55 +0530)]
doc: Update nfs-ganesha package requirements

Fixes: https://tracker.ceph.com/issues/46449
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 16900045f4729ad6044ba60bd84dc5d1c0591c14)

5 years agoqa/suites/krbd: turn on balanced reads for the fsx subsuite 36061/head
Ilya Dryomov [Thu, 9 Jul 2020 15:25:45 +0000 (17:25 +0200)]
qa/suites/krbd: turn on balanced reads for the fsx subsuite

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit d15e0cad1a6c1912820c43463cd8f8576968a870)

5 years agotest/librbd/fsx: respect rbd_default_map_options in krbd_open()
Ilya Dryomov [Thu, 9 Jul 2020 20:27:41 +0000 (22:27 +0200)]
test/librbd/fsx: respect rbd_default_map_options in krbd_open()

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit b29dfc4624f3b8286d345ec62894fa70c5f6cf9b)

5 years agorbd: recognize compression_hint map option
Ilya Dryomov [Wed, 17 Jun 2020 12:13:12 +0000 (14:13 +0200)]
rbd: recognize compression_hint map option

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 4983eabd6fe75bb6f669d9d18388349f342a5d27)

5 years agorbd: recognize crush_location and read_from_replica map options
Ilya Dryomov [Wed, 17 Jun 2020 12:12:01 +0000 (14:12 +0200)]
rbd: recognize crush_location and read_from_replica map options

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit e3874a25f0e828e2a6bd8735dbeb14197008896c)

5 years agoMerge pull request #36050 from smithfarm/wip-46307-octopus
Nathan Cutler [Sat, 11 Jul 2020 10:39:03 +0000 (12:39 +0200)]
Merge pull request #36050 from smithfarm/wip-46307-octopus

octopus: tests: unittest_lockdep: skip lockdep test if CEPH_DEBUG_MUTEX is not defined

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agotest/unittest_lockdep: skip lockdep test if CEPH_DEBUG_MUTEX is not defined 36050/head
Kefu Chai [Tue, 30 Jun 2020 15:15:44 +0000 (23:15 +0800)]
test/unittest_lockdep: skip lockdep test if CEPH_DEBUG_MUTEX is not defined

this change addresses a regression introduced by
2dc50b5f91476cf10429dbcdd52b00e32f599d5c

Fixes: https://tracker.ceph.com/issues/46267
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit fb74d5443a289c5235210f4c0f1500f2a90cb047)

5 years agoMerge pull request #35877 from ivancich/octopus-rgw-ordered-listing-stuck
Yuri Weinstein [Fri, 10 Jul 2020 18:51:17 +0000 (11:51 -0700)]
Merge pull request #35877 from ivancich/octopus-rgw-ordered-listing-stuck

octopus: rgw: fix bug where ordered bucket listing gets stuck

Reviewed-by: Adam Emerson <aemerson@redhat.com>
5 years agoMerge pull request #35796 from callithea/wip-45786-octopus
Lenz Grimmer [Fri, 10 Jul 2020 14:35:24 +0000 (16:35 +0200)]
Merge pull request #35796 from callithea/wip-45786-octopus

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Ishan Rai <ishanrai05@gmail.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #35926 from rhcs-dashboard/wip-46354-octopus
Lenz Grimmer [Fri, 10 Jul 2020 13:54:16 +0000 (15:54 +0200)]
Merge pull request #35926 from rhcs-dashboard/wip-46354-octopus

octopus: mgr/dashboard: Display users current bucket quota usage

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
5 years agomgr/dashboard: Display users current bucket quota usage 35926/head
Avan Thakkar [Fri, 17 Apr 2020 08:51:48 +0000 (14:21 +0530)]
mgr/dashboard: Display users current bucket quota usage
Fixes: https://tracker.ceph.com/issues/45011
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 966d887f7a5e0765b4210ab4edcb1cea3e03ac35)
(cherry picked from commit 4fabba0bb772d480dcddc83272c83e7714726fc1)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts
        - Replace cd-usage-bar totalBytes and usedBytes with total and bytes
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
5 years agoMerge pull request #35892 from callithea/wip-46308-octopus
Lenz Grimmer [Fri, 10 Jul 2020 09:58:03 +0000 (11:58 +0200)]
Merge pull request #35892 from callithea/wip-46308-octopus

octopus: mgr/dashboard: Display check icon instead of true|false in various datatables

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agomgr/cephadm: Adapt Vagrantfile to use octopus instead of master repo on shaman 35988/head
Volker Theile [Thu, 9 Jul 2020 10:08:20 +0000 (12:08 +0200)]
mgr/cephadm: Adapt Vagrantfile to use octopus instead of master repo on shaman

Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #35748 from ifed01/wip-ifed-better-bluefs-stats-octopus
Igor Fedotov [Thu, 9 Jul 2020 09:23:25 +0000 (12:23 +0300)]
Merge pull request #35748 from ifed01/wip-ifed-better-bluefs-stats-octopus

octopus:os/bluestore: improve/fix bluefs stats reporting

5 years agoMerge pull request #35847 from callithea/wip-46171-octopus
Lenz Grimmer [Thu, 9 Jul 2020 07:56:39 +0000 (09:56 +0200)]
Merge pull request #35847 from callithea/wip-46171-octopus

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoos/bluestore: show file count for 'bluefs-stats' 35748/head
Igor Fedotov [Wed, 15 Apr 2020 13:43:21 +0000 (16:43 +0300)]
os/bluestore: show file count for 'bluefs-stats'

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 974906c2b48dee61faf2cffcb6a7f36b8b75fe59)

 Conflicts:
src/os/bluestore/BlueFS.h - trivial

5 years agobluestore/bluestore-tool: add bluefs-stats command
Igor Fedotov [Wed, 15 Apr 2020 13:15:32 +0000 (16:15 +0300)]
bluestore/bluestore-tool: add bluefs-stats command

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit b411594a6130dcfa8e97ef5e8b292aadb87d0a83)

5 years agobluestore/bluestore_tool: fix execute_command return handling
Igor Fedotov [Wed, 15 Apr 2020 14:05:17 +0000 (17:05 +0300)]
bluestore/bluestore_tool: fix execute_command return handling

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit edcbc66844858b4e5192f5f9f9577a1711eec4f9)

5 years agoos/bluestore/store_test: fix execute_command return handling
Igor Fedotov [Wed, 15 Apr 2020 13:57:11 +0000 (16:57 +0300)]
os/bluestore/store_test: fix execute_command return handling

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 82e501b7fcebdd1ded159c7f431bbcc906fec256)

5 years agoos/bluestore: fix incomplete 'bluestore bluefs stats' cmd rename
Igor Fedotov [Wed, 15 Apr 2020 13:02:15 +0000 (16:02 +0300)]
os/bluestore: fix incomplete 'bluestore bluefs stats' cmd rename

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit b253e2d2ba08a2b169eb3a3f656c6c71f2e77642)

5 years agoMerge pull request #35799 from sseshasa/wip-46229-octopus
Yuri Weinstein [Wed, 8 Jul 2020 19:34:49 +0000 (12:34 -0700)]
Merge pull request #35799 from sseshasa/wip-46229-octopus

octopus: mon/OSDMonitor: Reset grace period if failure interval exceeds a threshold.

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #35793 from callithea/wip-46183-octopus
Yuri Weinstein [Wed, 8 Jul 2020 19:34:20 +0000 (12:34 -0700)]
Merge pull request #35793 from callithea/wip-46183-octopus

octopus: mgr/DaemonServer.cc: make 'config show' on fsid work

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #35737 from neha-ojha/wip-46165-octopus
Yuri Weinstein [Wed, 8 Jul 2020 19:32:18 +0000 (12:32 -0700)]
Merge pull request #35737 from neha-ojha/wip-46165-octopus

octopus: osd: make message cap option usable again

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Vikhyat Umrao <vikhyat@redhat.com>
5 years agoMerge pull request #35797 from callithea/wip-45475-octopus
Yuri Weinstein [Wed, 8 Jul 2020 19:28:19 +0000 (12:28 -0700)]
Merge pull request #35797 from callithea/wip-45475-octopus

octopus: qa: mgr/dashboard: Replace Telemetry module in REST API test

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
5 years agoMerge pull request #35794 from callithea/wip-46117-octopus
Yuri Weinstein [Wed, 8 Jul 2020 19:26:56 +0000 (12:26 -0700)]
Merge pull request #35794 from callithea/wip-46117-octopus

octopus: mgr: fix race between module load and notify

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agoMerge pull request #35766 from callithea/wip-46173-octopus
Yuri Weinstein [Wed, 8 Jul 2020 19:25:55 +0000 (12:25 -0700)]
Merge pull request #35766 from callithea/wip-46173-octopus

octopus: mgr/dashboard: allow preserving OSD IDs when deleting OSDs

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #35720 from idryomov/wip-msgr21-octopus
Yuri Weinstein [Wed, 8 Jul 2020 19:24:54 +0000 (12:24 -0700)]
Merge pull request #35720 from idryomov/wip-msgr21-octopus

octopus: New msgr2 crc and secure modes (msgr2.1)

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #34943 from ifed01/wip-ifed-fix-spillover-octopus
Yuri Weinstein [Wed, 8 Jul 2020 19:21:23 +0000 (12:21 -0700)]
Merge pull request #34943 from ifed01/wip-ifed-fix-spillover-octopus

octopus: test/store_test: refactor bluestore spillover test

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
5 years agoMerge PR #35499 into octopus
Patrick Donnelly [Wed, 8 Jul 2020 14:58:27 +0000 (07:58 -0700)]
Merge PR #35499 into octopus

* refs/pull/35499/head:
qa/tasks/test_nfs: Add test for cluster info
mgr/volumes/nfs: Add cluster show info command
volumes/fs/nfs: Don't parse rados export objects during FSExport init
pybind/mgr/volumes/nfs: Fix flake8 errors
qa/tasks/test_nfs: Add todo note for cluster update test
qa/tasks/cephfs/test_nfs: Add test for get and list detailed export
qa/tasks/cephfs/test_nfs: Add test for export user id
qa/tasks/cephfs/test_nfs: Add description for each test
doc/cephfs: Add list and get export usage
qa/tasks/cephfs: Add tests for export create with non-existing fsname and cluster id
qa/tasks/cephfs: Add tests for invalid cluster id, export type and modify list cluster
qa/tasks/cephfs: Add test for listing exports
pybind/mgr/volumes/nfs: Reorder FSExport and NFSCluster class methods
mgr/volumes/nfs: Set pool_namespace and cluster_id through decorator
mgr/volumes/nfs: Check cluster availability in export command methods
mgr/volumes/nfs: Misc changes to export get and ls command
qa/tasks/cephfs: Add test for nfs cluster ls command
mgr/volumes/nfs: Add nfs cluster ls command
mgr/volumes/nfs: Remove 'ganesha-' prefix from orch returned service id
qa/tasks/cephfs: Add test to check if export is available on restarting mgr
mgr/volumes/nfs: get export in a nfs cluster
mgr/volumes/nfs: list exports within a ganesha cluster
mgr/volumes/nfs: Check if cluster exists before creating exports
mgr/volumes/nfs: Fetch exports in persistent way if mgr is restarted
mgr/volume/nfs: allow only [A-Za-z0-9-_.] characters
qa/tasks/cephfs: Add idempotency test for nfs commands
mgr/volumes/nfs: Reorder imports
qa/tasks/cephfs/test_nfs.py: flake8 fixes
qa/tasks/cephfs/nfs: Poll for max 60 seconds to ensure removal of ganesha services
vstart: just use ganesha.nfsd that's in $PATH
vstart: Add ip value to nfs mount information
pybind/mgr/volumes/nfs: Remove unused cephfs module
mgr/volumes/nfs: Ignore if ganesha disconnects
mgr/volumes/nfs: use f-string for creating Exception
vstart: allow specifying a different ganesha binary
vstart: handle multiple ganesha's more sanely
vstart.sh: update comment to use ganesha from CentOS Storage SIG
vstart: set $CEPH_CONF when running ganesha-rados-grace
vstart: Support deployment of ganesha daemon by cephadm with NFS option.
mgr/test_orchestrator: List nfs daemon
qa/tasks/cephfs: Enable multiple exports tests
mgr/nfs: Instead of 'auth del' use 'auth rm'
qa/tasks/cephfs: Don't enable cephadm in TestNFS
qa/tasks/cephfs: Add tests for nfs exports
mgr/volumes/nfs: Fix idempotency of cluster and export commands
mgr/volumes/nfs: Fix incorrect read only access_type value
mgr/fs/nfs: Use check_mon_command() instead of mon_command()
qa/cephfs: Add tests for nfs
mgr/volumes/nfs: Remove type option from export create interface
vstart: Instead of CACHEINODE use MDCACHE
mgr/volumes: Rearrange nfs export interface
mgr/volumes/nfs: Delete common config object on cluster deletion
mgr/volumes/nfs: Delete all exports on cluster deletion
mgr/volumes: Make nfs create export interface idempotent
vstart: Add watch url for conf-nfs object
mgr/volumes/nfs: Delete user on removing export
mgr/volumes: Create user for given path and fs
vstart: Ensure cephadm and NFS does not conflict
vstart: Update details about ganesha packages
mgr/volumes/nfs: Add delete cephfs export command
mgr/volumes/nfs: Add RADOS notify for common config object
mgr/volumes/nfs: Pass cluster_id directly to NFSCluster {create, update, delete} methods
mgr/volumes: Add nfs cluster delete interface
mgr/volumes: Add nfs cluster update interface
vstart: Enable test_orchestrator in start_ganesha()
mgr/volumes: Add placement option to create nfs cluster interface
mgr/volumes/nfs: Change common ganesha config object name to 'conf-nfs.ganesha-<cluster_id>'
mgr/volumes/nfs: Call orch nfs apply
mgr/volumes: Add a note about placement option in nfs cluster create
mgr/volumes: Remove unused typing module
mgr/volumes: Make cluster id option mandatory in nfs create export
mgr/volumes: Update nfs cluster and export interface
vstart: Update the nfs cluster create and export interface
mgr/volumes: Remove GaneshaConf and NFSConfig class
mgr/volumes: Create multiple CephFS exports
mgr/volumes: Move ganesha common config to vstart
mgr/volumes/nfs: Fix mypy errors
mgr/volumes/nfs: Update the export class to remove unecessary config options
mgr/volumes: Remove dependency on dashboard ganesha module
vstart: Use random port instead of default Ganesha port
vstart: Use "NFS" instead "GANESHA" for starting nfs ganesha clusters
mgr/volumes: Improve readability of ganesha common config
vstart: Add note about mounting cephfs exports
src/vstart: Set CEPH_CONF environment variables
mgr/volumes/fs: Update default ganesha conf options
doc: Add document about fs nfs interface to create CephFS exports
vstart: Update fs nfs export create command
mgr/volumes: Update nfs export create and delete command
mgr/volumes: Remove create_rados_pool method
mgr/volumes: Changes to nfs export delete and create
mgr/volumes: While creating nfs-ganesha user update its cap
mgr/volumes: Update caps for new user created and add it's key to keyring
vstart: Update vstart according to cluster create command
mgr/volumes: Add Ganesha common config
mgr/volumes: Create NFSConfig class
mgr/volumes: Add command to create nfs-ganesha clusters
mgr: Create pool for nfs ganesha recovery
mgr: Add "ceph fs nfs delete <export_id>" to delete exports
mgr: Add command to create exports for nfs-ganesha

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoqa/tasks/test_nfs: Add test for cluster info 35499/head
Varsha Rao [Tue, 30 Jun 2020 10:55:20 +0000 (16:25 +0530)]
qa/tasks/test_nfs: Add test for cluster info

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 93aa5e4012e232d935884a8c69396684efc274e3)

5 years agomgr/volumes/nfs: Add cluster show info command
Varsha Rao [Mon, 22 Jun 2020 18:38:28 +0000 (00:08 +0530)]
mgr/volumes/nfs: Add cluster show info command

Fixes: https://tracker.ceph.com/issues/45743
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 1faed4b1aab736d63590b069aa0c1739a380f058)

5 years agovolumes/fs/nfs: Don't parse rados export objects during FSExport init
Patrick Donnelly [Sat, 27 Jun 2020 00:00:46 +0000 (17:00 -0700)]
volumes/fs/nfs: Don't parse rados export objects during FSExport init

Instead we can do it if any export commands are used. This fixes ImportError
raised when FSExport is initialized with cephadm module disabled.

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 4ebb2581d655ae903d42942b4ef1f2c3c6fe5b8a)

5 years agopybind/mgr/volumes/nfs: Fix flake8 errors
Varsha Rao [Thu, 25 Jun 2020 07:03:04 +0000 (12:33 +0530)]
pybind/mgr/volumes/nfs: Fix flake8 errors

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 4da75816754e888f7c4a7ac7375039763b5f9a35)

5 years agoqa/tasks/test_nfs: Add todo note for cluster update test
Varsha Rao [Thu, 25 Jun 2020 06:53:39 +0000 (12:23 +0530)]
qa/tasks/test_nfs: Add todo note for cluster update test

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit d7396fdc0f0950133ab0bfc431b43213d2727960)

5 years agoqa/tasks/cephfs/test_nfs: Add test for get and list detailed export
Varsha Rao [Tue, 23 Jun 2020 18:25:46 +0000 (23:55 +0530)]
qa/tasks/cephfs/test_nfs: Add test for get and list detailed export

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 5f506e39695c6f8f7df103331f0675bb3d2d0c23)

5 years agoqa/tasks/cephfs/test_nfs: Add test for export user id
Varsha Rao [Tue, 23 Jun 2020 18:17:43 +0000 (23:47 +0530)]
qa/tasks/cephfs/test_nfs: Add test for export user id

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 1aa2a660bdf2ae4d523908ada1a3cf0095700a86)

5 years agoqa/tasks/cephfs/test_nfs: Add description for each test
Varsha Rao [Fri, 19 Jun 2020 17:36:12 +0000 (23:06 +0530)]
qa/tasks/cephfs/test_nfs: Add description for each test

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit dfa3ab43496ca790af5cba89ee5051def4149c88)

5 years agodoc/cephfs: Add list and get export usage
Varsha Rao [Tue, 16 Jun 2020 10:29:19 +0000 (15:59 +0530)]
doc/cephfs: Add list and get export usage

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 55fd634e881d07c633af97c6ced35054bf121ec8)

5 years agoqa/tasks/cephfs: Add tests for export create with non-existing fsname and cluster id
Varsha Rao [Tue, 16 Jun 2020 10:04:36 +0000 (15:34 +0530)]
qa/tasks/cephfs: Add tests for export create with non-existing fsname and cluster id

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit eab60b5fad6d2e0166d40f255b9507eada831b87)

5 years agoqa/tasks/cephfs: Add tests for invalid cluster id, export type and modify list cluster
Varsha Rao [Tue, 16 Jun 2020 08:45:22 +0000 (14:15 +0530)]
qa/tasks/cephfs: Add tests for invalid cluster id, export type and modify list cluster

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 285ab1b4ae7a378a885661ff92e3400d23c26317)

5 years agoqa/tasks/cephfs: Add test for listing exports
Varsha Rao [Mon, 15 Jun 2020 19:09:58 +0000 (00:39 +0530)]
qa/tasks/cephfs: Add test for listing exports

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 9418b42b29792af294fb8696a4957b3072a87016)

5 years agopybind/mgr/volumes/nfs: Reorder FSExport and NFSCluster class methods
Varsha Rao [Tue, 16 Jun 2020 07:09:45 +0000 (12:39 +0530)]
pybind/mgr/volumes/nfs: Reorder FSExport and NFSCluster class methods

To maintain consistency and improve readability.

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit ed20bd8693dcc26c64774c169e23d2af912702a4)

5 years agomgr/volumes/nfs: Set pool_namespace and cluster_id through decorator
Varsha Rao [Tue, 16 Jun 2020 06:31:05 +0000 (12:01 +0530)]
mgr/volumes/nfs: Set pool_namespace and cluster_id through decorator

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 2692a94d690faf857de96ad1f86520f00d268979)

5 years agomgr/volumes/nfs: Check cluster availability in export command methods
Varsha Rao [Mon, 15 Jun 2020 15:47:59 +0000 (21:17 +0530)]
mgr/volumes/nfs: Check cluster availability in export command methods

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 9d8304546746222b2c6d1057fb4ed6dfe0f130c1)

5 years agomgr/volumes/nfs: Misc changes to export get and ls command
Varsha Rao [Mon, 15 Jun 2020 11:29:41 +0000 (16:59 +0530)]
mgr/volumes/nfs: Misc changes to export get and ls command

This patch does following changes:
* Add extra line before every class definition
* Reorder export dictionary
* Use _fetch_export() in get export command
* Remove cluster_id key from export dictionary if single export is deleted

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 310c7fbf7306428c7c72ff7b00ac198af5a5e2f0)

5 years agoqa/tasks/cephfs: Add test for nfs cluster ls command
Varsha Rao [Thu, 11 Jun 2020 05:27:50 +0000 (10:57 +0530)]
qa/tasks/cephfs: Add test for nfs cluster ls command

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit eb2cd16fbe3d6cb5aa9102c09baac500b617f178)

5 years agomgr/volumes/nfs: Add nfs cluster ls command
Varsha Rao [Thu, 11 Jun 2020 05:18:56 +0000 (10:48 +0530)]
mgr/volumes/nfs: Add nfs cluster ls command

This commands provides list of deployed nfs clusters.

Fixes: https://tracker.ceph.com/issues/45742
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit b77c3eef7803c77f3596347dd1ca145e118e80b3)

5 years agomgr/volumes/nfs: Remove 'ganesha-' prefix from orch returned service id
Varsha Rao [Wed, 10 Jun 2020 13:00:24 +0000 (18:30 +0530)]
mgr/volumes/nfs: Remove 'ganesha-' prefix from orch returned service id

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 555da003fba28ae0546e4875694baf9964fc0a23)

5 years agoqa/tasks/cephfs: Add test to check if export is available on restarting mgr
Varsha Rao [Tue, 9 Jun 2020 07:44:36 +0000 (07:44 +0000)]
qa/tasks/cephfs: Add test to check if export is available on restarting mgr

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 3b554f2310878cd0d38db8acef982a4707111b04)

5 years agomgr/volumes/nfs: get export in a nfs cluster
Ramana Raja [Fri, 5 Jun 2020 10:38:14 +0000 (16:08 +0530)]
mgr/volumes/nfs: get export in a nfs cluster

Fixes: https://tracker.ceph.com/issues/45741
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 7dcefb158d2999715856ffa12cce9b92e6a12b23)

5 years agomgr/volumes/nfs: list exports within a ganesha cluster
Ramana Raja [Sun, 14 Jun 2020 16:33:16 +0000 (22:03 +0530)]
mgr/volumes/nfs: list exports within a ganesha cluster

List the pseudo paths of the exports within a ganesha cluster
with `nfs export ls <cluster ID>` command.

List all the details of the exports within a ganesha cluster
with `nfs export ls <cluster ID> --detailed` command.

Partially-fixes: https://tracker.ceph.com/issues/45741
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 6f8d20f2cbcdb5a0351a050abd6d66c0c840c108)

5 years agomgr/volumes/nfs: Check if cluster exists before creating exports
Varsha Rao [Fri, 5 Jun 2020 10:33:01 +0000 (16:03 +0530)]
mgr/volumes/nfs: Check if cluster exists before creating exports

Fixes: https://tracker.ceph.com/issues/45740
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit c13a40b99e7e8bfabd874be1482d5cbdf1237e5e)

5 years agomgr/volumes/nfs: Fetch exports in persistent way if mgr is restarted
Varsha Rao [Fri, 5 Jun 2020 09:14:59 +0000 (14:44 +0530)]
mgr/volumes/nfs: Fetch exports in persistent way if mgr is restarted

Fixes: https://tracker.ceph.com/issues/45740
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 162a57156f8ed654f3f39274961776f8633b722b)

5 years agomgr/volume/nfs: allow only [A-Za-z0-9-_.] characters
Ramana Raja [Thu, 4 Jun 2020 06:46:49 +0000 (12:16 +0530)]
mgr/volume/nfs: allow only [A-Za-z0-9-_.] characters

... for ganesha cluster names.

Fixes: https://tracker.ceph.com/issues/45744
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit 7ae24c22f6531c3450e56d59b2fba48689ef775f)

5 years agoqa/tasks/cephfs: Add idempotency test for nfs commands
Varsha Rao [Tue, 2 Jun 2020 11:34:19 +0000 (11:34 +0000)]
qa/tasks/cephfs: Add idempotency test for nfs commands

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 1a55888b1bab8039dba173c0bdc1923ac24f347a)