Check that the ceph osd df tree weight and size are equal and reflect the current osd size #10641

yitzhak12 · 2024-10-09T14:01:00Z

Add a new check for the resize osd tests:
Check that the ceph osd df tree weight and size are equal and reflect the current osd size.
See more details in the thread: https://ibm-systems-storage.slack.com/archives/C06DWD30QTZ/p1724321789366579?thread_ts=1724316882.105889&cid=C06DWD30QTZ.
One more note regarding the implementation in the PR: When getting the ceph osd df tree output, I used the regular format and not the JSON format because the JSON format lacks the values of WEIGHT and SIZE.

ocs-ci

PR validation on existing cluster

Cluster Name: ikave-vm416
Cluster Configuration:
PR Test Suite: tier1
PR Test Path: tests/functional/z_cluster/cluster_expansion/test_resize_osd.py
Additional Test Params:
OCP VERSION: 4.17
OCS VERSION: 4.17
tested against branch: master

Job UNSTABLE (some or all tests failed).

ocs-ci

PR validation on existing cluster

Cluster Name: ikave-vm416
Cluster Configuration:
PR Test Suite: tier1
PR Test Path: tests/functional/z_cluster/cluster_expansion/test_resize_osd.py
Additional Test Params:
OCP VERSION: 4.17
OCS VERSION: 4.17
tested against branch: master

Job PASSED.

ebenahar · 2024-10-13T10:19:01Z

ocs_ci/ocs/resources/storage_cluster.py

@@ -2929,3 +2929,94 @@ def get_csi_images_for_client_ocp_version(ocp_version=None):
    csi_ocp_version_images = csi_images.split(first_str)[1].split(last_str)[0]
    csi_ocp_version_images_urls = extract_image_urls(csi_ocp_version_images)
    return csi_ocp_version_images_urls
+
+
+def parse_ceph_osd_df_tree_weight_and_size():


this has similarity to https://github.com/red-hat-storage/ocs-ci/pull/10359/files#diff-a4d73d82c94d13634aded838ea2490c117996218f405a8da15f9ecea093f3f6dR1331

Would it be possible to use the same function for both cases?

The values are not the same, but changing the header value may work in our case. I will check it.

…sd size values are eqaul to the expected osd size - Raise 'StorageSizeNotReflectedException' if the OSDs failed to restart Signed-off-by: Itzhak Kave <[email protected]>

ocs-ci

PR validation on existing cluster

Cluster Name: ikave-vm416
Cluster Configuration:
PR Test Suite: tier1
PR Test Path: tests/functional/z_cluster/cluster_expansion/test_resize_osd.py
Additional Test Params:
OCP VERSION: 4.17
OCS VERSION: 4.17
tested against branch: master

Job PASSED.

ocs-ci

PR validation on existing cluster

Cluster Name: ikave-gcp417
Cluster Configuration: conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_machines.yaml
PR Test Suite: tier1
PR Test Path: tests/functional/z_cluster/cluster_expansion/test_resize_osd.py
Additional Test Params:
OCP VERSION: 4.17
OCS VERSION: 4.17
tested against branch: master

Job UNSTABLE (some or all tests failed).

… osd size Signed-off-by: Itzhak Kave <[email protected]>

ocs-ci

PR validation on existing cluster

Cluster Name: ikave-gcp416
Cluster Configuration: conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_machines.yaml
PR Test Suite: tier1
PR Test Path: tests/functional/z_cluster/cluster_expansion/test_resize_osd.py
Additional Test Params:
OCP VERSION: 4.16
OCS VERSION: 4.16
tested against branch: master

Job UNSTABLE (some or all tests failed).

Signed-off-by: Itzhak Kave <[email protected]>

ocs-ci

PR validation on existing cluster

Cluster Name: ikave-gcp416
Cluster Configuration: conf/deployment/gcp/ipi_1az_rhcos_3m_3w_shielded_machines.yaml
PR Test Suite: tier1
PR Test Path: tests/functional/z_cluster/cluster_expansion/test_resize_osd.py
Additional Test Params:
OCP VERSION: 4.16
OCS VERSION: 4.16
tested against branch: master

Job PASSED.

prsurve · 2024-11-06T14:11:32Z

ocs_ci/helpers/osd_resize.py

@@ -60,6 +60,7 @@ def check_resources_state_post_resize_osd(old_osd_pods, old_osd_pvcs, old_osd_pv
        old_osd_pvs (list): The old osd PV objects before resizing the osd

    Raises:
+        StorageSizeNotReflectedException: If the OSD pods failed to restart
        ResourceWrongStatusException: If the following occurs:


if this raises is not used can we remove this ?

I added it in line 79: https://github.com/red-hat-storage/ocs-ci/pull/10641/files#diff-6bcc223cc6becbbfac8729d997ca9a5c7b7cbe57ef19edecdfac9014c6e36749R79.

Do you mean to remove the line:

The OSD pods failed to reach the status Terminated or to be deleted

Signed-off-by: Itzhak Kave <[email protected]>

openshift-ci · 2024-11-11T09:04:20Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ebenahar, prsurve, yitzhak12

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

Needs approval from an approver in each of these files:

OWNERS

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

ocs-ci

PR validation

Cluster Name:
Cluster Configuration:
PR Test Suite: tier1
PR Test Path: tests/functional/z_cluster/cluster_expansion/test_resize_osd.py
Additional Test Params:
OCP VERSION: 4.17
OCS VERSION: 4.17
tested against branch: master

Job PASSED.

yitzhak12 added the Squad/Brown label Oct 9, 2024

yitzhak12 requested a review from a team as a code owner October 9, 2024 14:01

pull-request-size bot added the size/M PR that changes 30-99 lines label Oct 9, 2024

ocs-ci reviewed Oct 9, 2024

View reviewed changes

yitzhak12 force-pushed the check-size-and-wieght-post-resize-osd branch from 45222fc to a272e14 Compare October 10, 2024 11:18

openshift-merge-robot added the needs-rebase label Oct 10, 2024

yitzhak12 force-pushed the check-size-and-wieght-post-resize-osd branch from a272e14 to ff84684 Compare October 10, 2024 11:57

openshift-merge-robot removed the needs-rebase label Oct 10, 2024

ocs-ci reviewed Oct 10, 2024

View reviewed changes

yitzhak12 added the Verified Mark when PR was verified and log provided label Oct 10, 2024

ebenahar requested changes Oct 13, 2024

View reviewed changes

openshift-ci bot assigned ebenahar Oct 13, 2024

- Check that the ceph osd df tree weight and size are equal and the o…

0c31ffc

…sd size values are eqaul to the expected osd size - Raise 'StorageSizeNotReflectedException' if the OSDs failed to restart Signed-off-by: Itzhak Kave <[email protected]>

yitzhak12 force-pushed the check-size-and-wieght-post-resize-osd branch from ff84684 to 0c31ffc Compare October 14, 2024 15:46

pull-request-size bot added size/L PR that changes 100-499 lines and removed size/M PR that changes 30-99 lines labels Oct 14, 2024

ocs-ci reviewed Oct 14, 2024

View reviewed changes

ebenahar previously approved these changes Oct 15, 2024

View reviewed changes

openshift-ci bot added the lgtm label Oct 15, 2024

ocs-ci reviewed Oct 30, 2024

View reviewed changes

Convert the storage size to the correct units before comparing to the…

fe2beb4

… osd size Signed-off-by: Itzhak Kave <[email protected]>

yitzhak12 dismissed ebenahar’s stale review via fe2beb4 November 5, 2024 11:54

openshift-ci bot removed the lgtm label Nov 5, 2024

ocs-ci reviewed Nov 5, 2024

View reviewed changes

Fix regex of the size

a62d221

Signed-off-by: Itzhak Kave <[email protected]>

ocs-ci reviewed Nov 5, 2024

View reviewed changes

prsurve reviewed Nov 6, 2024

View reviewed changes

fix comment

9b6bb74

Signed-off-by: Itzhak Kave <[email protected]>

ebenahar approved these changes Nov 7, 2024

View reviewed changes

openshift-ci bot added the lgtm label Nov 7, 2024

prsurve approved these changes Nov 11, 2024

View reviewed changes

openshift-ci bot assigned prsurve Nov 11, 2024

ocs-ci reviewed Nov 11, 2024

View reviewed changes

ebenahar merged commit 5fe47d9 into red-hat-storage:master Nov 11, 2024
7 of 8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Check that the ceph osd df tree weight and size are equal and reflect the current osd size #10641

Check that the ceph osd df tree weight and size are equal and reflect the current osd size #10641

yitzhak12 commented Oct 9, 2024 •

edited

Loading

ocs-ci left a comment

ocs-ci left a comment

ebenahar Oct 13, 2024

yitzhak12 Oct 13, 2024

ocs-ci left a comment

ocs-ci left a comment

ocs-ci left a comment

ocs-ci left a comment

prsurve Nov 6, 2024

yitzhak12 Nov 6, 2024

yitzhak12 Nov 6, 2024

yitzhak12 Nov 6, 2024

openshift-ci bot commented Nov 11, 2024

ocs-ci left a comment

Check that the ceph osd df tree weight and size are equal and reflect the current osd size #10641

Check that the ceph osd df tree weight and size are equal and reflect the current osd size #10641

Conversation

yitzhak12 commented Oct 9, 2024 • edited Loading

ocs-ci left a comment

Choose a reason for hiding this comment

ocs-ci left a comment

Choose a reason for hiding this comment

ebenahar Oct 13, 2024

Choose a reason for hiding this comment

yitzhak12 Oct 13, 2024

Choose a reason for hiding this comment

ocs-ci left a comment

Choose a reason for hiding this comment

ocs-ci left a comment

Choose a reason for hiding this comment

ocs-ci left a comment

Choose a reason for hiding this comment

ocs-ci left a comment

Choose a reason for hiding this comment

prsurve Nov 6, 2024

Choose a reason for hiding this comment

yitzhak12 Nov 6, 2024

Choose a reason for hiding this comment

yitzhak12 Nov 6, 2024

Choose a reason for hiding this comment

yitzhak12 Nov 6, 2024

Choose a reason for hiding this comment

openshift-ci bot commented Nov 11, 2024

ocs-ci left a comment

Choose a reason for hiding this comment

yitzhak12 commented Oct 9, 2024 •

edited

Loading