ArielGlenn has submitted this change and it was merged.
Change subject: update code for collection of minions with given grain
......................................................................
update code for collection of minions with given grain
Change-Id: I5045444d742964c984b91195bb37528230f1a63d
---
M dataretention/audit_files.py
1 file changed, 10 insertions(+), 4 deletions(-)
Approvals:
ArielGlenn: Verified; Looks good to me, approved
diff --git a/dataretention/audit_files.py b/dataretention/audit_files.py
index 33c2c05..2470eb9 100644
--- a/dataretention/audit_files.py
+++ b/dataretention/audit_files.py
@@ -3214,13 +3214,19 @@
grep '{' | mawk -F"'" '{ print $2 }'
'''
arg = LocalClientPlus.condition_kwarg(arg, kwarg)
- pub_data = self.run_job(tgt, fun, arg, expr_form, ret,
- timeout, **kwargs)
+ job = self.run_job(tgt, fun, arg, expr_form, ret,
+ timeout, **kwargs)
- if not pub_data:
+ if not job:
return []
else:
- return list(set(pub_data['minions']))
+ time.sleep(3)
+ hosts = []
+ returned = self.get_cli_returns(job['jid'], set(job['minions']))
+ for resp in returned:
+ for host in resp:
+ hosts.append(host)
+ return list(set(hosts))
class Runner(object):
--
To view, visit https://gerrit.wikimedia.org/r/233445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5045444d742964c984b91195bb37528230f1a63d
Gerrit-PatchSet: 2
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
