Skip to content

CLDSRV-1012: Fix CI development/7.10 - #6321

Merged
bert-e merged 5 commits into
development/7.10from
improvement/CLDSRV-1012-fix-7.10-ci
Oct 5, 2026
Merged

bert-e merged 5 commits into
development/7.10from
improvement/CLDSRV-1012-fix-7.10-ci

Conversation

@BourgoisMickael

@BourgoisMickael BourgoisMickael commented Oct 3, 2026 •

Copy link
Copy Markdown
Contributor

Need to fix CI to backport a hotfix for RD-2378.

multiple-backend fails on development/7.X since after 2026-02-05.

Because of location constraints with GCP buckets (zenko-gcp-*) that no longer exists (since after Feb 2026).

On 7.x, any failing location blocks startup. Fixed in 8.x and 9.x with relaxed health check.

Changes


In 9.5, the test config still points GCP locations at zenko-gcp-*, but the tests using them are skipped. The raw-node GCP tests that run use their own cldsrvci-* buckets and bypass cloudserver.

Should we recreate those buckets for 7.X hotfixes instead of this PR ?

francoisferrand and others added 5 commits October 3, 2026 07:13
Fail the check (both on startup and /ready route) only if all backends
are failing: so that the working backends can still be used.

Issue: CLDSRV-110
(cherry picked from commit f567903)
Now fail if ALL backends of only one client fails.

Previously, the deep healthcheck would fail if ALL backends/locations
failed globally across all clients (data, metadata, vault, kms).

This change modifies the logic to fail if ANY client has ALL its
backends/locations failing. This ensures:

1. For data backend with multiple sproxyd location constraints:
   - Returns HTTP 200 if at least ONE location is healthy
   - Returns HTTP 500 only if ALL locations fail

2. Each client (data, metadata, vault, kms) is evaluated independently
   - If ALL locations of the data client fail, overall check fails
   - If ALL locations of metadata fail, overall check fails
   - etc.

The new logic uses:
- `results.some()` to check across clients
- `keys.every()` within each client to check all its locations

(cherry picked from commit ae94080)
The eslint version used on 7.10 cannot parse logical assignment
operators and enforces consistent quoting of object keys.

Co-Authored-By: Claude <noreply@anthropic.com>
They had been disabled for a long while and cannot be reenabled yet
because they don't pass, so keep on skipping them for now.

Tickets have been created to take care of them:

- CLDSRV-440
- CLDSRV-441
- CLDSRV-442
- CLDSRV-443

(cherry picked from commit df646e4)

Backport to 7.10: only the skip of the 'Azure container creation' tests
(CLDSRV-441) is selected from this commit. All other changes are ignored.
@bert-e

bert-e commented Oct 3, 2026

Copy link
Copy Markdown
Contributor

Hello bourgoismickael,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval ⭐
/bypass_build_status Bypass the build and test status ⭐
/bypass_commit_size Bypass the check on the size of the changeset TBA ⭐
/bypass_incompatible_branch Bypass the check on the source branch prefix ⭐
/bypass_jira_check Bypass the Jira issue check ⭐
/bypass_peer_approval Bypass the pull request peers' approval ⭐
/bypass_leader_approval Bypass the pull request leaders' approval ⭐
/bypass_source_branch_lineage Bypass the cross-branch contamination check ⭐
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request.
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@scality scality deleted a comment from bert-e Oct 3, 2026
@bert-e

bert-e commented Oct 3, 2026

Copy link
Copy Markdown
Contributor

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@BourgoisMickael

Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@bert-e

bert-e commented Oct 3, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/8.8/improvement/CLDSRV-1012-fix-7.10-ci with contents from w/7.70/improvement/CLDSRV-1012-fix-7.10-ci
and development/8.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/8.8/improvement/CLDSRV-1012-fix-7.10-ci origin/development/8.8
 git merge origin/w/7.70/improvement/CLDSRV-1012-fix-7.10-ci
 # <intense conflict resolution>
 git commit
 git push -u origin w/8.8/improvement/CLDSRV-1012-fix-7.10-ci

