Ori.livneh has submitted this change and it was merged.
Change subject: scap: invoke dsh via subprocess.call rather than .check_call
......................................................................
scap: invoke dsh via subprocess.call rather than .check_call
dsh frequently fails for mundane reasons -- for example, because a host was
taken out of circulation for repairs but not removed from dsh group. scap just
keeps going, so the Python re-implementation should too, as pathological as
that may seem.
Change-Id: I247995f2bd2c2431063e3ec071c64066d98c77dd
---
M bin/scappy
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/bin/scappy b/bin/scappy
index 8a51e62..6960212 100755
--- a/bin/scappy
+++ b/bin/scappy
@@ -20,7 +20,6 @@
import time
-
class Stats:
"""A simple StatsD metric client."""
@@ -111,9 +110,9 @@
if exports:
command = '%s %s' % (shell_map(exports), command)
group_file = os.path.join('/etc/dsh/group', group)
- return subprocess.check_call(['/usr/bin/dsh', '-F40', '-cM', '-f',
- group_file, '-o', '-oSetupTimeout=10', '--',
- command.strip()])
+ return subprocess.call(['/usr/bin/dsh', '-F40', '-cM', '-f',
+ group_file, '-o', '-oSetupTimeout=10', '--',
+ command.strip()])
def check_syntax(*paths):
--
To view, visit https://gerrit.wikimedia.org/r/111418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I247995f2bd2c2431063e3ec071c64066d98c77dd
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/tools/scap
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
