Commit 66912dd6 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin Committed by Cédric Le Ninivin

slapgrid: Store instance data locally and in buildout

As Slapgrid is retrieving the full content of the instance it should
store it so that other recipe can access it directly instead of
querying master

slapgrid: Make json dump consistent when using slaptool

slapobject: dump ip addresses in instance json

slapgrid: update tests to check ip list on instance dump
parent edb64b0a
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
import datetime import datetime
import errno import errno
import json
import os import os
import pkg_resources import pkg_resources
import pwd import pwd
...@@ -53,6 +54,7 @@ from slapos.grid.svcbackend import getSupervisorRPC ...@@ -53,6 +54,7 @@ from slapos.grid.svcbackend import getSupervisorRPC
from slapos.grid.exception import (BuildoutFailedError, WrongPermissionError, from slapos.grid.exception import (BuildoutFailedError, WrongPermissionError,
PathDoesNotExistError, DiskSpaceError) PathDoesNotExistError, DiskSpaceError)
from slapos.grid.networkcache import download_network_cached, upload_network_cached from slapos.grid.networkcache import download_network_cached, upload_network_cached
from slapos.grid.utils import md5digest
from slapos.human import bytes2human from slapos.human import bytes2human
from slapos.util import bytes2str, rmtree from slapos.util import bytes2str, rmtree
...@@ -67,6 +69,8 @@ CP_STORAGE_FOLDER_NAME = 'DATA' ...@@ -67,6 +69,8 @@ CP_STORAGE_FOLDER_NAME = 'DATA'
PROGRAM_PARTITION_TEMPLATE = bytes2str(pkg_resources.resource_string(__name__, PROGRAM_PARTITION_TEMPLATE = bytes2str(pkg_resources.resource_string(__name__,
'templates/program_partition_supervisord.conf.in')) 'templates/program_partition_supervisord.conf.in'))
SOFTWARE_INSTANCE_JSON_FILENAME = '.software-instance.json'
def free_space(path, fn): def free_space(path, fn):
while True: while True:
...@@ -599,6 +603,20 @@ class Partition(object): ...@@ -599,6 +603,20 @@ class Partition(object):
(self.instance_path, permission, (self.instance_path, permission,
REQUIRED_COMPUTER_PARTITION_PERMISSION)) REQUIRED_COMPUTER_PARTITION_PERMISSION))
uid, gid = self.getUserGroupId()
# Store software instance json
instance_json_location = os.path.join(
self.instance_path,
SOFTWARE_INSTANCE_JSON_FILENAME
)
partiton_dict = self.computer_partition.copy()
partiton_dict.pop("slap_partition", None)
# XXX Check if we want them or not
partiton_dict.pop("access_status_message", None)
with open(instance_json_location, 'w') as f:
json.dump(partiton_dict, f, indent=2)
os.chown(instance_json_location, uid, gid)
# Check that Software Release directory is present # Check that Software Release directory is present
if not os.path.exists(self.software_path): if not os.path.exists(self.software_path):
# XXX What should it raise? # XXX What should it raise?
...@@ -616,6 +634,7 @@ class Partition(object): ...@@ -616,6 +634,7 @@ class Partition(object):
# XXX What should it raise? # XXX What should it raise?
raise IOError('Software Release %s is not correctly installed.\nMissing file: %s' % ( raise IOError('Software Release %s is not correctly installed.\nMissing file: %s' % (
self.software_release_url, template_location)) self.software_release_url, template_location))
config_location = os.path.join(self.instance_path, 'buildout.cfg') config_location = os.path.join(self.instance_path, 'buildout.cfg')
self.logger.debug("Copying %r to %r" % (template_location, config_location)) self.logger.debug("Copying %r to %r" % (template_location, config_location))
shutil.copy(template_location, config_location) shutil.copy(template_location, config_location)
...@@ -634,6 +653,19 @@ class Partition(object): ...@@ -634,6 +653,19 @@ class Partition(object):
'cert_file': self.cert_file, 'cert_file': self.cert_file,
'storage_home': self.instance_storage_home, 'storage_home': self.instance_storage_home,
'global_ipv4_network_prefix': self.ipv4_global_network, 'global_ipv4_network_prefix': self.ipv4_global_network,
'parameters_md5sum': md5digest(
json.dumps(
self.computer_partition.get("parameters", {}), sort_keys=True
)
),
'connection_parameters_md5sum': md5digest(
json.dumps(
self.computer_partition.get("connection_parameters", {}), sort_keys=True
)
),
'instance_state': self.computer_partition.get("state"),
'instance_software_type': self.computer_partition.get("software_type"),
'instance_processing_timestamp': self.computer_partition.get("processing_timestamp"),
} }
with open(config_location, 'w') as f: with open(config_location, 'w') as f:
f.write(buildout_text) f.write(buildout_text)
...@@ -649,7 +681,6 @@ class Partition(object): ...@@ -649,7 +681,6 @@ class Partition(object):
if q.startswith('bootstrap')] if q.startswith('bootstrap')]
else: else:
bootstrap_candidate_list = [] bootstrap_candidate_list = []
uid, gid = self.getUserGroupId()
os.chown(config_location, -1, int(gid)) os.chown(config_location, -1, int(gid))
if len(bootstrap_candidate_list) == 0: if len(bootstrap_candidate_list) == 0:
buildout_binary = os.path.join(self.software_path, 'bin', 'buildout') buildout_binary = os.path.join(self.software_path, 'bin', 'buildout')
......
...@@ -581,21 +581,27 @@ stderr_logfile_backups=1 ...@@ -581,21 +581,27 @@ stderr_logfile_backups=1
software_release_uri = None software_release_uri = None
parameter_dict = partition.getInstanceParameterDict() parameter_dict = partition.getInstanceParameterDict()
self.computer_partition_list.append({ instance_dict = {
"reference": getattr(partition, '_instance_guid', None), "reference": getattr(partition, '_instance_guid', None),
"portal_type": "Software Instance", "portal_type": "Software Instance",
"compute_node_id": getattr(partition, '_computer_id', None),
"compute_partition_id": partition.getId(), "compute_partition_id": partition.getId(),
"state": partition.getState(), "state": partition.getState(),
"software_type": parameter_dict.get('slap_software_type', None), "shared": False,
"parameters": parameter_dict, "software_type": parameter_dict.pop('slap_software_type', None),
"processing_timestamp": parameter_dict.get("timestamp"), "processing_timestamp": parameter_dict.pop("timestamp", None),
"slap_partition": partition, "slap_partition": partition,
"ip_list": parameter_dict.get("ip_list", []), "ip_list": parameter_dict.pop("ip_list", []),
"full_ip_list": parameter_dict.get("full_ip_list", []), "full_ip_list": parameter_dict.pop("full_ip_list", []),
"access_status_message": partition.getAccessStatus(), "access_status_message": partition.getAccessStatus(),
"software_release_uri": software_release_uri, "software_release_uri": software_release_uri,
"sla_parameters": getattr(partition, '_filter_dict', {}), "sla_parameters": getattr(partition, '_filter_dict', {}),
}) "connection_parameters": partition.getConnectionParameterDict(),
"root_instance_title": parameter_dict.pop("root_instance_title", None),
"title": parameter_dict.pop("instance_title", None),
}
instance_dict["parameters"] = parameter_dict
self.computer_partition_list.append(instance_dict)
return self.computer_partition_list return self.computer_partition_list
def sendPartitionError(self, partition, error_message, logger=None): def sendPartitionError(self, partition, error_message, logger=None):
......
...@@ -30,3 +30,11 @@ storage-home = %(storage_home)s ...@@ -30,3 +30,11 @@ storage-home = %(storage_home)s
[network-information] [network-information]
global-ipv4-network = %(global_ipv4_network_prefix)s global-ipv4-network = %(global_ipv4_network_prefix)s
# This is end of zc.buildout profile's tail added by slapgrid # This is end of zc.buildout profile's tail added by slapgrid
[software-instance-data]
state = %(instance_state)s
software-type = %(instance_software_type)s
reference = %(software_instance_reference)s
processing-timestamp = %(instance_processing_timestamp)s
connection-parameters-md5sum = %(connection_parameters_md5sum)s
parameters-md5sum = %(parameters_md5sum)s
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
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