The following options are set: create_integration_branches

@bert-e

bert-e commented Oct 3, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/9.2/improvement/CLDSRV-1012-fix-7.10-ci with contents from w/9.1/improvement/CLDSRV-1012-fix-7.10-ci
and development/9.2.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/9.2/improvement/CLDSRV-1012-fix-7.10-ci origin/development/9.2
 git merge origin/w/9.1/improvement/CLDSRV-1012-fix-7.10-ci
 # <intense conflict resolution>
 git commit
 git push -u origin w/9.2/improvement/CLDSRV-1012-fix-7.10-ci

The following options are set: create_integration_branches

@bert-e

bert-e commented Oct 3, 2026

Copy link
Copy Markdown
Contributor

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

@bert-e

bert-e commented Oct 3, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

The following options are set: create_integration_branches

@francoisferrand francoisferrand left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but I don't see how this relates to fixing CI due multiple backend and GCP failing...

multiple-backend fails on development/7.X since after 2026-02-05.
Because of location constraints with GCP buckets (zenko-gcp-*) that no longer exists (since after Feb 2026).

@BourgoisMickael

Copy link
Copy Markdown
Contributor Author

LGTM, but I don't see how this relates to fixing CI due multiple backend and GCP failing...

Cloudserver doesn't start in the CI because of the initial healthcheck that fails on 1 GCP backend and blocks startup. If healthcheck is relaxed, cloudserver does start.

@BourgoisMickael

Copy link
Copy Markdown
Contributor Author

@francoisferrand

The whole healthcheck log line that blocks startup

