Skip to content

octopus: cephadm batch backport July (1)#35898

Merged
sebastian-philipp merged 56 commits intoceph:octopusfrom
sebastian-philipp:octopus-backport-35018-35472-35524-35412-35510-35493-35549-35547-35581-35567-35578-3563
Jul 14, 2020
Merged

octopus: cephadm batch backport July (1)#35898
sebastian-philipp merged 56 commits intoceph:octopusfrom
sebastian-philipp:octopus-backport-35018-35472-35524-35412-35510-35493-35549-35547-35581-35567-35578-3563

Conversation

@sebastian-philipp
Copy link
Contributor

@sebastian-philipp sebastian-philipp commented Jul 2, 2020

Backport of #35018, #35472, #35524, #35412, #35510, #35493, #35549, #35547, #35581, #35567, #35578, #35634, #35637, #35141, #35587, #35640, #35645, #35678, #35660, #35651, #35655, #35589, #35633, #35643, #35677, #35593, #35503, #35274, #35537, #35800, #35786, #35576, #35577, #35606, #35805, #35823

no conflicts anymore!

Conflicts:
src/pybind/mgr/test_orchestrator/dummy_data.json
src/pybind/mgr/test_orchestrator/module.py
qa/suites/rados/cephadm/workunits/task/test_orch_cli.yaml

due to #35499 not being merged yet.

@varshar16
Copy link
Contributor

NFS related conflicting prs and pr #35472 looks fine. Please do note changes to qa/suites/rados/cephadm/workunits/task/test_orch_cli.yaml from commit 1650257 is missing.

sebastian-philipp and others added 17 commits July 14, 2020 11:39
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 b3fbc03)
Fixes: https://tracker.ceph.com/issues/44746
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 4930dc7)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit decfbca)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 55e608d)
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 de734aa)
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 49887ab)
no need to continually SIGKILL a process that is already exiting

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 1b63714)
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 45391a1)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit dcf7fb5)
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 c831445)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit f23649c)
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 0e2dd36)
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 71140f4)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 856ab3b)
$ 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 320956e)
Fixes: https://tracker.ceph.com/issues/45999
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d2e8b81)
also clean-up `--mount` help usage

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 00baed2)
p-se and others added 26 commits July 14, 2020 11:39
Fixes: https://tracker.ceph.com/issues/45859

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 5719605)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 2b41d0a)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit cb92429)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f421825)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 5c91f1b)
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 68cfa10)
* Add test for new yaml representation

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 4ddb111)
* 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 cd6a488)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 4c7ad07)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit fd29e1c)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 888addc)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 87a1503)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1650257)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 5150e95)
Fixes: https://tracker.ceph.com/issues/46245
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 027b4e1)
The DriveGroupSpec is already part of the DriveSelection.

Fixes: https://tracker.ceph.com/issues/46231

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 1a48540)
When we create a ceph-iscsi daemon/continer in cephadm we create a user
and set some caps. Turns out we were a little too restrictive.

We were locking down to only access the pool that was given in the spec,
which happens to be the pool the iscsi config is stored. But in reality
we need to be able  to attach any rbd images which could exist in other
pools.

So this patch removes the `pool=` from the osd cap, so from:

   osd = allow rwx pool={spec.pool}

To:

   osd = allow rwx

Fixes: https://tracker.ceph.com/issues/46138
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit 8cf5125)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit c37412d)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit e60a2a5)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit a0c39f3)
reason is, we want to use this hook to schedule a
ceph.conf update for all hosts.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1cd4d0f)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit acdd26a)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit c18ad7c)
add the ability to use a non-root users for connecting to hosts, this user requires pass wordless sudo access

useful for clusters that have root ssh access disabled

Fixes: https://tracker.ceph.com/issues/44866
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit 1052b9d)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 37826d4)
Fixes: https://tracker.ceph.com/issues/46233

Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit 83ff831)
@sebastian-philipp sebastian-philipp force-pushed the octopus-backport-35018-35472-35524-35412-35510-35493-35549-35547-35581-35567-35578-3563 branch from f7a23fd to c4dae0a Compare July 14, 2020 09:40
@sebastian-philipp
Copy link
Contributor Author

@sebastian-philipp sebastian-philipp merged commit 2e806f2 into ceph:octopus Jul 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants