octopus: cephadm batch backport August (2)#36748
Merged
sebastian-philipp merged 46 commits intoceph:octopusfrom Aug 24, 2020
Conversation
…ook receiver URLs Fixes: https://tracker.ceph.com/issues/46775 Signed-off-by: Volker Theile <vtheile@suse.com> (cherry picked from commit 4b87eeb)
Those files should generate fewer conflicts for now. Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 17db7ba)
Continue with other daemons, if one fails Fixes: https://tracker.ceph.com/issues/46748 Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 313e091)
Into: * `test_list_daemons` * `test_daemon_action` (now without listing daemons) Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 6fd599b)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit f500b8f)
We can't run daemon_check_post for the type, if a single daemon failed. Mainly cause `daemon_check_post` is run by service type. Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit fdaa009)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 7d3deb2)
This changes the logic in deploy_daemon_units() to add either `chown` calls for simple (ceph-disk style) OSDs, or to add `ceph-volume lvm activate` calls for LVM OSDs, rather than always adding both. When I was working on ceph#34703, I'd originally added an "osd_simple" flag to figure out what type of OSD was being adopted/deployed, but passing that around was kinda ugly, so was removed from that PR. This time around I'm checking if /etc/ceph/osd/$OSD_ID-$OSD_FSID.json.adopted-by-cephadm exists, which seems pretty safe IMO. My only concern with this method is: what happens if someone adopts a simple OSD, then later wants to migrate it to LVM. Presumably that's a destroy and recreate, keeping the same OSD ID? If that's true, then the JSON file probably still exists, so the subsequent create will do the wrong thing, i.e. will add `chown` calls, not `ceph-volume lvm activate` calls. Any/all feedback appreciated... Fixes: https://tracker.ceph.com/issues/46833 Signed-off-by: Tim Serong <tserong@suse.com> (cherry picked from commit 8112949)
My resons are: * This increase mypy coverage * Makes the code more discoverable. * Allowes us to have intelligent UpgradeState properties Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 3072b1d)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit ffc1fd6)
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com> (cherry picked from commit 70b11a1)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 9d0480d)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 289f37d)
There is just no way we can allow those calls to be synchornous: * All CLI commands are blocked, till the refresh completes. * ^C doesn't help at all, as it just kills the client Therefore they have to be scheduled in the bg. Fixes: https://tracker.ceph.com/issues/46813 Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 7189575)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit be3f513)
Signed-off-by: Varsha Rao <varao@redhat.com> (cherry picked from commit 4d6365b)
When 'set-user', 'set-pub-key' or 'set-priv-key' are called two times with the same value, we can ignore the second call. Signed-off-by: Ricardo Marques <rimarques@suse.com> (cherry picked from commit 4cbf587)
Make sure we don't mix daemon names, config entities and auth entities. Cause all of them don't mix well together. Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 01e2daf)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 6105d1b)
Turns out, the alias doesn't work for files. Fixes: https://tracker.ceph.com/issues/46701 Fixes: ``` $ ceph orch apply -i myfile.yaml ERROR: no such file or directory: myfile.yaml ``` Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> Signed-off-by: Zac Dover <zac.dover@gmail.com> (cherry picked from commit 75baae3)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 0bb0932)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit b7caeed)
Code related to creating and removing rados object has been rearranged abd modified. This patch introduces interface to set and reset user config. nfs cluster config set <clusterid> -i <config_file> nfs cluster config reset <clusterid> Fixes: https://tracker.ceph.com/issues/45747 Signed-off-by: Varsha Rao <varao@redhat.com> (cherry picked from commit 9535154)
Signed-off-by: Varsha Rao <varao@redhat.com> (cherry picked from commit 287da11)
Signed-off-by: Varsha Rao <varao@redhat.com> (cherry picked from commit bba2d66)
Signed-off-by: Michael Fritch <mfritch@suse.com> (cherry picked from commit 4ad0636)
Signed-off-by: Michael Fritch <mfritch@suse.com> (cherry picked from commit e05bf09)
Signed-off-by: Michael Fritch <mfritch@suse.com> (cherry picked from commit 4419c18)
This will be used to dry-run mgr/cephadm/upgrade.py Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit f44c1e7)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 50ecd89)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit d71f3b4)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 1c8cb20)
Signed-off-by: Joshua Schmid <jschmid@suse.de> (cherry picked from commit 1f8965f)
Signed-off-by: Joshua Schmid <jschmid@suse.de> (cherry picked from commit 0feae88)
Signed-off-by: Joshua Schmid <jschmid@suse.de> (cherry picked from commit eb1b37c)
Signed-off-by: Joshua Schmid <jschmid@suse.de> (cherry picked from commit 4109e98)
Signed-off-by: Joshua Schmid <jschmid@suse.de> (cherry picked from commit f8b8e6f)
Signed-off-by: Joshua Schmid <jschmid@suse.de> (cherry picked from commit ac5839b)
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com> (cherry picked from commit b59b480)
When removing daemons during a mgr/mds scale-down, prefer to remove standby daemons so the active daemon is not killed Fixes: https://tracker.ceph.com/issues/44252 Signed-off-by: Adam King <adking@redhat.com> (cherry picked from commit 0fbf12c)
This modification allows the user to create a new bootstrap cluster using a predefined SSl port for the dashboard.
If firewall is enabled, any new manager daemon deployed in new hosts will take care of open the required ports for all the services enabled in the manager.
Two new parameters for cephadm tool (aka binary or standalone):
Command bootstrap:
--ssl-dashboard-port SSL_DASHBOARD_PORT
Port number used to connect with dashboard using SSL
Command deploy:
--tcp-ports TCP_PORTS
List of tcp ports to open in the host firewall
Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit 08c4a53)
When alertmanager image has been customized and does not have a /etc/alertmanager directory, the uid/gid extraction fails. This change assumes that instead the /etc/prometheus directory exists and can be used to extract the uid and gid. Signed-off-by: Patrick Seidensal <pseidensal@suse.com> (cherry picked from commit d218de4)
Fixes other alertmanager containers which do not default to look for a configuration file in `/etc/alertmanager/alertmanager.yml`. Signed-off-by: Patrick Seidensal <pseidensal@suse.com> (cherry picked from commit cdd0ba1)
Fixes: https://tracker.ceph.com/issues/47009 Signed-off-by: Varsha Rao <varao@redhat.com> (cherry picked from commit 049afe5)
As MDS name should not start with numeric digit. Signed-off-by: Varsha Rao <varao@redhat.com> (cherry picked from commit 572f0ae)
Signed-off-by: Varsha Rao <varao@redhat.com> (cherry picked from commit 5c4e659)
Contributor
Author
mgfritch
approved these changes
Aug 21, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #36371, #36446, #36349, #36463, #36444, #36426, #36447, #36373, #36492, #36497, #36538, #36456, #36351, #36508, #36686, #36584, #36541, #36568, #36543, #36706, #36485, #36477, #36740, #36716, #36496
(no conflicts)