ArielGlenn has submitted this change and it was merged. Change subject: make ping_on_rotate work without minion data cache ......................................................................
make ping_on_rotate work without minion data cache Instead of pinging all connected minions just ping them all; without a minion data cache it's hard to determine which are connected (have authenticated and are ready) recently and which have not. Previously salt simply refused to ping any hosts if the minion data cache was disabled. Change-Id: I71ce050fcc4e0fce29ac9d98e0528ce339a0d812 --- A debian/patches/ping_minions_without_data_cache_WMF.patch M debian/patches/series 2 files changed, 16 insertions(+), 0 deletions(-) Approvals: ArielGlenn: Verified; Looks good to me, approved diff --git a/debian/patches/ping_minions_without_data_cache_WMF.patch b/debian/patches/ping_minions_without_data_cache_WMF.patch new file mode 100644 index 0000000..7a58e91 --- /dev/null +++ b/debian/patches/ping_minions_without_data_cache_WMF.patch @@ -0,0 +1,15 @@ +Description: Consider all minions connected for pinging, workaround for missing minion data cache +Bug: https://github.com/saltstack/salt/issues/29525 +Author: Ariel T. Glenn <[email protected]> +Forwarded: no +--- a/salt/utils/master.py ++++ b/salt/utils/master.py +@@ -396,5 +396,6 @@ + + def ping_all_connected_minions(opts): + client = salt.client.LocalClient() +- ckminions = salt.utils.minions.CkMinions(opts) +- client.cmd(list(ckminions.connected_ids()), 'test.ping', expr_form='list') ++ client.cmd('*', 'test.ping') ++ # ckminions = salt.utils.minions.CkMinions(opts) ++ # client.cmd(list(ckminions.connected_ids()), 'test.ping', expr_form='list') diff --git a/debian/patches/series b/debian/patches/series index 4427e49..469243b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ make-log-file-group-readable.patch batch_returns_bad_dict_WMF.patch event_reading_returns_prematurely_WMF.patch +ping_minions_without_data_cache_WMF.patch -- To view, visit https://gerrit.wikimedia.org/r/260570 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I71ce050fcc4e0fce29ac9d98e0528ce339a0d812 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/salt Gerrit-Branch: precise Gerrit-Owner: ArielGlenn <[email protected]> Gerrit-Reviewer: ArielGlenn <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
