scripts: Wait for a single Salt Master container #2435

gdemonet · 2020-04-20T13:07:09Z

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

bert-e · 2020-04-20T13:07:11Z

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 · 2020-04-20T13:07:18Z

Integration data created

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

this pull request will merge bugfix/2434-wait-for-single-salt-master-container into
development/2.5
w/2.6/bugfix/2434-wait-for-single-salt-master-container will be merged into 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

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 · 2020-04-20T13:07:19Z

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 · 2020-04-20T13:18:58Z

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.

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 · 2020-04-20T16:03:10Z

/reset

bert-e · 2020-04-20T16:03:18Z

Reset complete

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

gdemonet · 2020-04-20T16:03:23Z

/approve

bert-e · 2020-04-20T16:03:26Z

Integration data created

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

this pull request will merge bugfix/2434-wait-for-single-salt-master-container into
development/2.5
w/2.6/bugfix/2434-wait-for-single-salt-master-container will be merged into 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

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 · 2020-04-20T16:03:28Z

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 · 2020-04-20T16:03:34Z

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

scripts/common.sh

alexandre-allard

minor comment, otherwise LGTM.

bert-e · 2020-04-21T07:41:14Z

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 · 2020-04-21T08:49:34Z

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 · 2020-04-21T09:42:50Z

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.

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 added this to the MetalK8s 2.5.1 milestone Apr 20, 2020

gdemonet requested a review from a team April 20, 2020 13:07

gdemonet added this to In progress in Week 17/2020 via automation Apr 20, 2020

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

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

alexandre-allard reviewed Apr 21, 2020

View reviewed changes

scripts/common.sh Show resolved Hide resolved

alexandre-allard approved these changes Apr 21, 2020

View reviewed changes

Week 17/2020 automation moved this from In progress to Reviewer approved Apr 21, 2020

bert-e merged commit b5ad073 into development/2.5 Apr 21, 2020

Week 17/2020 automation moved this from Reviewer approved to Done Apr 21, 2020

bert-e deleted the bugfix/2434-wait-for-single-salt-master-container branch April 21, 2020 09:42

gdemonet added this to Done in Flakiness Investigations Jul 20, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

scripts: Wait for a single Salt Master container #2435

scripts: Wait for a single Salt Master container #2435

gdemonet commented Apr 20, 2020

bert-e commented Apr 20, 2020

bert-e commented Apr 20, 2020

bert-e commented Apr 20, 2020

bert-e commented Apr 20, 2020

gdemonet commented Apr 20, 2020

bert-e commented Apr 20, 2020

gdemonet commented Apr 20, 2020

bert-e commented Apr 20, 2020

bert-e commented Apr 20, 2020

bert-e commented Apr 20, 2020

alexandre-allard left a comment

bert-e commented Apr 21, 2020

bert-e commented Apr 21, 2020

bert-e commented Apr 21, 2020

scripts: Wait for a single Salt Master container #2435

scripts: Wait for a single Salt Master container #2435

Conversation

gdemonet commented Apr 20, 2020

bert-e commented Apr 20, 2020

Hello gdemonet,

bert-e commented Apr 20, 2020

Integration data created

bert-e commented Apr 20, 2020

Waiting for approval

bert-e commented Apr 20, 2020

History mismatch

gdemonet commented Apr 20, 2020

bert-e commented Apr 20, 2020

Reset complete

gdemonet commented Apr 20, 2020

bert-e commented Apr 20, 2020

Integration data created

bert-e commented Apr 20, 2020

Waiting for approval

bert-e commented Apr 20, 2020

Waiting for approval

alexandre-allard left a comment

Choose a reason for hiding this comment

bert-e commented Apr 21, 2020

Build failed

bert-e commented Apr 21, 2020

In the queue

bert-e commented Apr 21, 2020