2014-12-12 16:04:02 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
|
|
|
# Import python libs
|
2018-01-12 22:37:46 +00:00
|
|
|
from __future__ import absolute_import, print_function, unicode_literals
|
2014-12-12 16:04:02 +00:00
|
|
|
import os
|
2016-10-31 10:20:48 +00:00
|
|
|
import sys
|
2014-12-12 16:04:02 +00:00
|
|
|
import time
|
|
|
|
import signal
|
|
|
|
import multiprocessing
|
2017-11-30 15:59:31 +00:00
|
|
|
import functools
|
2014-12-12 16:04:02 +00:00
|
|
|
|
|
|
|
# Import Salt Testing libs
|
2017-02-27 13:58:07 +00:00
|
|
|
from tests.support.unit import TestCase, skipIf
|
2017-10-09 19:26:22 +00:00
|
|
|
from tests.support.mock import (
|
|
|
|
patch,
|
|
|
|
NO_MOCK,
|
|
|
|
NO_MOCK_REASON
|
|
|
|
)
|
2014-12-12 16:04:02 +00:00
|
|
|
|
|
|
|
# Import salt libs
|
2017-12-11 23:43:33 +00:00
|
|
|
import salt.utils.platform
|
2014-12-12 16:04:02 +00:00
|
|
|
import salt.utils.process
|
|
|
|
|
2014-11-21 20:17:01 +00:00
|
|
|
# Import 3rd-party libs
|
Use explicit unicode strings + break up salt.utils
This PR is part of what will be an ongoing effort to use explicit
unicode strings in Salt. Because Python 3 does not suport Python 2's raw
unicode string syntax (i.e. `ur'\d+'`), we must use
`salt.utils.locales.sdecode()` to ensure that the raw string is unicode.
However, because of how `salt/utils/__init__.py` has evolved into the
hulking monstrosity it is today, this means importing a large module in
places where it is not needed, which could negatively impact
performance. For this reason, this PR also breaks out some of the
functions from `salt/utils/__init__.py` into new/existing modules under
`salt/utils/`. The long term goal will be that the modules within this
directory do not depend on importing `salt.utils`.
A summary of the changes in this PR is as follows:
* Moves the following functions from `salt.utils` to new locations
(including a deprecation warning if invoked from `salt.utils`):
`to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`,
`dequote`, `is_hex`, `is_bin_str`, `rand_string`,
`contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`,
`which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`,
`is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`,
`is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`,
`is_openbsd`, `is_aix`
* Moves the functions already deprecated by @rallytime to the bottom of
`salt/utils/__init__.py` for better organization, so we can keep the
deprecated ones separate from the ones yet to be deprecated as we
continue to break up `salt.utils`
* Updates `salt/*.py` and all files under `salt/client/` to use explicit
unicode string literals.
* Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils
import foo` becomes `import salt.utils.foo as foo`).
* Renames the `test.rand_str` function to `test.random_hash` to more
accurately reflect what it does
* Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`)
such that it returns a string matching the passed size. Previously
this function would get `size` bytes from `os.urandom()`,
base64-encode it, and return the result, which would in most cases not
be equal to the passed size.
2017-07-25 01:47:15 +00:00
|
|
|
from salt.ext import six
|
2014-11-21 20:17:01 +00:00
|
|
|
from salt.ext.six.moves import range # pylint: disable=import-error,redefined-builtin
|
|
|
|
|
2016-03-28 18:37:52 +00:00
|
|
|
|
2017-11-30 15:59:31 +00:00
|
|
|
def die(func):
|
|
|
|
'''
|
|
|
|
Add proc title
|
|
|
|
'''
|
|
|
|
@functools.wraps(func)
|
|
|
|
def wrapper(self):
|
|
|
|
# Strip off the "test_" from the function name
|
|
|
|
name = func.__name__[5:]
|
2017-12-01 23:45:06 +00:00
|
|
|
|
2017-11-30 15:59:31 +00:00
|
|
|
def _die():
|
2017-12-11 23:24:41 +00:00
|
|
|
salt.utils.process.appendproctitle('test_{0}'.format(name))
|
2017-11-30 15:59:31 +00:00
|
|
|
setattr(self, 'die_' + name, _die)
|
|
|
|
|
|
|
|
return wrapper
|
|
|
|
|
|
|
|
|
|
|
|
def incr(func):
|
|
|
|
'''
|
|
|
|
Increment counter
|
|
|
|
'''
|
|
|
|
@functools.wraps(func)
|
|
|
|
def wrapper(self):
|
|
|
|
# Strip off the "test_" from the function name
|
|
|
|
name = func.__name__[5:]
|
2017-12-01 23:45:06 +00:00
|
|
|
|
2017-11-30 15:59:31 +00:00
|
|
|
def _incr(counter, num):
|
2017-12-11 23:24:41 +00:00
|
|
|
salt.utils.process.appendproctitle('test_{0}'.format(name))
|
2017-11-30 15:59:31 +00:00
|
|
|
for _ in range(0, num):
|
|
|
|
counter.value += 1
|
|
|
|
setattr(self, 'incr_' + name, _incr)
|
|
|
|
|
|
|
|
return wrapper
|
|
|
|
|
|
|
|
|
|
|
|
def spin(func):
|
|
|
|
'''
|
|
|
|
Spin indefinitely
|
|
|
|
'''
|
|
|
|
@functools.wraps(func)
|
|
|
|
def wrapper(self):
|
|
|
|
# Strip off the "test_" from the function name
|
|
|
|
name = func.__name__[5:]
|
2017-12-01 23:45:06 +00:00
|
|
|
|
2017-11-30 15:59:31 +00:00
|
|
|
def _spin():
|
2017-12-11 23:24:41 +00:00
|
|
|
salt.utils.process.appendproctitle('test_{0}'.format(name))
|
2017-11-30 15:59:31 +00:00
|
|
|
while True:
|
|
|
|
time.sleep(1)
|
|
|
|
setattr(self, 'spin_' + name, _spin)
|
|
|
|
|
|
|
|
return wrapper
|
|
|
|
|
|
|
|
|
2014-12-12 16:04:02 +00:00
|
|
|
class TestProcessManager(TestCase):
|
|
|
|
|
2017-11-30 15:59:31 +00:00
|
|
|
@spin
|
2014-12-12 16:04:02 +00:00
|
|
|
def test_basic(self):
|
|
|
|
'''
|
|
|
|
Make sure that the process is alive 2s later
|
|
|
|
'''
|
|
|
|
process_manager = salt.utils.process.ProcessManager()
|
2017-11-30 15:59:31 +00:00
|
|
|
process_manager.add_process(self.spin_basic)
|
2014-11-21 20:17:01 +00:00
|
|
|
initial_pid = next(six.iterkeys(process_manager._process_map))
|
2014-12-12 16:04:02 +00:00
|
|
|
time.sleep(2)
|
|
|
|
process_manager.check_children()
|
2016-03-16 18:41:23 +00:00
|
|
|
try:
|
|
|
|
assert initial_pid == next(six.iterkeys(process_manager._process_map))
|
|
|
|
finally:
|
|
|
|
process_manager.stop_restarting()
|
|
|
|
process_manager.kill_children()
|
|
|
|
time.sleep(0.5)
|
|
|
|
# Are there child processes still running?
|
|
|
|
if process_manager._process_map.keys():
|
2016-10-31 07:54:42 +00:00
|
|
|
process_manager.send_signal_to_processes(signal.SIGKILL)
|
2016-03-16 18:41:23 +00:00
|
|
|
process_manager.stop_restarting()
|
|
|
|
process_manager.kill_children()
|
2014-12-12 16:04:02 +00:00
|
|
|
|
2017-11-30 15:59:31 +00:00
|
|
|
@spin
|
2014-12-12 16:04:02 +00:00
|
|
|
def test_kill(self):
|
|
|
|
process_manager = salt.utils.process.ProcessManager()
|
2017-11-30 15:59:31 +00:00
|
|
|
process_manager.add_process(self.spin_kill)
|
2014-11-21 20:17:01 +00:00
|
|
|
initial_pid = next(six.iterkeys(process_manager._process_map))
|
2014-12-12 16:04:02 +00:00
|
|
|
# kill the child
|
2017-12-11 23:43:33 +00:00
|
|
|
if salt.utils.platform.is_windows():
|
2017-11-30 15:59:31 +00:00
|
|
|
os.kill(initial_pid, signal.SIGTERM)
|
|
|
|
else:
|
|
|
|
os.kill(initial_pid, signal.SIGKILL)
|
2014-12-12 16:04:02 +00:00
|
|
|
# give the OS time to give the signal...
|
|
|
|
time.sleep(0.1)
|
|
|
|
process_manager.check_children()
|
2016-03-16 18:41:23 +00:00
|
|
|
try:
|
|
|
|
assert initial_pid != next(six.iterkeys(process_manager._process_map))
|
|
|
|
finally:
|
|
|
|
process_manager.stop_restarting()
|
|
|
|
process_manager.kill_children()
|
|
|
|
time.sleep(0.5)
|
|
|
|
# Are there child processes still running?
|
|
|
|
if process_manager._process_map.keys():
|
2016-10-31 07:54:42 +00:00
|
|
|
process_manager.send_signal_to_processes(signal.SIGKILL)
|
2016-03-16 18:41:23 +00:00
|
|
|
process_manager.stop_restarting()
|
|
|
|
process_manager.kill_children()
|
2014-12-12 16:04:02 +00:00
|
|
|
|
2017-11-30 15:59:31 +00:00
|
|
|
@die
|
2014-12-12 16:04:02 +00:00
|
|
|
def test_restarting(self):
|
|
|
|
'''
|
|
|
|
Make sure that the process is alive 2s later
|
|
|
|
'''
|
|
|
|
process_manager = salt.utils.process.ProcessManager()
|
2017-11-30 15:59:31 +00:00
|
|
|
process_manager.add_process(self.die_restarting)
|
2014-11-21 20:17:01 +00:00
|
|
|
initial_pid = next(six.iterkeys(process_manager._process_map))
|
2014-12-12 16:04:02 +00:00
|
|
|
time.sleep(2)
|
|
|
|
process_manager.check_children()
|
2016-03-16 18:41:23 +00:00
|
|
|
try:
|
|
|
|
assert initial_pid != next(six.iterkeys(process_manager._process_map))
|
|
|
|
finally:
|
|
|
|
process_manager.stop_restarting()
|
|
|
|
process_manager.kill_children()
|
|
|
|
time.sleep(0.5)
|
|
|
|
# Are there child processes still running?
|
|
|
|
if process_manager._process_map.keys():
|
2016-10-31 07:54:42 +00:00
|
|
|
process_manager.send_signal_to_processes(signal.SIGKILL)
|
2016-03-16 18:41:23 +00:00
|
|
|
process_manager.stop_restarting()
|
|
|
|
process_manager.kill_children()
|
2014-12-12 16:04:02 +00:00
|
|
|
|
2016-10-31 10:21:43 +00:00
|
|
|
@skipIf(sys.version_info < (2, 7), 'Needs > Py 2.7 due to bug in stdlib')
|
2017-11-30 15:59:31 +00:00
|
|
|
@incr
|
2014-12-12 16:04:02 +00:00
|
|
|
def test_counter(self):
|
|
|
|
counter = multiprocessing.Value('i', 0)
|
|
|
|
process_manager = salt.utils.process.ProcessManager()
|
2017-11-30 15:59:31 +00:00
|
|
|
process_manager.add_process(self.incr_counter, args=(counter, 2))
|
2014-12-12 16:04:02 +00:00
|
|
|
time.sleep(1)
|
|
|
|
process_manager.check_children()
|
|
|
|
time.sleep(1)
|
|
|
|
# we should have had 2 processes go at it
|
2016-03-16 18:41:23 +00:00
|
|
|
try:
|
|
|
|
assert counter.value == 4
|
|
|
|
finally:
|
|
|
|
process_manager.stop_restarting()
|
|
|
|
process_manager.kill_children()
|
|
|
|
time.sleep(0.5)
|
|
|
|
# Are there child processes still running?
|
|
|
|
if process_manager._process_map.keys():
|
2016-10-31 07:54:42 +00:00
|
|
|
process_manager.send_signal_to_processes(signal.SIGKILL)
|
2016-03-16 18:41:23 +00:00
|
|
|
process_manager.stop_restarting()
|
|
|
|
process_manager.kill_children()
|
2014-12-12 16:04:02 +00:00
|
|
|
|
2014-12-12 17:42:41 +00:00
|
|
|
|
2014-12-12 16:15:34 +00:00
|
|
|
class TestThreadPool(TestCase):
|
|
|
|
|
|
|
|
def test_basic(self):
|
|
|
|
'''
|
|
|
|
Make sure the threadpool can do things
|
|
|
|
'''
|
|
|
|
def incr_counter(counter):
|
|
|
|
counter.value += 1
|
2014-12-12 17:42:41 +00:00
|
|
|
counter = multiprocessing.Value('i', 0)
|
2014-12-12 16:15:34 +00:00
|
|
|
|
|
|
|
pool = salt.utils.process.ThreadPool()
|
|
|
|
sent = pool.fire_async(incr_counter, args=(counter,))
|
|
|
|
self.assertTrue(sent)
|
|
|
|
time.sleep(1) # Sleep to let the threads do things
|
|
|
|
self.assertEqual(counter.value, 1)
|
|
|
|
self.assertEqual(pool._job_queue.qsize(), 0)
|
|
|
|
|
|
|
|
def test_full_queue(self):
|
|
|
|
'''
|
|
|
|
Make sure that a full threadpool acts as we expect
|
|
|
|
'''
|
|
|
|
def incr_counter(counter):
|
|
|
|
counter.value += 1
|
2014-12-12 17:42:41 +00:00
|
|
|
counter = multiprocessing.Value('i', 0)
|
2014-12-12 16:15:34 +00:00
|
|
|
|
|
|
|
# Create a pool with no workers and 1 queue size
|
|
|
|
pool = salt.utils.process.ThreadPool(0, 1)
|
|
|
|
# make sure we can put the one item in
|
|
|
|
sent = pool.fire_async(incr_counter, args=(counter,))
|
|
|
|
self.assertTrue(sent)
|
|
|
|
# make sure we can't put more in
|
|
|
|
sent = pool.fire_async(incr_counter, args=(counter,))
|
|
|
|
self.assertFalse(sent)
|
|
|
|
time.sleep(1) # Sleep to let the threads do things
|
|
|
|
# make sure no one updated the counter
|
|
|
|
self.assertEqual(counter.value, 0)
|
|
|
|
# make sure the queue is still full
|
|
|
|
self.assertEqual(pool._job_queue.qsize(), 1)
|
2017-10-09 19:26:22 +00:00
|
|
|
|
|
|
|
|
|
|
|
class TestProcess(TestCase):
|
|
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
|
|
def test_daemonize_if(self):
|
|
|
|
# pylint: disable=assignment-from-none
|
|
|
|
with patch('sys.argv', ['salt-call']):
|
|
|
|
ret = salt.utils.process.daemonize_if({})
|
|
|
|
self.assertEqual(None, ret)
|
|
|
|
|
|
|
|
ret = salt.utils.process.daemonize_if({'multiprocessing': False})
|
|
|
|
self.assertEqual(None, ret)
|
|
|
|
|
|
|
|
with patch('sys.platform', 'win'):
|
|
|
|
ret = salt.utils.process.daemonize_if({})
|
|
|
|
self.assertEqual(None, ret)
|
|
|
|
|
2018-01-19 22:15:13 +00:00
|
|
|
with patch('salt.utils.process.daemonize'), \
|
|
|
|
patch('sys.platform', 'linux2'):
|
2017-10-09 19:26:22 +00:00
|
|
|
salt.utils.process.daemonize_if({})
|
|
|
|
self.assertTrue(salt.utils.process.daemonize.called)
|
|
|
|
# pylint: enable=assignment-from-none
|