Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pacific: cephadm: Batch backport March (1) #39807

Merged
merged 72 commits into from Mar 10, 2021
Merged

pacific: cephadm: Batch backport March (1) #39807

merged 72 commits into from Mar 10, 2021

Conversation

sebastian-philipp
Copy link
Contributor

@sebastian-philipp sebastian-philipp commented Mar 3, 2021 •
edited

Backport of #39495, #39630, #39536, #39537, #39415, #39421, #39420, #39474, #39562, #39613, #39649, #39614, #39551, #39644, #39714, #39648, #39733, #39760, #39744, #39612, #39352, #38915, #39722, #38995, #39739, #39730, #39770

Conflicts:
src/pybind/mgr/rook/module.py
doc/cephadm/index.rst

Added two missing commits from #39504

@sebastian-philipp sebastian-philipp requested review from a team as code owners March 3, 2021 13:38
@sebastian-philipp sebastian-philipp added this to the octopus milestone Mar 3, 2021
@sebastian-philipp sebastian-philipp requested review from votdev, s0nea and avanthakkar and removed request for a team March 3, 2021 13:38
@liewegas
Copy link
Member

liewegas commented Mar 3, 2021

jenkins test docs

@sebastian-philipp
Copy link
Contributor Author

sebastian-philipp commented Mar 3, 2021 •
edited 

Exception occurred:
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/src/pybind/mgr/rook/__init__.py", line 2, in <module>
    from .module import RookOrchestrator
  File "/home/jenkins-build/build/workspace/ceph-pr-docs/src/pybind/mgr/rook/module.py", line 163
    @handle_orch_error
    ^
Indentatio

-m volumes
rook/__init__.py:2: note: In module imported here:
rook/module.py:163: error: invalid syntax
Found 1 error in 1 file (checked 14 source files)
ERROR: InvocationError for command /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr/.tox/mypy/bin/mypy --config-file=../../mypy.ini -m cephadm -m dashboard -m mds_autoscaler -m mgr_module -m mgr_util -m mirroring -m orchestrator -m progress -m prometheus -m rook -m snap_schedule -m stats -m test_orchestrator -m volumes (exited with code 2)

@sebastian-philipp sebastian-philipp force-pushed the pacific-backport-39495-39630-39536-39537-39415-39421-39420-39474-39562-39613- branch from 4bce63f to 23fdd41 Compare March 4, 2021 10:36
jmolmo
jmolmo approved these changes Mar 4, 2021
View reviewed changes
Copy link
Member

@jmolmo jmolmo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For me seems to be ok the list of changes and changes to backport.
Once solved the build problems for the code and for docs is OK to merge in pacific.

@sebastian-philipp
Copy link
Contributor Author 

rook/__init__.py:2: note: In module imported here:
rook/module.py: note: In member "remove_service" of class "RookOrchestrator":
rook/module.py:392: error: Missing return statement
rook/module.py: note: In member "apply_mds" of class "RookOrchestrator":
rook/module.py:412: error: "apply_filesystem" of "RookCluster" does not return a value
rook/module.py: note: In member "apply_nfs" of class "RookOrchestrator":
rook/module.py:422: error: "apply_nfsgw" of "RookCluster" does not return a value
Found 3 errors in 1 file (checked 15 source files)
ERROR: InvocationError for command /home/jenkins-build/build/workspace/ceph-

@sebastian-philipp sebastian-philipp force-pushed the pacific-backport-39495-39630-39536-39537-39415-39421-39420-39474-39562-39613- branch from 23fdd41 to 904a3c6 Compare March 4, 2021 14:48
@smithfarm smithfarm modified the milestones: octopus, pacific Mar 7, 2021
@sebastian-philipp
Copy link
Contributor Author

failed:

2021-03-05T12:39:06.965 INFO:tasks.workunit.client.0.smithi075.stdout:Mar 05 12:38:58 smithi075 bash[42834]: Error: error parsing host port: invalid port number: strconv.Atoi: parsing " 9093": invalid syntax

@sebastian-philipp
Copy link
Contributor Author

changelog: added #39822

sebastian-philipp and others added 22 commits March 9, 2021 15:29
@sebastian-philipp
mgr/orch: adapt orchestrator CLI to new interface
8d3ccea 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit e4d7d76)
@sebastian-philipp
mgr/orch: Remove old tests
f952888 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit b6c770a)
@sebastian-philipp
mgr/cephadm: Adapt cephadm to new orch interface
c8a4db7 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 68030be)
@sebastian-philipp
mgr/rook: Adapt to new orch interface
4c5a79c 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 42d5c89)

Conflicts:
	src/pybind/mgr/rook/module.py
