Commit 20e9ad51 authored by Marco Mariani's avatar Marco Mariani

whitespace/indent cleanup

parent 6c003ece
...@@ -41,6 +41,7 @@ import textwrap ...@@ -41,6 +41,7 @@ import textwrap
import xmlrpclib import xmlrpclib
from supervisor import xmlrpc from supervisor import xmlrpc
from slapos.grid.utils import (md5digest, getCleanEnvironment, bootstrapBuildout, from slapos.grid.utils import (md5digest, getCleanEnvironment, bootstrapBuildout,
launchBuildout, SlapPopen, dropPrivileges, updateFile) launchBuildout, SlapPopen, dropPrivileges, updateFile)
from slapos.slap.slap import NotFoundError from slapos.slap.slap import NotFoundError
...@@ -62,8 +63,9 @@ class Software(object): ...@@ -62,8 +63,9 @@ class Software(object):
shacache_key_file=None, shadir_cert_file=None, shadir_key_file=None, shacache_key_file=None, shadir_cert_file=None, shadir_key_file=None,
download_binary_cache_url=None, upload_binary_cache_url=None, download_binary_cache_url=None, upload_binary_cache_url=None,
download_binary_dir_url=None, upload_binary_dir_url=None, download_binary_dir_url=None, upload_binary_dir_url=None,
download_from_binary_cache_url_blacklist = [], download_from_binary_cache_url_blacklist=[],
upload_to_binary_cache_url_blacklist = []): upload_to_binary_cache_url_blacklist=[]):
# XXX mutable defaults
"""Initialisation of class parameters """Initialisation of class parameters
""" """
self.url = url self.url = url
...@@ -137,8 +139,7 @@ class Software(object): ...@@ -137,8 +139,7 @@ class Software(object):
it. If it fails, we notify the server. it. If it fails, we notify the server.
""" """
root_stat_info = os.stat(self.software_root) root_stat_info = os.stat(self.software_root)
os.environ = getCleanEnvironment(pwd.getpwuid(root_stat_info.st_uid os.environ = getCleanEnvironment(pwd.getpwuid(root_stat_info.st_uid).pw_dir)
).pw_dir)
if not os.path.isdir(self.software_path): if not os.path.isdir(self.software_path):
os.mkdir(self.software_path) os.mkdir(self.software_path)
extends_cache = tempfile.mkdtemp() extends_cache = tempfile.mkdtemp()
...@@ -146,31 +147,31 @@ class Software(object): ...@@ -146,31 +147,31 @@ class Software(object):
# In case when running as root copy ownership, to simplify logic # In case when running as root copy ownership, to simplify logic
for path in [self.software_path, extends_cache]: for path in [self.software_path, extends_cache]:
path_stat_info = os.stat(path) path_stat_info = os.stat(path)
if root_stat_info.st_uid != path_stat_info.st_uid or\ if (root_stat_info.st_uid != path_stat_info.st_uid or
root_stat_info.st_gid != path_stat_info.st_gid: root_stat_info.st_gid != path_stat_info.st_gid):
os.chown(path, root_stat_info.st_uid, os.chown(path, root_stat_info.st_uid,
root_stat_info.st_gid) root_stat_info.st_gid)
try: try:
buildout_parameter_list = [ buildout_parameter_list = [
'buildout:extends-cache=%s' % extends_cache, 'buildout:extends-cache=%s' % extends_cache,
'buildout:directory=%s' % self.software_path,] 'buildout:directory=%s' % self.software_path
]
if self.signature_private_key_file or \ if (self.signature_private_key_file or
self.upload_cache_url or \ self.upload_cache_url or
self.upload_dir_url is not None: self.upload_dir_url is not None):
buildout_parameter_list.append('buildout:networkcache-section=networkcache') buildout_parameter_list.append('buildout:networkcache-section=networkcache')
for buildout_option, value in ( for buildout_option, value in [
('%ssignature-private-key-file=%s', self.signature_private_key_file), ('%ssignature-private-key-file=%s', self.signature_private_key_file),
('%supload-cache-url=%s', self.upload_cache_url), ('%supload-cache-url=%s', self.upload_cache_url),
('%supload-dir-url=%s', self.upload_dir_url), ('%supload-dir-url=%s', self.upload_dir_url),
('%sshacache-cert-file=%s', self.shacache_cert_file), ('%sshacache-cert-file=%s', self.shacache_cert_file),
('%sshacache-key-file=%s', self.shacache_key_file), ('%sshacache-key-file=%s', self.shacache_key_file),
('%sshadir-cert-file=%s', self.shadir_cert_file), ('%sshadir-cert-file=%s', self.shadir_cert_file),
('%sshadir-key-file=%s', self.shadir_key_file), ('%sshadir-key-file=%s', self.shadir_key_file)
): ]:
if value: if value:
buildout_parameter_list.append( \ buildout_parameter_list.append(buildout_option % ('networkcache:', value))
buildout_option % ('networkcache:', value))
buildout_cfg = os.path.join(self.software_path, 'buildout.cfg') buildout_cfg = os.path.join(self.software_path, 'buildout.cfg')
self.createProfileIfMissing(buildout_cfg, self.url) self.createProfileIfMissing(buildout_cfg, self.url)
...@@ -285,14 +286,13 @@ class Partition(object): ...@@ -285,14 +286,13 @@ class Partition(object):
self._updateCertificate() self._updateCertificate()
def _updateCertificate(self): def _updateCertificate(self):
if not os.path.exists(self.key_file) or \ if not os.path.exists(self.key_file) or not os.path.exists(self.cert_file):
not os.path.exists(self.cert_file):
self.logger.info('Certificate and key not found, downloading to %r and ' self.logger.info('Certificate and key not found, downloading to %r and '
'%r' % (self.cert_file, self.key_file)) '%r' % (self.cert_file, self.key_file))
try: try:
partition_certificate = self.computer_partition.getCertificate() partition_certificate = self.computer_partition.getCertificate()
except NotFoundError: except NotFoundError:
raise NotFoundError('Partition %s is not known from SlapOS Master.' % \ raise NotFoundError('Partition %s is not known from SlapOS Master.' %
self.partition_id) self.partition_id)
open(self.key_file, 'w').write(partition_certificate['key']) open(self.key_file, 'w').write(partition_certificate['key'])
open(self.cert_file, 'w').write(partition_certificate['certificate']) open(self.cert_file, 'w').write(partition_certificate['certificate'])
...@@ -308,7 +308,7 @@ class Partition(object): ...@@ -308,7 +308,7 @@ class Partition(object):
return (uid, gid) return (uid, gid)
def addServiceToGroup(self, partition_id, def addServiceToGroup(self, partition_id,
runner_list, path, extension = ''): runner_list, path, extension=''):
uid, gid = self.getUserGroupId() uid, gid = self.getUserGroupId()
program_partition_template = pkg_resources.resource_stream(__name__, program_partition_template = pkg_resources.resource_stream(__name__,
'templates/program_partition_supervisord.conf.in').read() 'templates/program_partition_supervisord.conf.in').read()
...@@ -340,7 +340,7 @@ class Partition(object): ...@@ -340,7 +340,7 @@ class Partition(object):
""" Creates configuration file from template in software_path, then """ Creates configuration file from template in software_path, then
installs the software partition with the help of buildout installs the software partition with the help of buildout
""" """
self.logger.info("Installing Computer Partition %s..." \ self.logger.info("Installing Computer Partition %s..."
% self.computer_partition.getId()) % self.computer_partition.getId())
# Checks existence and permissions of Partition directory # Checks existence and permissions of Partition directory
# Note : Partitions have to be created and configured before running slapgrid # Note : Partitions have to be created and configured before running slapgrid
...@@ -433,8 +433,7 @@ class Partition(object): ...@@ -433,8 +433,7 @@ class Partition(object):
if not os.path.exists(buildout_binary): if not os.path.exists(buildout_binary):
# use own buildout generation # use own buildout generation
bootstrapBuildout(self.instance_path, self.buildout, bootstrapBuildout(self.instance_path, self.buildout,
['buildout:bin-directory=%s'% os.path.join(self.instance_path, ['buildout:bin-directory=%s'% os.path.join(self.instance_path, 'sbin')])
'sbin')])
buildout_binary = os.path.join(self.instance_path, 'sbin', 'buildout') buildout_binary = os.path.join(self.instance_path, 'sbin', 'buildout')
# Launches buildout # Launches buildout
launchBuildout(self.instance_path, buildout_binary) launchBuildout(self.instance_path, buildout_binary)
...@@ -483,7 +482,7 @@ class Partition(object): ...@@ -483,7 +482,7 @@ class Partition(object):
supervisor.startProcessGroup(partition_id, False) supervisor.startProcessGroup(partition_id, False)
except xmlrpclib.Fault, e: except xmlrpclib.Fault, e:
if e.faultString.startswith('BAD_NAME:'): if e.faultString.startswith('BAD_NAME:'):
self.logger.info("Nothing to start on %s..." % \ self.logger.info("Nothing to start on %s..." %
self.computer_partition.getId()) self.computer_partition.getId())
else: else:
self.logger.info("Requested start of %s..." % self.computer_partition.getId()) self.logger.info("Requested start of %s..." % self.computer_partition.getId())
...@@ -503,7 +502,7 @@ class Partition(object): ...@@ -503,7 +502,7 @@ class Partition(object):
def destroy(self): def destroy(self):
"""Destroys the partition and makes it available for subsequent use." """Destroys the partition and makes it available for subsequent use."
""" """
self.logger.info("Destroying Computer Partition %s..." \ self.logger.info("Destroying Computer Partition %s..."
% self.computer_partition.getId()) % self.computer_partition.getId())
# Launches "destroy" binary if exists # Launches "destroy" binary if exists
destroy_executable_location = os.path.join(self.instance_path, 'sbin', destroy_executable_location = os.path.join(self.instance_path, 'sbin',
...@@ -589,4 +588,3 @@ class Partition(object): ...@@ -589,4 +588,3 @@ class Partition(object):
supervisor.addProcessGroup(gname) supervisor.addProcessGroup(gname)
self.logger.info('Updated %r' % gname) self.logger.info('Updated %r' % gname)
self.logger.debug('Supervisord updated') self.logger.debug('Supervisord updated')
...@@ -155,14 +155,12 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple): ...@@ -155,14 +155,12 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
parser.add_argument("--maximal_delay", parser.add_argument("--maximal_delay",
help="Deprecated. Will only work from configuration file in the future.") help="Deprecated. Will only work from configuration file in the future.")
# Parses arguments # Parses arguments
if not argument_tuple: if not argument_tuple:
# No arguments given to entry point : we parse sys.argv. # No arguments given to entry point : we parse sys.argv.
argument_option_instance = parser.parse_args() argument_option_instance = parser.parse_args()
else: else:
argument_option_instance = \ argument_option_instance = parser.parse_args(list(argument_tuple))
parser.parse_args(list(argument_tuple))
# Parses arguments from config file, if needed, then merge previous arguments # Parses arguments from config file, if needed, then merge previous arguments
option_dict = {} option_dict = {}
configuration_file = argument_option_instance.configuration_file[0] configuration_file = argument_option_instance.configuration_file[0]
...@@ -243,8 +241,7 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple): ...@@ -243,8 +241,7 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
certificate_repository_path = option_dict.get('certificate_repository_path') certificate_repository_path = option_dict.get('certificate_repository_path')
if certificate_repository_path is not None: if certificate_repository_path is not None:
if not os.path.isdir(certificate_repository_path): if not os.path.isdir(certificate_repository_path):
parser.error('Directory %r does not exist' % parser.error('Directory %r does not exist' % certificate_repository_path)
certificate_repository_path)
# Supervisord configuration location # Supervisord configuration location
if not option_dict.get('supervisord_configuration_path'): if not option_dict.get('supervisord_configuration_path'):
...@@ -259,9 +256,11 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple): ...@@ -259,9 +256,11 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
option_dict.get('signature-certificate-list', None) option_dict.get('signature-certificate-list', None)
if signature_certificate_list_string is not None: if signature_certificate_list_string is not None:
cert_marker = "-----BEGIN CERTIFICATE-----" cert_marker = "-----BEGIN CERTIFICATE-----"
signature_certificate_list = [cert_marker + '\n' + q.strip() \ signature_certificate_list = [
for q in signature_certificate_list_string.split(cert_marker) \ cert_marker + '\n' + q.strip()
if q.strip()] for q in signature_certificate_list_string.split(cert_marker)
if q.strip()
]
else: else:
signature_certificate_list = None signature_certificate_list = None
...@@ -645,8 +644,7 @@ class Slapgrid(object): ...@@ -645,8 +644,7 @@ class Slapgrid(object):
def _checkPromises(self, computer_partition): def _checkPromises(self, computer_partition):
self.logger.info("Checking promises...") self.logger.info("Checking promises...")
instance_path = os.path.join(self.instance_root, instance_path = os.path.join(self.instance_root, computer_partition.getId())
computer_partition.getId())
uid, gid = None, None uid, gid = None, None
stat_info = os.stat(instance_path) stat_info = os.stat(instance_path)
...@@ -677,7 +675,8 @@ class Slapgrid(object): ...@@ -677,7 +675,8 @@ class Slapgrid(object):
process_handler = subprocess.Popen(command, process_handler = subprocess.Popen(command,
preexec_fn=lambda: dropPrivileges(uid, gid), preexec_fn=lambda: dropPrivileges(uid, gid),
cwd=cwd, cwd=cwd,
env=None if sys.platform == 'cygwin' else {}, **kw) env=None if sys.platform == 'cygwin' else {},
**kw)
process_handler.stdin.flush() process_handler.stdin.flush()
process_handler.stdin.close() process_handler.stdin.close()
process_handler.stdin = None process_handler.stdin = None
...@@ -739,8 +738,7 @@ class Slapgrid(object): ...@@ -739,8 +738,7 @@ class Slapgrid(object):
# Try to process it anyway, it may need to be deleted. # Try to process it anyway, it may need to be deleted.
software_url = None software_url = None
try: try:
software_path = os.path.join(self.software_root, software_path = os.path.join(self.software_root, md5digest(software_url))
md5digest(software_url))
except TypeError: except TypeError:
# Problem with instance: SR URI not set. # Problem with instance: SR URI not set.
# Try to process it anyway, it may need to be deleted. # Try to process it anyway, it may need to be deleted.
...@@ -1136,7 +1134,8 @@ class Slapgrid(object): ...@@ -1136,7 +1134,8 @@ class Slapgrid(object):
process_handler = SlapPopen(invocation_list, process_handler = SlapPopen(invocation_list,
preexec_fn=lambda: dropPrivileges(uid, gid), preexec_fn=lambda: dropPrivileges(uid, gid),
cwd=os.path.join(instance_path, 'etc', 'report'), cwd=os.path.join(instance_path, 'etc', 'report'),
env=None, **kw) env=None,
**kw)
if process_handler.returncode is None: if process_handler.returncode is None:
process_handler.kill() process_handler.kill()
if process_handler.returncode != 0: if process_handler.returncode != 0:
...@@ -1207,7 +1206,7 @@ class Slapgrid(object): ...@@ -1207,7 +1206,7 @@ class Slapgrid(object):
logger.info(issue) logger.info(issue)
for computer_partition_usage in computer_partition_usage_list: for computer_partition_usage in computer_partition_usage_list:
logger.info('computer_partition_usage_list : %s - %s' % \ logger.info('computer_partition_usage_list: %s - %s' % \
(computer_partition_usage.usage, computer_partition_usage.getId())) (computer_partition_usage.usage, computer_partition_usage.getId()))
#If there is, at least, one report #If there is, at least, one report
...@@ -1216,7 +1215,7 @@ class Slapgrid(object): ...@@ -1216,7 +1215,7 @@ class Slapgrid(object):
#We generate the final XML report with asXML method #We generate the final XML report with asXML method
computer_consumption = self.asXML(computer_partition_usage_list) computer_consumption = self.asXML(computer_partition_usage_list)
logger.info('Final xml report : %s' % computer_consumption) logger.info('Final xml report: %s' % computer_consumption)
#We test the XML report before sending it #We test the XML report before sending it
if self.validateXML(computer_consumption, computer_consumption_model): if self.validateXML(computer_consumption, computer_consumption_model):
...@@ -1240,8 +1239,7 @@ class Slapgrid(object): ...@@ -1240,8 +1239,7 @@ class Slapgrid(object):
computer_partition_id = computer_partition.getId() computer_partition_id = computer_partition.getId()
try: try:
software_url = computer_partition.getSoftwareRelease().getURI() software_url = computer_partition.getSoftwareRelease().getURI()
software_path = os.path.join(self.software_root, software_path = os.path.join(self.software_root, md5digest(software_url))
md5digest(software_url))
except (NotFoundError, TypeError): except (NotFoundError, TypeError):
software_url = None software_url = None
software_path = None software_path = None
...@@ -1292,7 +1290,7 @@ class Slapgrid(object): ...@@ -1292,7 +1290,7 @@ class Slapgrid(object):
computer_partition.getId()) computer_partition.getId())
except ServerError as server_error: except ServerError as server_error:
logger.debug('Ignored server error while trying to inform about ' logger.debug('Ignored server error while trying to inform about '
'destroying Computer Partition %r. Error is :\n%r' % 'destroying Computer Partition %r. Error is:\n%r' %
(computer_partition.getId(), server_error.args[0])) (computer_partition.getId(), server_error.args[0]))
logger.info("Finished usage reports.") logger.info("Finished usage reports.")
......
...@@ -209,7 +209,7 @@ def dropPrivileges(uid, gid): ...@@ -209,7 +209,7 @@ def dropPrivileges(uid, gid):
uid, gid, group_list) uid, gid, group_list)
new_uid, new_gid, new_group_list = os.getuid(), os.getgid(), os.getgroups() new_uid, new_gid, new_group_list = os.getuid(), os.getgid(), os.getgroups()
if not (new_uid == uid and new_gid == gid and set(new_group_list) == group_list): if not (new_uid == uid and new_gid == gid and set(new_group_list) == group_list):
raise OSError('%s new_uid = %r and new_gid = %r and ' \ raise OSError('%s new_uid = %r and new_gid = %r and '
'new_group_list = %r which is fatal.' 'new_group_list = %r which is fatal.'
% (message_pre, % (message_pre,
new_uid, new_uid,
...@@ -277,7 +277,8 @@ def bootstrapBuildout(path, buildout=None, ...@@ -277,7 +277,8 @@ def bootstrapBuildout(path, buildout=None,
kw.update(stdout=subprocess.PIPE, stderr=subprocess.STDOUT) kw.update(stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
process_handler = SlapPopen(invocation_list, process_handler = SlapPopen(invocation_list,
preexec_fn=lambda: dropPrivileges(uid, gid), preexec_fn=lambda: dropPrivileges(uid, gid),
cwd=path, **kw) cwd=path,
**kw)
if process_handler.returncode is None or process_handler.returncode != 0: if process_handler.returncode is None or process_handler.returncode != 0:
message = 'Failed to run buildout profile in directory %r' % (path) message = 'Failed to run buildout profile in directory %r' % (path)
logger.error(message) logger.error(message)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment