Skip to content

Add retries to release.py script #8021

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
mumrah merged 2 commits into from
Jan 30, 2020
Merged

Add retries to release.py script #8021

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7b4ee1
Add a retry count to the "cmd" method
mumrah Jan 30, 2020
3d46567
Fix comment
mumrah Jan 30, 2020
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
23 changes: 16 additions & 7 deletions release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import subprocess
import sys
import tempfile
import time
import re

PROJECT_NAME = "kafka"
Expand Down Expand Up @@ -96,10 +97,11 @@ def print_output(output):
for line in output.split('\n'):
print(">", line)

def cmd(action, cmd, *args, **kwargs):
if isinstance(cmd, basestring) and not kwargs.get("shell", False):
cmd = cmd.split()
def cmd(action, cmd_arg, *args, **kwargs):
if isinstance(cmd_arg, basestring) and not kwargs.get("shell", False):
cmd_arg = cmd_arg.split()
allow_failure = kwargs.pop("allow_failure", False)
num_retries = kwargs.pop("num_retries", 0)

stdin_log = ""
if "stdin" in kwargs and isinstance(kwargs["stdin"], basestring):
Expand All @@ -109,13 +111,20 @@ def cmd(action, cmd, *args, **kwargs):
stdin.seek(0)
kwargs["stdin"] = stdin

print(action, cmd, stdin_log)
print(action, cmd_arg, stdin_log)
try:
output = subprocess.check_output(cmd, *args, stderr=subprocess.STDOUT, **kwargs)
output = subprocess.check_output(cmd_arg, *args, stderr=subprocess.STDOUT, **kwargs)
print_output(output)
except subprocess.CalledProcessError as e:
print_output(e.output)

if num_retries > 0:
kwargs['num_retries'] = num_retries - 1
kwargs['allow_failure'] = allow_failure
Copy link
Copy Markdown
Contributor

@ewencp ewencp Jan 30, 2020

Choose a reason for hiding this comment

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

Do we need this? Shouldn't it behave as expected just by continuing to pass through the existing kwargs?

Copy link
Copy Markdown
Member Author

@mumrah mumrah Jan 30, 2020

Choose a reason for hiding this comment

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

It gets popped out of the kwargs above, so just sticking it back in here

Copy link
Copy Markdown
Contributor

@ewencp ewencp Jan 30, 2020

Choose a reason for hiding this comment

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

ah, ack

print("Retrying... %d remaining retries" % (num_retries - 1))
time.sleep(4. / (num_retries + 1)) # e.g., if retries=3, sleep for 1s, 1.3s, 2s
return cmd(action, cmd_arg, *args, **kwargs)

if allow_failure:
return

Expand Down Expand Up @@ -153,7 +162,7 @@ def regexReplace(path, pattern, replacement):

def user_ok(msg):
ok = raw_input(msg)
return ok.lower() == 'y'
return ok.strip().lower() == 'y'

def sftp_mkdir(dir):
basedir, dirname = os.path.split(dir)
Expand All @@ -164,7 +173,7 @@ def sftp_mkdir(dir):
cd %s
-mkdir %s
""" % (basedir, dirname)
cmd("Creating '%s' in '%s' in your Apache home directory if it does not exist (errors are ok if the directory already exists)" % (dirname, basedir), "sftp -b - %s@home.apache.org" % apache_id, stdin=cmd_str, allow_failure=True)
cmd("Creating '%s' in '%s' in your Apache home directory if it does not exist (errors are ok if the directory already exists)" % (dirname, basedir), "sftp -b - %s@home.apache.org" % apache_id, stdin=cmd_str, allow_failure=True, num_retries=3)
except subprocess.CalledProcessError:
# This is ok. The command fails if the directory already exists
pass
Expand Down