Commit Graph

35883 Commits

Author SHA1 Message Date
Thomas S Hatch
884f4df787 lint fix 2014-09-24 21:22:36 -06:00
rallytime
4830b4773a Remove unused refresh argument
Closes #16118
2014-09-24 21:01:28 -06:00
Thomas S Hatch
c66a222827 Merge pull request #16122 from rallytime/pylint
Pylint fix
2014-09-24 20:14:56 -06:00
Thomas S Hatch
dfde5eac5a Merge pull request #16116 from cachedout/better_auth_failure_message
Better fail message.
2014-09-24 20:13:29 -06:00
Thomas S Hatch
b043c150ab Merge pull request #16113 from cachedout/issue_15693
Error handling in broken SLS file.
2014-09-24 20:11:58 -06:00
Thomas S Hatch
c555fed654 Merge pull request #16108 from rallytime/azure_errors
Improve error reporting when creating a vm name with a '.'
2014-09-24 20:11:20 -06:00
Thomas S Hatch
ad42cd1670 Merge pull request #16102 from cachedout/issue_16073
Catch invalid saltenv
2014-09-24 20:09:43 -06:00
Thomas Jackson
87f43bbedd Typo fix 2014-09-24 16:16:10 -07:00
Thomas Jackson
43778338cd Add a timeout to get_event_iter_returns, the old implementation won't timeout if the event buss is relatively busy 2014-09-24 16:16:04 -07:00
Thomas Jackson
0d0f3e63af Start pinging minions after TIMEOUT, instead of immediately 2014-09-24 16:15:51 -07:00
Thomas Jackson
3773b02489 Pylint cleanup 2014-09-24 16:15:45 -07:00
Thomas Jackson
295afba5f8 Rework of more_time feature
In the past this feature has basically checked returns, pinged minions if they were still running the job, then returning once the job was no longer run remotely. This has caused some issues with race conditions if the minion or master are busy (and the time between minion done, and master recieved gets large).

This changes the behavior of the "wait" mechanism. The intent of this feature is to wait for the job return from all minions the job went to. To accomplish this we fire the job, then check the returns. If the initial returns are what we wanted/expected we break. If it isn't we will ping all targets and see if its still running. If more minions return, we merge them into the list of minions we are waiting for. We will timeout the job once all minions have stopped running the job and TIMEOUT seconds have passed (since the slowest minion)

Conflicts:

	salt/client/__init__.py
2014-09-24 16:15:36 -07:00
Thomas S Hatch
ce68cfa811 reformat hg command inputs 2014-09-24 16:43:32 -06:00
rallytime
276e7912d9 Pylint fix 2014-09-24 16:21:33 -06:00
Thomas S Hatch
384588d500 Merge pull request #16103 from thatch45/16066
Make the error more concise for wfunc per denies
2014-09-24 16:09:18 -06:00
Thomas S Hatch
928d2b61d1 Merge pull request #16104 from thatch45/16071
Fix #16071
2014-09-24 16:08:41 -06:00
Thomas S Hatch
48cda23b82 the thin tarball should not NEED msgpack, but it is good to have 2014-09-24 16:06:12 -06:00
Mike Place
0f7cbf2dc0 Better fail message.
If you're using salt-call for the first time and don't pass --local, the
message 'Failed to sign in' is kind of confusing. This makes it a little
more clear about what the problem really is.
2014-09-24 16:03:17 -06:00
Samuel Smith
dd2642b247 Merge pull request #16114 from SmithSamuelM/2014.7_sam4
Refactor application kind Also clean up routing logic a little
2014-09-24 15:05:34 -06:00
Samuel M Smith
209561ddb1 Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4 2014-09-24 15:00:50 -06:00
Samuel M Smith
0675f23bf6 Refactored name of application kind (type) to kind 2014-09-24 14:59:42 -06:00
Mike Place
a0b6c586d1 Error handling in broken SLS file.
Closes #15693
2014-09-24 14:57:49 -06:00
rallytime
efcdfcf8f2 Improve error reporting when creating a vm name with a '.' 2014-09-24 14:13:04 -06:00
Thomas S Hatch
6d40875d7f Merge pull request #16082 from thatch45/16064
Fix #16064
2014-09-24 12:44:53 -06:00
Thomas S Hatch
103016bf66 Merge pull request #16080 from thatch45/16061
Add master opts to the loader
2014-09-24 12:44:38 -06:00
Thomas S Hatch
074448bd56 Fix #16071 2014-09-24 12:43:44 -06:00
Thomas S Hatch
2669a09c97 Make the error more concise for wfunc per denies
this should fix #16066
2014-09-24 12:37:26 -06:00
Colton Myers
0a40b81689 Revert "Change timeout for CLI returns" 2014-09-24 11:30:01 -07:00
Thomas Jackson
3c3a7391c1 Cleanup of some old debugging 2014-09-24 11:25:03 -07:00
Mike Place
b85fc91a16 Catch invalid saltenv 2014-09-24 11:55:04 -06:00
Thomas S Hatch
8519139382 Merge pull request #16097 from s0undt3ch/hotfix/bootstrap-script
[2014.7] Update to latest bootstrap stable release v2014.09.24
2014-09-24 11:54:45 -06:00
Thomas S Hatch
43a8423ea9 Lint fix, add __master_opts__ to the bultins list 2014-09-24 11:30:49 -06:00
Pedro Algarvio
4f560fa158 Update to latest bootstrap stable release v2014.09.24
* Fixed salt tag version matching to also accept, for example, v2014.7. saltstack/salt-bootstrap#464
* Fix the EPEL 7 URL since epel-release is now 7.2
2014-09-24 16:03:24 +01:00
Pedro Algarvio
5ec46a6bd0 Update to last stable release script, v2014.09.09
* Distro Support Fixes:
  * Updated the URL for EPEL 7
  * PIP based installations on Ubuntu 10.04 need setuptools installed
  * Arch stopped providing the version information on `/etc/arch-release`
  * Complete `salt-api` services checking skips. #450
