Skip to content
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.

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

fix salt --summary to count not responding minions correctly #34165

Merged
merged 1 commit into from
Jun 21, 2016

Conversation

mcalmer
Copy link
Contributor

@mcalmer mcalmer commented Jun 21, 2016

What does this PR do?

fix salt --summary .... in case a minion is not returning

Previous Behavior

# salt --summary '*' test.ping
minion1:
    True
minion2:
    Minion did not return. [Not connected]
-------------------------------------------
Summary
-------------------------------------------
# of minions targeted: 2
# of minions returned: 2
# of minions that did not return: 0
-------------------------------------------

New Behavior

# salt --summary '*' test.ping
minion1:
    True
minion2:
    Minion did not return. [Not connected]
-------------------------------------------
Summary
-------------------------------------------
# of minions targeted: 2
# of minions returned: 1
# of minions that did not return: 1
-------------------------------------------

Tests written?

No

@mcalmer
Copy link
Contributor Author

mcalmer commented Jun 21, 2016

Seems that this bug is already fixed in 2016... and develop in a different way.
But it seems to need some more fixes in other areas. So for 2015.8 it might be good to check for dict type.

@rallytime
Copy link
Contributor

Thanks for fixing this @mcalmer. There is one pylint error. Can you fix that up?

In case a minion is not responding a dict is returned instead of a string.
@mcalmer
Copy link
Contributor Author

mcalmer commented Jun 21, 2016

@rallytime - just forced pushed

@rallytime
Copy link
Contributor

Great! Thank you!

@rallytime rallytime merged commit 6387d16 into saltstack:2015.8 Jun 21, 2016
@rallytime rallytime added the Needs-Testcase PR needs test cases written, or the issue is about a bug/feature that needs test cases label Jun 21, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jun 22, 2016
* upstream/develop: (25 commits)
  Support using private IPs (without pubic IPs) (saltstack#34187)
  Add 'delete' key event to list (saltstack#34189)
  Don't return bytes if py3 in salt-cloud (saltstack#34105)
  Raise the correct exception when gitfs lockfile is empty
  Remove unnecesssary comment
  Fix diskusage beacon
  fix salt --summary to count not responding minions correctly (saltstack#34165)
  doc: add missing dot (saltstack#34175)
  Typo fix (saltstack#34174)
  Update docs to match log_level warning default
  Fix YAML indentation in Apache state docstrings (saltstack#34166)
  Add integration tests for grains.append
  Moved imports to top, out of _get_moto_version function
  Updated version check. Moved check into it's own function
  Move log message from INFO to DEBUG.
  Updated test to work with new moto version. Changed strings to unicode
  Update package dep note to systemd-python for RHEL7 install
  _active_mounts_openbsd: unbreak output for special filesystems
  Make docker.absent honor test=true
  When specifying the SSH identity to use with Git as a salt URL, eg. salt://files/identity, if that file exists outside of the default base environment the file won't be accessible so we need to include the saltenv.
  ...

# Conflicts:
#	salt/states/git.py
@mcalmer mcalmer deleted the fix-salt-summary branch March 1, 2020 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs-Testcase PR needs test cases written, or the issue is about a bug/feature that needs test cases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants