Skip to content
Snippets Groups Projects
Commit 220d9ae6 authored by Eugene Baranov's avatar Eugene Baranov
Browse files

convert: if getting a file from Perforce fails try to get it one more time

When converting a particularly large Perforce changelist (especially with  some
big files), it is very likely to run into an intermittent network issue (e.g.
WSAECONNRESET or WSAETIMEDOUT) getting one of the files, which will result in
the entire changelist converting being aborted. Which can be quite unfortunate
since you might have waited hours getting all other files. To mitigate this
let's attempt to get the file one more time, escalating original exception
if that attempt fails.
parent 4f8c20fe
Branches
Tags
No related merge requests found
......@@ -196,5 +196,4 @@
def getfile(self, name, rev):
cmd = 'p4 -G print %s' \
% util.shellquote("%s#%s" % (self.depotname[name], rev))
stdout = util.popen(cmd, mode='rb')
......@@ -200,5 +199,9 @@
mode = None
contents = ""
keywords = None
lasterror = None
while True:
stdout = util.popen(cmd, mode='rb')
mode = None
contents = ""
keywords = None
......@@ -204,5 +207,5 @@
for d in loaditer(stdout):
code = d["code"]
data = d.get("data")
for d in loaditer(stdout):
code = d["code"]
data = d.get("data")
......@@ -208,4 +211,11 @@
if code == "error":
raise IOError(d["generic"], data)
if code == "error":
# if this is the first time error happened
# re-attempt getting the file
if not lasterror:
lasterror = IOError(d["generic"], data)
# this will exit inner-most for-loop
break
else:
raise lasterror
......@@ -211,18 +221,19 @@
elif code == "stat":
action = d.get("action")
if action in ["purge", "delete", "move/delete"]:
return None, None
p4type = self.re_type.match(d["type"])
if p4type:
mode = ""
flags = (p4type.group(1) or "") + (p4type.group(3) or "")
if "x" in flags:
mode = "x"
if p4type.group(2) == "symlink":
mode = "l"
if "ko" in flags:
keywords = self.re_keywords_old
elif "k" in flags:
keywords = self.re_keywords
elif code == "stat":
action = d.get("action")
if action in ["purge", "delete", "move/delete"]:
return None, None
p4type = self.re_type.match(d["type"])
if p4type:
mode = ""
flags = ((p4type.group(1) or "")
+ (p4type.group(3) or ""))
if "x" in flags:
mode = "x"
if p4type.group(2) == "symlink":
mode = "l"
if "ko" in flags:
keywords = self.re_keywords_old
elif "k" in flags:
keywords = self.re_keywords
......@@ -228,6 +239,11 @@
elif code == "text" or code == "binary":
contents += data
elif code == "text" or code == "binary":
contents += data
lasterror = None
if not lasterror:
break
if mode is None:
return None, None
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment