Make drain timeout configurable and default to 1h #3633

TeddyAndrieux · 2021-12-08T18:01:20Z

Set the default drain timeout to 3600 seconds (1 hour)
Allow changing the drain timeout from CLI of upgrade and downgrade scripts

bert-e · 2021-12-08T18:01:22Z

Hello teddyandrieux,

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 · 2021-12-08T18:01:26Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.11/improvement/make-drain-timeout-configurable with contents from improvement/make-drain-timeout-configurable
and development/2.11.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.11/improvement/make-drain-timeout-configurable origin/development/2.11
 $ git merge origin/improvement/make-drain-timeout-configurable
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.11/improvement/make-drain-timeout-configurable

bert-e · 2021-12-08T18:15:09Z

Integration data created

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

this pull request will merge improvement/make-drain-timeout-configurable into
development/2.10
w/2.11/improvement/make-drain-timeout-configurable will be merged into development/2.11
w/123.0/improvement/make-drain-timeout-configurable will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

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 · 2021-12-08T18:15:11Z

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 · 2021-12-09T06:52:53Z

scripts/upgrade.sh.in

@@ -5,6 +5,7 @@ set -o pipefail

 VERBOSE=${VERBOSE:-0}
 LOGFILE=/var/log/metalk8s/upgrade.log
+DRAIN_TIMEOUT=${DRAIN_TIMEOUT:-0}


IIUC, this means that by default, the script sets the timeout to 0 seconds... Or did I miss something?

Oh I get it, you're relying on the timeout or 3600 expression, where 0 is false. OK, I guess :)

salt/metalk8s/orchestrate/deploy_node.sls

salt/metalk8s/orchestrate/downgrade/init.sls

bert-e · 2021-12-09T08:49:18Z

History mismatch

Merge commit #f2965f6e3a5722ebbfc65d5e92daf2bd9aea23fe on the integration branch
w/2.11/improvement/make-drain-timeout-configurable is merging a branch which is neither the current
branch improvement/make-drain-timeout-configurable nor the development branch
development/2.11.

It is likely due to a rebase of the branch improvement/make-drain-timeout-configurable 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.

TeddyAndrieux · 2021-12-09T08:50:07Z

/reset

bert-e · 2021-12-09T08:50:12Z

Reset complete

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

bert-e · 2021-12-09T08:50:18Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.11/improvement/make-drain-timeout-configurable with contents from improvement/make-drain-timeout-configurable
and development/2.11.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.11/improvement/make-drain-timeout-configurable origin/development/2.11
 $ git merge origin/improvement/make-drain-timeout-configurable
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.11/improvement/make-drain-timeout-configurable

bert-e · 2021-12-09T08:52:10Z

Integration data created

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

this pull request will merge improvement/make-drain-timeout-configurable into
development/2.10
w/2.11/improvement/make-drain-timeout-configurable will be merged into development/2.11
w/123.0/improvement/make-drain-timeout-configurable will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

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 · 2021-12-09T08:52:11Z

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 default drain timeout we set is really huge and in some cases we may want to change it to a lower value so that if drain take too much time upgrade and downgrade will stop

bert-e · 2021-12-09T10:08:18Z

History mismatch

Merge commit #ecc89bb443439f8a8bc3759c7f994aa7b0370cf7 on the integration branch
w/2.11/improvement/make-drain-timeout-configurable is merging a branch which is neither the current
branch improvement/make-drain-timeout-configurable nor the development branch
development/2.11.

It is likely due to a rebase of the branch improvement/make-drain-timeout-configurable 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.

TeddyAndrieux · 2021-12-09T10:08:34Z

/reset

bert-e · 2021-12-09T10:08:42Z

Reset complete

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

bert-e · 2021-12-09T10:08:48Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.11/improvement/make-drain-timeout-configurable with contents from improvement/make-drain-timeout-configurable
and development/2.11.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.11/improvement/make-drain-timeout-configurable origin/development/2.11
 $ git merge origin/improvement/make-drain-timeout-configurable
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.11/improvement/make-drain-timeout-configurable

bert-e · 2021-12-09T10:12:06Z

Integration data created

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

this pull request will merge improvement/make-drain-timeout-configurable into
development/2.10
w/2.11/improvement/make-drain-timeout-configurable will be merged into development/2.11
w/123.0/improvement/make-drain-timeout-configurable will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

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 · 2021-12-09T10:12:07Z

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:

