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.

Sign up for GitHub

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

removed osd_removal_job support for versions older than 4.6 #10105

Merged
merged 1 commit into from
Jul 22, 2024
Merged

removed osd_removal_job support for versions older than 4.6 #10105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 10 additions & 22 deletions ocs_ci/ocs/resources/pod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

Each pod in the openshift cluster will have a corresponding pod object
"""

from concurrent.futures import ThreadPoolExecutor
from datetime import datetime, timedelta
import logging
Expand Down Expand Up @@ -38,7 +39,7 @@
from ocs_ci.ocs.utils import setup_ceph_toolbox, get_pod_name_by_pattern
from ocs_ci.ocs.resources.ocs import OCS
from ocs_ci.ocs.resources.job import get_job_obj, get_jobs_with_prefix
from ocs_ci.utility import templating, version
from ocs_ci.utility import templating
from ocs_ci.utility.utils import (
run_cmd,
check_timeout_reached,
Expand Down Expand Up @@ -213,9 +214,11 @@ def exec_s3_cmd_on_pod(self, command, mcg_obj=None):
return self.exec_cmd_on_pod(
craft_s3_command(command, mcg_obj),
out_yaml_format=False,
secrets=[mcg_obj.access_key_id, mcg_obj.access_key, mcg_obj.s3_endpoint]
if mcg_obj
else None,
secrets=(
[mcg_obj.access_key_id, mcg_obj.access_key, mcg_obj.s3_endpoint]
if mcg_obj
else None
),
)

def copy_to_pod_rsync(self, src_path, target_path, container=None):
Expand Down Expand Up @@ -1530,7 +1533,6 @@ def get_pods_having_label(
cluster_config=None,
statuses=None,
):

"""
Fetches pod resources with given label in given namespace

Expand Down Expand Up @@ -2271,7 +2273,6 @@ def wait_for_new_osd_pods_to_come_up(number_of_osd_pods_before):
def get_pod_restarts_count(
namespace=config.ENV_DATA["cluster_namespace"], label=None, list_of_pods=None
):

"""
Gets the dictionary of pod and its restart count for all the pods in a given namespace

Expand Down Expand Up @@ -2603,23 +2604,10 @@ def run_osd_removal_job(osd_ids=None):

"""
osd_ids_str = ",".join(map(str, osd_ids))
ocp_version = version.get_semantic_ocp_version_from_config()
ocs_version = version.get_semantic_ocs_version_from_config()

# Fixes: #6662
# Version OCS 4.6 and above requires FORCE_OSD_REMOVAL set to true in order to not get stuck
cmd_params = (
"-p FORCE_OSD_REMOVAL=true"
if ocs_version >= version.VERSION_4_6
and not check_safe_to_destroy_status(osd_ids_str)
else ""
)

# Parameter name FAILED_OSD_ID changed to FAILED_OSD_IDS for Version OCP 4.6 and above
if ocp_version >= version.VERSION_4_6:
cmd_params += f" -p FAILED_OSD_IDS={osd_ids_str}"
else:
cmd_params += f" -p FAILED_OSD_ID={osd_ids_str}"
cmd_params = "-p FORCE_OSD_REMOVAL=true"

cmd_params += f" -p FAILED_OSD_IDS={osd_ids_str}"

logger.info(f"Executing OSD removal job on OSD ids: {osd_ids_str}")
ocp_obj = ocp.OCP(namespace=config.ENV_DATA["cluster_namespace"])
Expand Down
Loading