{
  "name": "S3",
  "error": {
    "InternalError": true
  },
  "healthStatus": {
    "us-east-1": {
      "code": 200,
      "message": "OK"
    },
    "scality-internal-file": {
      "code": 200,
      "message": "OK"
    },
    "dataFile": {
      "code": 200,
      "message": "OK"
    },
    "scality-internal-mem": {
      "code": 200,
      "message": "OK"
    },
    "scality-us-west-1": {
      "code": 200,
      "message": "OK"
    },
    "awsbackendencryption": {
      "message": "Congrats! You own the bucket"
    },
    "awsbackend": {
      "message": "Congrats! You own the bucket"
    },
    "awsbackendmismatch": {
      "message": "Congrats! You own the bucket"
    },
    "awsbackend2": {
      "message": "Congrats! You own the bucket"
    },
    "azurebackend": {
      "message": "Congrats! You can access the Azure storage account"
    },
    "azurebackend2": {
      "message": "Congrats! You can access the Azure storage account"
    },
    "azurebackendmismatch": {
      "message": "Congrats! You can access the Azure storage account"
    },
    "azurenonexistcontainer": {
      "message": "Congrats! You can access the Azure storage account"
    },
    "gcpbackend": {
      "error": true,
      "external": true,
      "mpu": {
        "gcpBucket": "zenko-gcp-mpu",
        "error": {
          "message": null,
          "code": 404,
          "time": "2026-10-02T14:46:04.374Z",
          "requestId": "...",
          "statusCode": 404,
          "retryable": false
        }
      },
      "main": {
        "gcpBucket": "zenko-gcp-bucket",
        "error": {
          "message": null,
          "code": 404,
          "time": "2026-10-02T14:46:04.643Z",
          "requestId": "...",
          "statusCode": 404,
          "retryable": false
        }
      }
    },
    "gcpbackend2": {
      "error": true,
      "external": true,
      "main": {
        "gcpBucket": "zenko-gcp-bucket-2",
        "error": {
          "message": null,
          "code": 404,
          "time": "2026-10-02T14:46:04.431Z",
          "requestId": "...",
          "statusCode": 404,
          "retryable": false
        }
      },
      "mpu": {
        "gcpBucket": "zenko-gcp-mpu-2",
        "error": {
          "message": null,
          "code": 404,
          "time": "2026-10-02T14:46:04.523Z",
          "requestId": "...",
          "statusCode": 404,
          "retryable": false
        }
      }
    },
    "gcpbackendmismatch": {
      "error": true,
      "external": true,
      "mpu": {
        "gcpBucket": "zenko-gcp-mpu",
        "error": {
          "message": null,
          "code": 404,
          "time": "2026-10-02T14:46:04.374Z",
          "requestId": "...",
          "statusCode": 404,
          "retryable": false
        }
      },
      "main": {
        "gcpBucket": "zenko-gcp-bucket",
        "error": {
          "message": null,
          "code": 404,
          "time": "2026-10-02T14:46:04.442Z",
          "requestId": "...",
          "statusCode": 404,
          "retryable": false
        }
      }
    },
    "gcpbackendproxy": {
      "error": true,
      "external": true,
      "main": {
        "gcpBucket": "zenko-gcp-bucket",
        "error": {
          "message": null,
          "code": 404,
          "time": "2026-10-02T14:46:04.433Z",
          "requestId": "...",
          "statusCode": 404,
          "retryable": false
        }
      },
      "mpu": {
        "gcpBucket": "zenko-gcp-mpu",
        "error": {
          "message": null,
          "code": 404,
          "time": "2026-10-02T14:46:04.491Z",
          "requestId": "...",
          "statusCode": 404,
          "retryable": false
        }
      }
    },
    "gcpbackendnoproxy": {
      "error": true,
      "external": true,
      "mpu": {
        "gcpBucket": "zenko-gcp-mpu",
        "error": {
          "message": null,
          "code": 404,
          "time": "2026-10-02T14:46:04.375Z",
          "requestId": "...",
          "statusCode": 404,
          "retryable": false
        }
      },
      "main": {
        "gcpBucket": "zenko-gcp-bucket",
        "error": {
          "message": null,
          "code": 404,
          "time": "2026-10-02T14:46:04.376Z",
          "requestId": "...",
          "statusCode": 404,
          "retryable": false
        }
      }
    },
    "memorybucket": {
      "code": 200,
      "message": "OK"
    },
    "vaultMem": {
      "code": 200,
      "message": "OK"
    },
    "memoryKms": {
      "code": 200,
      "message": "OK"
    }
  },
  "time": 1790952364643,
  "req_id": "c59948bfaf4ea0b554de",
  "level": "info",
  "message": "initial health check failed, delaying startup",
  "hostname": "runnervm8df0l",
  "pid": 130
}

@BourgoisMickael

Copy link
Copy Markdown
Contributor Author

/approve

@bert-e

bert-e commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

Build failed

The build for commit did not succeed in branch w/8.8/improvement/CLDSRV-1012-fix-7.10-ci

The following options are set: approve, create_integration_branches

@scality scality deleted a comment from bert-e Oct 5, 2026
@bert-e

bert-e commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the update of
integration branch w/9.0/improvement/CLDSRV-1012-fix-7.10-ci with contents from w/8.8/improvement/CLDSRV-1012-fix-7.10-ci
and development/9.0.

Please resolve the conflict on the integration branch (w/9.0/improvement/CLDSRV-1012-fix-7.10-ci).

Here are the steps to resolve this conflict:

 git fetch
 git checkout w/9.0/improvement/CLDSRV-1012-fix-7.10-ci
 git pull  # or "git reset --hard origin/w/9.0/improvement/CLDSRV-1012-fix-7.10-ci"
 git merge origin/development/9.0
 # <intense conflict resolution>
 git commit
 git merge origin/w/8.8/improvement/CLDSRV-1012-fix-7.10-ci
 # <intense conflict resolution>
 git commit
 git push -u origin w/9.0/improvement/CLDSRV-1012-fix-7.10-ci

The following options are set: approve, create_integration_branches

@BourgoisMickael

Copy link
Copy Markdown
Contributor Author

Added a commit in branch 8.8 d73b60b to fix ceph in the CI using a wrong network interface

@bert-e

bert-e commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the update of
integration branch w/9.2/improvement/CLDSRV-1012-fix-7.10-ci with contents from w/9.1/improvement/CLDSRV-1012-fix-7.10-ci
and development/9.2.

Please resolve the conflict on the integration branch (w/9.2/improvement/CLDSRV-1012-fix-7.10-ci).

Here are the steps to resolve this conflict:

 git fetch
 git checkout w/9.2/improvement/CLDSRV-1012-fix-7.10-ci
 git pull  # or "git reset --hard origin/w/9.2/improvement/CLDSRV-1012-fix-7.10-ci"
 git merge origin/development/9.2
 # <intense conflict resolution>
 git commit
 git merge origin/w/9.1/improvement/CLDSRV-1012-fix-7.10-ci
 # <intense conflict resolution>
 git commit
 git push -u origin w/9.2/improvement/CLDSRV-1012-fix-7.10-ci

The following options are set: approve, create_integration_branches

@bert-e

bert-e commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the update of
integration branch w/9.3/improvement/CLDSRV-1012-fix-7.10-ci with contents from w/9.2/improvement/CLDSRV-1012-fix-7.10-ci
and development/9.3.

Please resolve the conflict on the integration branch (w/9.3/improvement/CLDSRV-1012-fix-7.10-ci).

Here are the steps to resolve this conflict:

 git fetch
 git checkout w/9.3/improvement/CLDSRV-1012-fix-7.10-ci
 git pull  # or "git reset --hard origin/w/9.3/improvement/CLDSRV-1012-fix-7.10-ci"
 git merge origin/development/9.3
 # <intense conflict resolution>
 git commit
 git merge origin/w/9.2/improvement/CLDSRV-1012-fix-7.10-ci
 # <intense conflict resolution>
 git commit
 git push -u origin w/9.3/improvement/CLDSRV-1012-fix-7.10-ci

The following options are set: approve, create_integration_branches

@bert-e

bert-e commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.10

  • ✔️ development/7.70

  • ✔️ development/8.8

  • ✔️ development/9.0

  • ✔️ development/9.1

  • ✔️ development/9.2

  • ✔️ development/9.3

  • ✔️ development/9.4

  • ✔️ development/9.5

The following branches have NOT changed:

  • development/7.4

This pull request did not target the following hotfix branch(es) so they
were left untouched:

  • hotfix/7.8.0
  • hotfix/9.2.24
  • hotfix/7.4.2
  • hotfix/7.10.0
  • hotfix/7.10.1
  • hotfix/7.10.28
  • hotfix/7.10.30
  • hotfix/7.4.1
  • hotfix/8.8.45
  • hotfix/7.4.0
  • hotfix/9.2.36
  • hotfix/9.3.13
  • hotfix/7.4.6
  • hotfix/7.9.0
  • hotfix/7.70.73
  • hotfix/7.10.3
  • hotfix/7.10.49
  • hotfix/7.4.8
  • hotfix/7.10.2
  • hotfix/7.10.27
  • hotfix/9.0.7
  • hotfix/6.4.7
  • hotfix/7.4.10
  • hotfix/7.10.4
  • hotfix/7.70.45
  • hotfix/7.4.3
  • hotfix/7.70.11
  • hotfix/7.70.51
  • hotfix/7.70.21
  • hotfix/9.0.32
  • hotfix/7.4.7
  • hotfix/7.7.0
  • hotfix/7.10.15
  • hotfix/7.4.4
  • hotfix/7.4.9
  • hotfix/7.6.0
  • hotfix/7.2.0
  • hotfix/7.4.5
  • hotfix/7.10.8

Please check the status of the associated issue CLDSRV-1012.

Goodbye bourgoismickael.

The following options are set: approve, create_integration_branches

@bert-e
bert-e merged commit 3a3f804 into development/7.10 Oct 5, 2026
12 checks passed
@bert-e
bert-e deleted the improvement/CLDSRV-1012-fix-7.10-ci branch October 5, 2026 14:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants