Skip to content

[18.0-fr5] Fix possible race condition in swift_migration check #1402

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

Merged
openshift-merge-bot merged 1 commit into from
May 25, 2026
Merged

[18.0-fr5] Fix possible race condition in swift_migration check #1402

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions docs_user/modules/proc_migrating-object-storage-data-to-rhoso-nodes.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ ssh commands for your existing nodes that store the {object_storage} data:
$ oc extract --confirm cm/swift-ring-files
$ $CONTROLLER1_SSH "tar -C /var/lib/config-data/puppet-generated/swift/etc/swift/ -xzf -" < swiftrings.tar.gz
$ $CONTROLLER1_SSH "systemctl restart tripleo_swift_*"
$ $CONTROLLER2_SSH "tar -C /var/lib/config-data/puppet-generated/swift/etc/swift/ -xzf -" < swiftrings.tar.gz
$ $CONTROLLER2_SSH "systemctl restart tripleo_swift_*"
$ $CONTROLLER3_SSH "tar -C /var/lib/config-data/puppet-generated/swift/etc/swift/ -xzf -" < swiftrings.tar.gz
$ $CONTROLLER3_SSH "systemctl restart tripleo_swift_*"
----

. Track the replication progress by using the `swift-dispersion-report` tool:
Expand Down
2 changes: 1 addition & 1 deletion tests/roles/swift_migration/tasks/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
ansible.builtin.shell: |
{{ shell_header }}
CONTROLLER1_SSH="{{ controller1_ssh }}"
$CONTROLLER1_SSH "timeout 900s bash -c 'while \$(find /srv/node/ -type f -name \"*.db\" -o -name \"*.data\" | grep -q \".\"); do sleep 5; done'"
$CONTROLLER1_SSH "timeout 900s bash -c 'while \$(find /srv/node/ -ignore_readdir_race -type f -name \"*.db\" -o -name \"*.data\" | grep -q \".\"); do sleep 5; done'"

- name: remove standalone node from rings
ansible.builtin.shell: |
Expand Down
15 changes: 12 additions & 3 deletions tests/roles/swift_migration/tasks/rebalance_and_wait.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,23 @@
swift-ring-tool forced_rebalance
swift-ring-tool push'

- name: push rings to standalone and restart swift services
- name: push rings to controller nodes and restart swift services
ansible.builtin.shell: |
{{ shell_header }}
{{ oc_header }}
CONTROLLER1_SSH="{{ controller1_ssh }}"
CONTROLLER2_SSH="{{ controller2_ssh }}"
CONTROLLER3_SSH="{{ controller3_ssh }}"

oc extract --confirm cm/swift-ring-files
$CONTROLLER1_SSH "tar -C /var/lib/config-data/puppet-generated/swift/etc/swift/ -xzf -" < swiftrings.tar.gz
$CONTROLLER1_SSH "systemctl restart tripleo_swift_*"

for i in {1..3}; do
SSH_CMD="CONTROLLER${i}_SSH"
if [ ! -z "${!SSH_CMD}" ]; then
${!SSH_CMD} "tar -C /var/lib/config-data/puppet-generated/swift/etc/swift/ -xzf -" < swiftrings.tar.gz
${!SSH_CMD} "systemctl restart tripleo_swift_*"
fi
done

- name: wait until all replicas are 100% available after rebalance
ansible.builtin.shell: |
Expand Down