smwltr/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

Fix bug with parallel hosts operation and specified output path.

Browse source
This commit is contained in:
Darko Poljak 2016-04-02 22:44:02 +02:00
parent fa5950d329
commit 3062421cf5
5 changed files with 52 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
cdist/exec/local.py
View file

@ -2,6 +2,7 @@
#
# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
# 2011-2015 Nico Schottelius (nico-cdist at schottelius.org)
# 2016 Darko Poljak (darko.poljak at gmail.com)
#
# This file is part of cdist.
#
@ -51,9 +52,18 @@ class Local(object):
# FIXME: stopped: create base that does not require moving later
if base_path:
self.base_path = base_path
base_path_parent = base_path
else:
self.base_path = tempfile.mkdtemp()
base_path_parent = tempfile.mkdtemp()
import atexit
atexit.register(lambda: shutil.rmtree(base_path_parent))
self.hostdir = self._hostdir()
self.base_path = os.path.join(base_path_parent, self.hostdir)
self._init_log()
self._init_permissions()
self.mkdir(self.base_path)
# FIXME: as well
self._init_cache_dir(None)
@ -63,8 +73,6 @@ class Local(object):
self._add_conf_dirs = add_conf_dirs
self._init_log()
self._init_permissions()
self._init_paths()
self._init_object_marker()
self._init_conf_dirs()
@ -80,6 +88,13 @@ class Local(object):
else:
return None
def _hostdir(self):
if os.path.isabs(self.target_host):
hostdir = self.target_host[1:]
else:
hostdir = self.target_host
return hostdir
def _init_log(self):
self.log = logging.getLogger(self.target_host)
@ -210,13 +225,9 @@ class Local(object):
return self.run(command=command, env=env, return_output=return_output, message_prefix=message_prefix)
def save_cache(self):
if os.path.isabs(self.target_host):
hostdir = self.target_host[1:]
else:
hostdir = self.target_host
destination = os.path.join(self.cache_path, hostdir)
def save_cache(self):
destination = os.path.join(self.cache_path, self.hostdir)
self.log.debug("Saving " + self.base_path + " to " + destination)
try:

8
cdist/test/exec/fixtures/conf/type/__cdist_test_type/gencode-local Executable file
View file

@ -0,0 +1,8 @@
#!/bin/sh
echo "echo __target_host: $__target_host"
echo "echo __global: $__global"
echo "echo __type: $__type"
echo "echo __object: $__object"
echo "echo __object_id: $__object_id"
echo "echo __object_name: $__object_name"

1
cdist/test/exec/fixtures/conf/type/__cdist_test_type/gencode-remote Symbolic link
View file

@ -0,0 +1 @@
gencode-local

32
cdist/test/exec/local.py
View file

@ -2,6 +2,7 @@
#
# 2010-2011 Steven Armstrong (steven-cdist at armstrong.cc)
# 2012 Nico Schottelius (nico-cdist at schottelius.org)
# 2016 Darko Poljak (darko.poljak at gmail.com)
#
# This file is part of cdist.
#
@ -35,17 +36,21 @@ my_dir = op.abspath(op.dirname(__file__))
fixtures = op.join(my_dir, 'fixtures')
conf_dir = op.join(fixtures, "conf")
bin_true = "/usr/bin/true"
bin_false = "/usr/bin/false"
class LocalTestCase(test.CdistTestCase):
def setUp(self):
target_host = 'localhost'
self.temp_dir = self.mkdtemp()
self.out_path = self.temp_dir
self.out_parent_path = self.temp_dir
self.out_path = op.join(self.out_parent_path, target_host)
self.local = local.Local(
target_host=target_host,
out_path=self.out_path,
base_path=self.out_parent_path,
exec_path=test.cdist_exec_path
)
@ -63,7 +68,7 @@ class LocalTestCase(test.CdistTestCase):
self.assertEqual(self.local.conf_path, os.path.join(self.out_path, "conf"))
def test_out_path(self):
self.assertEqual(self.local.out_path, self.out_path)
self.assertEqual(self.local.base_path, self.out_path)
def test_bin_path(self):
self.assertEqual(self.local.bin_path, os.path.join(self.out_path, "bin"))
@ -94,7 +99,7 @@ class LocalTestCase(test.CdistTestCase):
link_test_local = local.Local(
target_host='localhost',
out_path=self.out_path,
base_path=self.out_parent_path,
exec_path=test.cdist_exec_path,
)
@ -111,7 +116,7 @@ class LocalTestCase(test.CdistTestCase):
link_test_local = local.Local(
target_host='localhost',
out_path=self.out_path,
base_path=self.out_parent_path,
exec_path=test.cdist_exec_path,
add_conf_dirs=[conf_dir]
)
@ -131,7 +136,7 @@ class LocalTestCase(test.CdistTestCase):
link_test_local = local.Local(
target_host='localhost',
out_path=self.out_path,
base_path=self.out_parent_path,
exec_path=test.cdist_exec_path,
)
@ -144,21 +149,21 @@ class LocalTestCase(test.CdistTestCase):
### other tests
def test_run_success(self):
self.local.run(['/bin/true'])
self.local.run([bin_true])
def test_run_fail(self):
self.assertRaises(cdist.Error, self.local.run, ['/bin/false'])
self.assertRaises(cdist.Error, self.local.run, [bin_false])
def test_run_script_success(self):
handle, script = self.mkstemp(dir=self.temp_dir)
with os.fdopen(handle, "w") as fd:
fd.writelines(["#!/bin/sh\n", "/bin/true"])
fd.writelines(["#!/bin/sh\n", bin_true])
self.local.run_script(script)
def test_run_script_fail(self):
handle, script = self.mkstemp(dir=self.temp_dir)
with os.fdopen(handle, "w") as fd:
fd.writelines(["#!/bin/sh\n", "/bin/false"])
fd.writelines(["#!/bin/sh\n", bin_false])
self.assertRaises(cdist.Error, self.local.run_script, script)
def test_run_script_get_output(self):
@ -180,6 +185,11 @@ class LocalTestCase(test.CdistTestCase):
def test_create_files_dirs(self):
self.local.create_files_dirs()
self.assertTrue(os.path.isdir(self.local.out_path))
self.assertTrue(os.path.isdir(self.local.base_path))
self.assertTrue(os.path.isdir(self.local.bin_path))
self.assertTrue(os.path.isdir(self.local.conf_path))
if __name__ == "__main__":
import unittest
unittest.main()

1
docs/changelog
View file

@ -2,6 +2,7 @@ Changelog
---------
next:
* Core: Fix bug with parallel hosts operation when output path is specifed (Darko Poljak)
* Core: Add CDIST_REMOTE_COPY/EXEC env variables and multiplexing options for default scp/ssh (Darko Poljak)
* Types: Remove bashisms in scripts (Darko Poljak)
* Core: Fix bug in remote command with environment (Darko Poljak)