saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #37352 from rallytime/merge-carbon

Browse source 
[carbon] Merge forward from 2016.3 to carbon
This commit is contained in:
Nicole Thomas 2016-10-31 11:20:18 -06:00 • committed by GitHub
commit dde8c71408
3 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/topics/cloud/aws.rst
View file

@ -415,6 +415,16 @@ Multiple security groups can also be specified in the same fashion:
- default
- extra
EC2 instances can be added to an `AWS Placement Group`_ by specifying the
``placementgroup`` option:
.. code-block:: yaml
my-ec2-config:
placementgroup: my-aws-placement-group
.. _`AWS Placement Group`: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html
Your instances may optionally make use of EC2 Spot Instances. The
following example will request that spot instances be used and your
maximum bid will be $0.10. Keep in mind that different spot prices

17
salt/utils/process.py
View file

@ -392,19 +392,12 @@ class ProcessManager(object):
try:
# in case someone died while we were waiting...
self.check_children()
if not salt.utils.is_windows() and not async:
pid, exit_status = os.wait()
if pid not in self._process_map:
log.debug('Process of pid {0} died, not a known'
' process, will not restart'.format(pid))
continue
if self._restart_processes is True:
self.restart_process(pid)
elif async is True:
# The event-based subprocesses management code was removed from here
# because os.wait() conflicts with the subprocesses management logic
# implemented in `multiprocessing` package. See #35480 for details.
if async:
yield gen.sleep(10)
elif async is False:
# os.wait() is not supported on Windows.
else:
time.sleep(10)
# OSError is raised if a signal handler is called (SIGTERM) during os.wait
except OSError:

8
tests/unit/utils/process_test.py
View file

@ -46,7 +46,7 @@ class TestProcessManager(TestCase):
time.sleep(0.5)
# Are there child processes still running?
if process_manager._process_map.keys():
process_manager.send_signal_to_processes(signal.SIGILL)
process_manager.send_signal_to_processes(signal.SIGKILL)
process_manager.stop_restarting()
process_manager.kill_children()
@ -72,7 +72,7 @@ class TestProcessManager(TestCase):
time.sleep(0.5)
# Are there child processes still running?
if process_manager._process_map.keys():
process_manager.send_signal_to_processes(signal.SIGILL)
process_manager.send_signal_to_processes(signal.SIGKILL)
process_manager.stop_restarting()
process_manager.kill_children()
@ -96,7 +96,7 @@ class TestProcessManager(TestCase):
time.sleep(0.5)
# Are there child processes still running?
if process_manager._process_map.keys():
process_manager.send_signal_to_processes(signal.SIGILL)
process_manager.send_signal_to_processes(signal.SIGKILL)
process_manager.stop_restarting()
process_manager.kill_children()
@ -121,7 +121,7 @@ class TestProcessManager(TestCase):
time.sleep(0.5)
# Are there child processes still running?
if process_manager._process_map.keys():
process_manager.send_signal_to_processes(signal.SIGILL)
process_manager.send_signal_to_processes(signal.SIGKILL)
process_manager.stop_restarting()
process_manager.kill_children()