TeddyAndrieux · 2021-12-09T10:55:13Z

/approve

bert-e · 2021-12-09T11:36:55Z

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.10
✔️ development/2.11
✔️ development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

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 · 2021-12-09T13:20:32Z

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

✔️ development/2.10
✔️ development/2.11
✔️ development/123.0

The following branches have NOT changed:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

TeddyAndrieux requested a review from a team December 8, 2021 18:01

TeddyAndrieux force-pushed the improvement/make-drain-timeout-configurable branch from 13f2089 to 6662b48 Compare December 8, 2021 18:03

gdemonet reviewed Dec 9, 2021

View reviewed changes

TeddyAndrieux force-pushed the improvement/make-drain-timeout-configurable branch from 6662b48 to 423bff0 Compare December 9, 2021 08:49

TeddyAndrieux force-pushed the improvement/make-drain-timeout-configurable branch from 423bff0 to 5c5140c Compare December 9, 2021 08:50

TeddyAndrieux added 3 commits December 9, 2021 11:07

salt/tests: Allow to set default from mocked pillar.get

dd9c258

salt,script: Add ability to change drain_timeout for upgrade

9cb473d

The default drain timeout we set is really huge and in some cases we may want to change it to a lower value so that if drain take too much time upgrade and downgrade will stop

salt: Set default drain timeout to 3600s

cb27a00

TeddyAndrieux force-pushed the improvement/make-drain-timeout-configurable branch from 5c5140c to cb27a00 Compare December 9, 2021 10:08

gdemonet approved these changes Dec 9, 2021

View reviewed changes

bert-e merged commit cb27a00 into development/2.10 Dec 9, 2021

bert-e deleted the improvement/make-drain-timeout-configurable branch December 9, 2021 13:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make drain timeout configurable and default to 1h #3633

Make drain timeout configurable and default to 1h #3633

TeddyAndrieux commented Dec 8, 2021

bert-e commented Dec 8, 2021

bert-e commented Dec 8, 2021

bert-e commented Dec 8, 2021

bert-e commented Dec 8, 2021

gdemonet Dec 9, 2021

gdemonet Dec 9, 2021

bert-e commented Dec 9, 2021

TeddyAndrieux commented Dec 9, 2021

bert-e commented Dec 9, 2021

bert-e commented Dec 9, 2021

bert-e commented Dec 9, 2021

bert-e commented Dec 9, 2021

bert-e commented Dec 9, 2021

TeddyAndrieux commented Dec 9, 2021

bert-e commented Dec 9, 2021

bert-e commented Dec 9, 2021

bert-e commented Dec 9, 2021

bert-e commented Dec 9, 2021

TeddyAndrieux commented Dec 9, 2021

bert-e commented Dec 9, 2021

bert-e commented Dec 9, 2021

Make drain timeout configurable and default to 1h #3633

Make drain timeout configurable and default to 1h #3633

Conversation

TeddyAndrieux commented Dec 8, 2021

bert-e commented Dec 8, 2021

Hello teddyandrieux,

bert-e commented Dec 8, 2021

Conflict

bert-e commented Dec 8, 2021

Integration data created

bert-e commented Dec 8, 2021

Waiting for approval

gdemonet Dec 9, 2021

Choose a reason for hiding this comment

gdemonet Dec 9, 2021

Choose a reason for hiding this comment

bert-e commented Dec 9, 2021

History mismatch

TeddyAndrieux commented Dec 9, 2021

bert-e commented Dec 9, 2021

Reset complete

bert-e commented Dec 9, 2021

Conflict

bert-e commented Dec 9, 2021

Integration data created

bert-e commented Dec 9, 2021

Waiting for approval

bert-e commented Dec 9, 2021

History mismatch

TeddyAndrieux commented Dec 9, 2021

bert-e commented Dec 9, 2021

Reset complete

bert-e commented Dec 9, 2021

Conflict

bert-e commented Dec 9, 2021

Integration data created

bert-e commented Dec 9, 2021

Waiting for approval

TeddyAndrieux commented Dec 9, 2021

bert-e commented Dec 9, 2021

In the queue

bert-e commented Dec 9, 2021