@sebastian-philipp
mgr/test_orchestrator: adapt to now orch interface
655ee31 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1ecb93a)
@sebastian-philipp
mgr/mds_autoscaler: adapt to now orch interface
e2a3732 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1d40632)
@sebastian-philipp
mgr/mds_autoscaler: Add to tox.ini
1430c3a 
Fixes: f69abe6
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit bca36ab)
@sebastian-philipp
mgr/dashboard: adapt to now orch interface
7b8a5fc 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit b92dc71)
@sebastian-philipp
mgr/selftest: adapt to now orch interface
a233de8 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 828992d)
@sebastian-philipp
doc/mgr/orchestrator_modules: adapt to now orch interface
3fd718c 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d529f1d)
@sebastian-philipp
mgr/volumes: adapt to now orch interface
9611bbe 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit a455dff)
@sebastian-philipp
mgr/test_orchestrator: Refactor create_osds
e8da497 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 0f22f24)
@sebastian-philipp
mgr/cephadm: add ok-to-stop functions for ceph client services
4d46751 
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 674912b)
@p-se @sebastian-philipp
cephadm: cephadm ls broken for SUSE downstream alertmanager container
38dbf45 
Fixes: https://tracker.ceph.com/issues/49506

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 8f0dae0)
@p-se @sebastian-philipp
cephadm: cephadm ls broken for SUSE downstream alertmanager container
440c0ad 
Fixes: https://tracker.ceph.com/issues/49506

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 3c222a8)
@p-se @sebastian-philipp
cephadm: remove unused imports
c8002f1 
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 0d55626)
@mgfritch @sebastian-philipp
cephadm: remove redundant ERROR during check-host
e587459 
```
ERROR: ERROR: No time synchronization is active
```

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit ace5d41)
@liewegas @sebastian-philipp
Revert "Merge PR ceph#39482 into master"
091ad21 
This reverts commit 9200b1e, reversing
changes made to e42bbba.

For running tests to narrow down the root cause of:
https://tracker.ceph.com/issues/49237

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit a16e46e)
@liewegas @sebastian-philipp
msg/Messenger: use random nonce if CEPH_USE_RANDOM_NONCE or pid == 1
d6fa4c3 
If we are in a container, then we do not have a unique pid, and need to
use a random nonce.  We normally detect this if our pid is 1, but that
doesn't work when we have a init process--we'll (probably?) have a small
pid (in my tests, the OSDs were getting pid 7).

To be safe, also check for an environment variable set by cephadm.

This avoids problems that arise when we don't have a unique address.

Fixes: https://tracker.ceph.com/issues/49534
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d18f608)
@liewegas @sebastian-philipp
cephadm: set CEPH_USE_RANDOM_NONCE if using --init
900ddeb 
This ensures that daemon messenger nonces don't collide by using PIDs that are
no longer unique for the IP address.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 576823b)
@liewegas @sebastian-philipp
cephadm: fix escaping/quoting of stderr-prefix arg for ceph daemons
3129561 
On some versions of podman doing

   --default-log-stderr-prefix="debug "

seems to work okay, but on others it does not, producing lines like

   /usr/bin/ceph-mon: "debug "2021-02-26T15:30:36.266+0000 7f3d8a955700  4 rocksdb:                    Options.db_write_buffer_size: 0

Quote things properly for the unit.run bash script.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 3ea514c)
@mgfritch @sebastian-philipp
cephadm: split custom container args into argv
732027a 
introduced by usage of `shlex` in 3ea514c

Fixes: https://tracker.ceph.com/issues/49590
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 1474477)
@sebastian-philipp sebastian-philipp force-pushed the pacific-backport-39495-39630-39536-39537-39415-39421-39420-39474-39562-39613- branch from b66e292 to 732027a Compare March 9, 2021 14:30
@sebastian-philipp
Copy link
Contributor Author

changelog:

Drop Revert "qa/suites/rados/cephadm: drop 20.04 podman" from this PR

@sebastian-philipp
Copy link
Contributor Author

next issue: https://paste.opensuse.org/62480748

@sebastian-philipp
Copy link
Contributor Author

https://pulpito.ceph.com/swagner-2021-03-10_16:24:27-rados:cephadm-wip-swagner2-testing-2021-03-09-1019-pacific-distro-basic-smithi/

@sebastian-philipp
Copy link
Contributor Author

jenkins test make check

@liewegas liewegas merged commit 2768f3b into ceph:pacific Mar 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liewegas liewegas liewegas approved these changes

@jmolmo jmolmo jmolmo approved these changes

@avanthakkar avanthakkar avanthakkar approved these changes

@votdev votdev Awaiting requested review from votdev

@s0nea s0nea Awaiting requested review from s0nea

Assignees
No one assigned
Labels
ceph-volume cephadm cephfs Ceph File System core dashboard documentation mgr needs-qa orchestrator pybind ready-to-merge
Projects
None yet
Milestone
pacific
8 participants
@sebastian-philipp @liewegas @jmolmo @avanthakkar @smithfarm @adk3798 @p-se @mgfritch