2014-09-24 16:03:00 +01:00
Thomas S Hatch
4e6b963751 Merge pull request #16081 from terminalmage/docs
Improve formatting
2014-09-23 21:34:15 -06:00
Thomas S Hatch
3689c0608e Add __master_opts to pylintrc exclusions 2014-09-23 21:30:18 -06:00
Thomas Jackson
e9821e60eb Pylint fixes 2014-09-23 19:39:06 -07:00
Thomas S Hatch
7c1940f0c2 Fix #16064 2014-09-23 20:09:06 -06:00
Erik Johnson
a4413bb27a Improve formatting
Bullet points look better here than an indented section with an enormous
font.
2014-09-23 20:58:26 -05:00
Thomas S Hatch
38009fc8d3 Add master opts to the loader
This allows us to create objects in the wrapper classes that are run
purely on the master opts
2014-09-23 19:54:50 -06:00
Thomas S Hatch
ee9bf6c6cc Merge pull request #16062 from rallytime/fix_ec2_tests
Fix the ec2 cloud provider tests
2014-09-23 17:16:10 -06:00
Thomas Jackson
9aac81c476 Pylint fix 2014-09-23 14:39:01 -07:00
Thomas Jackson
6225ae5145 Remove "never timeout" feature 2014-09-23 14:13:44 -07:00
Thomas Jackson
6e93b3b680 Attempt to fix race condition in return
This is due to our pinging of the minions for job returns, there is a non-zero amount of time between the job showing as "not running" on the minion and showing as recieved by the master. This will only be worse on Syndics-- so I'd recommend not using a 0 timeout value unless you have a small cluser
2014-09-23 14:13:42 -07:00
Thomas S Hatch
878ebd37f1 lint fix 2014-09-23 14:13:39 -07:00
Thomas Jackson
2075fcde77 Update docs 2014-09-23 14:13:35 -07:00
Thomas Jackson
6b91d539b8 Add tests for timeouts to client tests. In addition this makes all of the client functions have the same functionality 2014-09-23 14:13:33 -07:00
Thomas Jackson
c8f15230f5 Add CLI timeout tests to standard client tests 2014-09-23 14:13:31 -07:00
Thomas Jackson
7c2a9e9e0e Change timeout for CLI returns
This is a fix for #15905, the intent being that if you set a timeout it will actually time out. If you pass/set a timeout of 0 it will do the checking of minions etc to determine if the job is running. This seems to be a better compromise since the user/admin can decide wether to have timeouts or not
2014-09-23 14:13:29 -07:00
Thomas Jackson
783c502ceb Add localconfig to all state functions
Abstract the opts loading to a seperate function, and check a specific kwarg
2014-09-23 14:13:27 -07:00