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

Jump to bottom

scripts: Wait for a single Salt Master container #2435

Merged
merged 1 commit into from
Apr 21, 2020
Merged

scripts: Wait for a single Salt Master container #2435

merged 1 commit into from
Apr 21, 2020

Conversation

gdemonet
Copy link
Contributor

Sometimes, if kubelet restarted the salt-master static Pod after an
operation, two containers matching the usual selector will co-exist for
a small time window.
If we use the scripts/common.sh:get_salt_container function at that
point in time, we may return a string with two container IDs instead of
just one, and subsequent commands will fail.
Instead, we now wait for a single container to exist (and also add a
sleep time between two attemps, which we didn't before).

Fixes: #2434

@gdemonet gdemonet added kind:bug Something isn't working topic:deployment Bugs in or enhancements to deployment stages topic:flakiness Some test are flaky and cause CI to do transient failing complexity:easy Something that requires less than a day to fix labels Apr 20, 2020
@gdemonet gdemonet added this to the MetalK8s 2.5.1 milestone Apr 20, 2020
@gdemonet gdemonet requested a review from a team April 20, 2020 13:07
@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2020

Hello gdemonet,

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.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2020

Integration data created

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

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.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

@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2020

Waiting for approval

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

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@gdemonet gdemonet force-pushed the bugfix/2434-wait-for-single-salt-master-container branch from 556bb22 to 15c1d0c Compare April 20, 2020 13:18
@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2020

History mismatch

Merge commit #556bb22e19d15c48a3c0fa9ca4d9f56878daf83a on the integration branch
w/2.6/bugfix/2434-wait-for-single-salt-master-container is merging a branch which is neither the current
branch bugfix/2434-wait-for-single-salt-master-container nor the development branch
development/2.6.

It is likely due to a rebase of the branch bugfix/2434-wait-for-single-salt-master-container and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@gdemonet
scripts: Wait for a single Salt Master container
17183dd 
Sometimes, if kubelet restarted the `salt-master` static Pod after an
operation, two containers matching the usual selector will co-exist for
a small time window.
If we use the `scripts/common.sh:get_salt_container` function at that
point in time, we may return a string with two container IDs instead of
just one, and subsequent commands will fail.
Instead, we now wait for a single container to exist (and also add a
sleep time between two attemps, which we didn't before).

Fixes: #2434
@gdemonet gdemonet force-pushed the bugfix/2434-wait-for-single-salt-master-container branch from 15c1d0c to 17183dd Compare April 20, 2020 15:05
@gdemonet
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2020

Reset complete

I have successfully deleted this pull request's integration branches.

@gdemonet
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2020

Integration data created

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

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.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

@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2020

Waiting for approval

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

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@bert-e
Copy link
Contributor

bert-e commented Apr 20, 2020

Waiting for approval

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

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

alexandre-allard
alexandre-allard approved these changes Apr 21, 2020
View reviewed changes
Copy link
Contributor

@alexandre-allard alexandre-allard left a comment

Choose a reason for hiding this comment

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

minor comment, otherwise LGTM.

@bert-e
Copy link
Contributor

bert-e commented Apr 21, 2020

Build failed

The build for commit did not succeed in branch w/2.6/bugfix/2434-wait-for-single-salt-master-container.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 21, 2020

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.5

  • ✔️ development/2.6

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 21, 2020

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

  • ✔️ development/2.5

  • ✔️ development/2.6

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4

Please check the status of the associated issue None.

Goodbye gdemonet.

@bert-e bert-e merged commit b5ad073 into development/2.5 Apr 21, 2020
@bert-e bert-e deleted the bugfix/2434-wait-for-single-salt-master-container branch April 21, 2020 09:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexandre-allard alexandre-allard alexandre-allard approved these changes

Assignees
No one assigned
Labels
complexity:easy Something that requires less than a day to fix kind:bug Something isn't working topic:deployment Bugs in or enhancements to deployment stages topic:flakiness Some test are flaky and cause CI to do transient failing
Projects
None yet
Milestone
MetalK8s 2.5.1
Development

Successfully merging this pull request may close these issues.
3 participants
@gdemonet @bert-e @alexandre-allard