Skip to content

Commit 1ed7403

Browse files
authored
Merge pull request #12074 from openshift-cherrypick-robot/cherry-pick-11873-to-release-4.17
[release-4.17] Add 1 mgr modules have recently crashed to ceph health fixes pattern
2 parents 499758b + 9392f21 commit 1ed7403

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

ocs_ci/utility/utils.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2492,11 +2492,11 @@ def check_ceph_health_not_ok():
24922492
sampler.wait_for_func_status(True)
24932493

24942494

2495-
def ceph_health_resolve_daemon_crash():
2495+
def ceph_health_resolve_crash():
24962496
"""
24972497
Fix ceph health issue with daemon crash
24982498
"""
2499-
log.warning("Trying to fix the issue with daemon crash by archiving crashes")
2499+
log.warning("Trying to fix the issue with crash by archiving crashes")
25002500
from ocs_ci.ocs.resources.pod import get_ceph_tools_pod
25012501

25022502
ct_pod = get_ceph_tools_pod()
@@ -2539,7 +2539,15 @@ def ceph_health_recover(health_status, namespace=None):
25392539
ceph_health_fixes = [
25402540
{
25412541
"pattern": r"daemons have recently crashed",
2542-
"func": ceph_health_resolve_daemon_crash,
2542+
"func": ceph_health_resolve_crash,
2543+
"func_args": [],
2544+
"func_kwargs": {},
2545+
"ceph_health_tries": 5,
2546+
"ceph_health_delay": 30,
2547+
},
2548+
{
2549+
"pattern": r"1 mgr modules have recently crashed",
2550+
"func": ceph_health_resolve_crash,
25432551
"func_args": [],
25442552
"func_kwargs": {},
25452553
"ceph_health_tries": 5,

0 commit comments

Comments
 (0)