pacific: cephadm Batch backport Febrary (2) #39623
Merged
Conversation
This file contains 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
Fixes: https://tracker.ceph.com/issues/46551 Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit e3fa11f)
For each host, note when we last applied each osdspec. Log the start time, not the end time. Signed-off-by: Sage Weil <sage@newdream.net> (cherry picked from commit 197a8ba)
Keep track of when the device inventory and/or state *changes*. Signed-off-by: Sage Weil <sage@newdream.net> (cherry picked from commit 2b7d8e1)
Be consistent! Signed-off-by: Sage Weil <sage@newdream.net> (cherry picked from commit 821f7e9)
This avoids a lot of useless work when the devices have not changed. Signed-off-by: Sage Weil <sage@newdream.net> (cherry picked from commit b129c13)
...and add 'osd.' prefix Signed-off-by: Sage Weil <sage@newdream.net> (cherry picked from commit 756bd77)
…pply" Right now it just gives a traceback. A message telling users they have not provided a proper service type would be more useful Signed-off-by: Adam King <adking@redhat.com> (cherry picked from commit b68675b)
depends on ceph#38854 Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com> (cherry picked from commit 96dcb15)
Signed-off-by: Kefu Chai <kchai@redhat.com> (cherry picked from commit fe4f440)
since we've dropped python 2 support Signed-off-by: Kefu Chai <kchai@redhat.com> (cherry picked from commit 9380de2)
Signed-off-by: Paul Cuzner <pcuzner@redhat.com> (cherry picked from commit 4588ad1)
Updated the orch status document to show the --detail option Signed-off-by: Paul Cuzner <pcuzner@redhat.com> (cherry picked from commit a4f4a67)
The worker_pool_size method has been removed and its functionality replaced by the cephadm 'available' function to help keep the interface model generic. Signed-off-by: Paul Cuzner <pcuzner@redhat.com> (cherry picked from commit 8c9cd76)
Signed-off-by: Paul Cuzner <pcuzner@redhat.com> (cherry picked from commit 83a25c5)
Signed-off-by: Paul Cuzner <pcuzner@redhat.com> (cherry picked from commit 7bed9cc)
github-actions
bot
added
build/ops
cephadm
core
dashboard
documentation
mgr
orchestrator
pybind
labels
|
I think that we need to add: And for this one we decide not to merge. it is correct? |
centos/rhel have podman 2, which does not like conflicting --cap-add and --privileged arguments. cephadm versions prior to 15.2.5 use both args, however, which means the rhel/centos upgrade test has to start at 15.2.5 to work at all on those distros (with the updated podman). Fixes: https://tracker.ceph.com/issues/48142 Signed-off-by: Sage Weil <sage@newdream.net> (cherry picked from commit 38e14f9)
Signed-off-by: Michael Fritch <mfritch@suse.com> (cherry picked from commit 3e503d1)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 54ac36e)
SpecStore.find is no longer used Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 9869b61)
We'd like to keep the spec in the store, while we're cleaning up all the daemons. Reason is to clean up the config and config-key store when the last daemon of a service is deleted. Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 1fcdad1)
If no daemon is deployed for a deleted service, purge it. Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit f73fdee)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 62267d2)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 745aa00)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 84ac0d3)
Also add a unit test Fixes: https://tracker.ceph.com/issues/48597 Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 30d03ee)
We do not want to have orphaned daemons at all. Thus apply services as unmanaged in order to run `ceph orch daemon add ...` later. Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit db5d3d4)
Placed all in the same location in order to make easy downstream modifications and future changes Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com> (cherry picked from commit ce24647) Conflicts: src/cephadm/cephadm
some services (notably iscsi and ha-rgw currently) rely on actions in prepare_create to setup their configuration even when being redeployed. This change makes sure prepare_create is called before redeploys and reconfigurations the same way it is done during initial deployment to avoid disrepencies. OSDs are skipped as they do not have a normal prepare_create Fixes: https://tracker.ceph.com/issues/48373 Signed-off-by: Adam King <adking@redhat.com> (cherry picked from commit 6fc6db2)
makes generate_config into an internal function for prepare_create Fixes: https://tracker.ceph.com/issues/48373 Signed-off-by: Adam King <adking@redhat.com> (cherry picked from commit 2c7f899)
Signed-off-by: Adam King <adking@redhat.com> (cherry picked from commit 71613e6)
We only need to call self.apply() Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 5a49f25)
`ceph daemon add [..]` are all the same thing Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 7f51e3a)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 1b4e9e6)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 1e3d98e)
Fixes: https://tracker.ceph.com/issues/49214 Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 02584d3)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit a9b947b)
Fixes: https://tracker.ceph.com/issues/45767 Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 5c872ac)
Fixes: https://tracker.ceph.com/issues/45833 Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com> (cherry picked from commit 4cb5014)
sebastian-philipp
force-pushed
the
pacific-backport-39259-39238-39261-38897-39193-38695-39266-39350-39153-37729-
branch
from
14bf5fe
to
f6e4b4f
Compare
|
changelog:
|
jmolmo
approved these changes
Feb 25, 2021
|
regression: #39649 |
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.
#39259 #39238 #39261 #38897 #39193 #38695 #39266 #39350 #39153 #37729 #39361 #38505 #39398 #39364 #39058 #38883 #38549 #39385 #39458 #39424 #39473 #39430 #39323 #39490 #39464 #39467 #39330 #38881 #39472
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox