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.

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

Syncing latest changes from upstream master for rook #660

Merged
merged 10 commits into from
May 30, 2024
Merged

Conversation

df-build-team
Copy link

PR containing the latest commits from upstream master branch

sp98 and others added 7 commits May 27, 2024 11:30
This PR adds a `settings` option in the `Module` struct
which can help users to futher customize the `balancer`
module with a differet mode.

Signed-off-by: sp98 <[email protected]>
This reduces the safe-to-remove retry interval from 1m to 15s.

Closes rook#14247

Signed-off-by: Brian Dowling <[email protected]>
Add a note to remove LimitNOFILE setting in containerd service configuration.

This setting causes multiple issues such as slow `ceph status` commands (and failing healthchecks),
various timeouts, and mons failing/timing out.

Upstream containerd already removed the setting. NixOS hasn't incorporated the change.

This note can be removed once NixOS/nixpkgs#313507 makes it to a stable release.

Signed-off-by: Onur Cakmak <[email protected]>
Currently we allow upgrade of other OSDs while migration
of OSD, due to change in backing store, is pending. This
will not work if the updated OSD ceph version does not support
the currently applied backing store. So rook will skip any
OSD upgrade if the OSD migration is pending.

Signed-off-by: sp98 <[email protected]>
…eout

osd: reduce safe-to-destroy retry timeout to 15s
docs: Add a note for NixOS and containerd
@df-build-team df-build-team requested a review from a team May 29, 2024 08:02
travisn and others added 3 commits May 29, 2024 10:44
mgr: setting balancer mode from cluster spec.
add generated csv changes

Signed-off-by: Ceph Jenkins <[email protected]>
@travisn
Copy link

travisn commented May 30, 2024

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 30, 2024
Copy link

openshift-ci bot commented May 30, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: df-build-team, travisn

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@travisn travisn merged commit 1f93f50 into master May 30, 2024
49 of 51 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants