squid: cephfs,mon: don't disallow "mds/fs fail" when other MDS/FS has health warning#62052
Open
rishabh-d-dave wants to merge 9 commits intoceph:squidfrom
Open
squid: cephfs,mon: don't disallow "mds/fs fail" when other MDS/FS has health warning#62052rishabh-d-dave wants to merge 9 commits intoceph:squidfrom
rishabh-d-dave wants to merge 9 commits intoceph:squidfrom
Conversation
6dce48a to
c6ab226
Compare
|
This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved |
Contributor
|
@rishabh-d-dave please fix the merge conflict |
c6ab226 to
ffd2ca3
Compare
Contributor
Author
Done. |
Contributor
Author
|
jenkins test make check |
Contributor
Author
|
jenkins test api |
Contributor
Author
|
jenkins test make check |
Contributor
Author
|
jenkins test api |
Contributor
|
jenkins test make check |
Member
|
This PR is under test in https://tracker.ceph.com/issues/73331. |
|
This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved |
Contributor
|
@rishabh-d-dave This backport PR needs rebase, can u pls? |
Contributor
request for rebase @rishabh-d-dave ? |
Fixes: https://tracker.ceph.com/issues/69694 Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit 2217002) Conflicts: src/mon/MDSMonitor.h - The region where the patch had to be applied was different in squid compared to main branch.
MDS_CACHE_OVERSIZE warning. Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit 5a7834b)
health warning. Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit 95a812a) Conflicts: qa/tasks/cephfs/test_admin.py - File contents is somewhat different in squid vs main, leading to conflict.
Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit 7f5553c)
Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit cf68e49)
warnings. Fixes: https://tracker.ceph.com/issues/69707 Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit 0437952) Conflicts: src/mon/MDSMonitor.cc - region where the patch was to be applied is different in squid compared to main Conflicts: src/mon/MDSMonitor.h - The region where the patch has to be applied is different in Squid branch compared to the mainb branch.
tha generates MDS_CACHE_OVERSIZE warning. Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit d53be13)
health warnings. Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit 59511e6) Conflicts: qa/tasks/cephfs/test_admin.py - the region where the patch has to be applied is different in squid compared to squid.
Use const qualifier since warnings vector won't be modified by the helper methods and use also use a reference instead of a regular variable. Signed-off-by: Rishabh Dave <ridave@redhat.com> (cherry picked from commit 5ee8321)
ffd2ca3 to
5f15b48
Compare
Contributor
Author
|
jenkins test api |
Contributor
Author
|
jenkins test windows |
Contributor
|
jenkins retest this please |
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
4 participants
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 ticket: https://tracker.ceph.com/issues/70237
Backport ticket: https://tracker.ceph.com/issues/70235
Original PR: #61554
Contribution Guidelines
To sign and title your commits, please refer to Submitting Patches to Ceph.
If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.
When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an
xbetween the brackets:[x]. Spaces and capitalization matter when checking off items this way.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 dashboard cephadmjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume toxjenkins test windowsjenkins test rook e2e