Skip to content

Commit

Permalink
revert PR 8411 - remove ceph crashes after upgrade
Browse files Browse the repository at this point in the history
Signed-off-by: vavuthu <[email protected]>
  • Loading branch information
vavuthu committed Nov 16, 2023
1 parent 4d52862 commit eed6c9c
Showing 1 changed file with 1 addition and 20 deletions.
21 changes: 1 addition & 20 deletions ocs_ci/ocs/resources/storage_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,8 @@
)
from ocs_ci.utility.retry import retry
from ocs_ci.utility.rgwutils import get_rgw_count
from ocs_ci.utility.utils import (
remove_ceph_crashes,
run_ceph_health_cmd,
run_cmd,
TimeoutSampler,
)
from ocs_ci.utility.utils import run_cmd, TimeoutSampler
from ocs_ci.utility.decorators import switch_to_orig_index_at_last
from time import sleep
from ocs_ci.helpers.helpers import storagecluster_independent_check

log = logging.getLogger(__name__)
Expand Down Expand Up @@ -649,19 +643,6 @@ def ocs_install_verification(
health_check_tries = 20
health_check_delay = 30
if post_upgrade_verification:
# remove ceph crashes after upgrade due to bug https://bugzilla.redhat.com/show_bug.cgi?id=2233762
# and https://bugzilla.redhat.com/show_bug.cgi?id=2237861
log.info(
"Sleeping for 600 seconds to allow crash reports to report to ceph health"
)
sleep(600)
ceph_health = run_ceph_health_cmd(
namespace=config.ENV_DATA["cluster_namespace"]
)
if "daemons have recently crashed" in ceph_health:
# remove crashes on ceph
remove_ceph_crashes(ct_pod)

# In case of upgrade with FIO we have to wait longer time to see
# health OK. See discussion in BZ:
# https://bugzilla.redhat.com/show_bug.cgi?id=1817727
Expand Down

0 comments on commit eed6c9c

Please sign in to comment.