X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/3d8548c49fd96d5eb5e8ed731fcdbce7445064fb..77921a951861ca1dd5136e0f4b84cb6e7ac7b8d2:/lib/luxi.py diff --git a/lib/luxi.py b/lib/luxi.py index 2a00431..308de9f 100644 --- a/lib/luxi.py +++ b/lib/luxi.py @@ -21,23 +21,22 @@ """Module for the unix socket protocol -This module implements the local unix socket protocl. You only need +This module implements the local unix socket protocol. You only need this module and the opcodes module in the client program in order to communicate with the master. -The module is also be used by the master daemon. +The module is also used by the master daemon. """ import socket import collections -import simplejson import time import errno -from ganeti import opcodes from ganeti import serializer from ganeti import constants +from ganeti import errors KEY_METHOD = 'method' @@ -45,9 +44,18 @@ KEY_ARGS = 'args' KEY_SUCCESS = "success" KEY_RESULT = "result" -REQ_SUBMIT = 'submit' -REQ_ABORT = 'abort' -REQ_QUERY = 'query' +REQ_SUBMIT_JOB = "SubmitJob" +REQ_WAIT_FOR_JOB_CHANGE = "WaitForJobChange" +REQ_CANCEL_JOB = "CancelJob" +REQ_ARCHIVE_JOB = "ArchiveJob" +REQ_AUTOARCHIVE_JOBS = "AutoArchiveJobs" +REQ_QUERY_JOBS = "QueryJobs" +REQ_QUERY_INSTANCES = "QueryInstances" +REQ_QUERY_NODES = "QueryNodes" +REQ_QUERY_EXPORTS = "QueryExports" +REQ_QUERY_CONFIG_VALUES = "QueryConfigValues" +REQ_QUERY_CLUSTER_INFO = "QueryClusterInfo" +REQ_QUEUE_SET_DRAIN_FLAG = "SetDrainFlag" DEF_CTMO = 10 DEF_RWTO = 60 @@ -95,24 +103,6 @@ class NoMasterError(ProtocolError): """ -def SerializeJob(job): - """Convert a job description to a string format. - - """ - return simplejson.dumps(job.__getstate__()) - - -def UnserializeJob(data): - """Load a job from a string format""" - try: - new_data = simplejson.loads(data) - except Exception, err: - raise DecodingError("Error while unserializing: %s" % str(err)) - job = opcodes.Job() - job.__setstate__(new_data) - return job - - class Transport: """Low-level transport class. @@ -169,7 +159,7 @@ class Transport: except socket.timeout, err: raise TimeoutError("Connect timed out: %s" % str(err)) except socket.error, err: - if err.args[0] == errno.ENOENT: + if err.args[0] in (errno.ENOENT, errno.ECONNREFUSED): raise NoMasterError((address,)) raise self.socket.settimeout(self._rwtimeout) @@ -263,7 +253,32 @@ class Client(object): """ if address is None: address = constants.MASTER_SOCKET - self.transport = transport(address, timeouts=timeouts) + self.address = address + self.timeouts = timeouts + self.transport_class = transport + self.transport = None + self._InitTransport() + + def _InitTransport(self): + """(Re)initialize the transport if needed. + + """ + if self.transport is None: + self.transport = self.transport_class(self.address, + timeouts=self.timeouts) + + def _CloseTransport(self): + """Close the transport, ignoring errors. + + """ + if self.transport is None: + return + try: + old_transp = self.transport + self.transport = None + old_transp.Close() + except Exception, err: + pass def CallMethod(self, method, args): """Send a generic request and return the response. @@ -275,8 +290,18 @@ class Client(object): KEY_ARGS: args, } + # Serialize the request + send_data = serializer.DumpJson(request, indent=False) + # Send request and wait for response - result = self.transport.Call(serializer.DumpJson(request, indent=False)) + try: + self._InitTransport() + result = self.transport.Call(send_data) + except Exception: + self._CloseTransport() + raise + + # Parse the result try: data = serializer.LoadJson(result) except Exception, err: @@ -288,25 +313,65 @@ class Client(object): KEY_RESULT not in data): raise DecodingError("Invalid response from server: %s" % str(data)) + result = data[KEY_RESULT] + if not data[KEY_SUCCESS]: # TODO: decide on a standard exception - raise RequestError(data[KEY_RESULT]) - - return data[KEY_RESULT] - - def SubmitJob(self, job): - """Submit a job""" - return self.CallMethod(REQ_SUBMIT, SerializeJob(job)) - - def Query(self, data): - """Make a query""" - result = self.CallMethod(REQ_QUERY, data) - if data["object"] == "jobs": - # custom job processing of query values - for row in result: - for idx, field in enumerate(data["fields"]): - if field == "op_list": - row[idx] = [opcodes.OpCode.LoadOpCode(i) for i in row[idx]] + if (isinstance(result, (tuple, list)) and len(result) == 2 and + isinstance(result[1], (tuple, list))): + # custom ganeti errors + err_class = errors.GetErrorClass(result[0]) + if err_class is not None: + raise err_class, tuple(result[1]) + + raise RequestError(result) + + return result + + def SetQueueDrainFlag(self, drain_flag): + return self.CallMethod(REQ_QUEUE_SET_DRAIN_FLAG, drain_flag) + + def SubmitJob(self, ops): + ops_state = map(lambda op: op.__getstate__(), ops) + return self.CallMethod(REQ_SUBMIT_JOB, ops_state) + + def CancelJob(self, job_id): + return self.CallMethod(REQ_CANCEL_JOB, job_id) + + def ArchiveJob(self, job_id): + return self.CallMethod(REQ_ARCHIVE_JOB, job_id) + + def AutoArchiveJobs(self, age): + timeout = (DEF_RWTO - 1) / 2 + return self.CallMethod(REQ_AUTOARCHIVE_JOBS, (age, timeout)) + + def WaitForJobChange(self, job_id, fields, prev_job_info, prev_log_serial): + timeout = (DEF_RWTO - 1) / 2 + while True: + result = self.CallMethod(REQ_WAIT_FOR_JOB_CHANGE, + (job_id, fields, prev_job_info, + prev_log_serial, timeout)) + if result != constants.JOB_NOTCHANGED: + break return result + def QueryJobs(self, job_ids, fields): + return self.CallMethod(REQ_QUERY_JOBS, (job_ids, fields)) + + def QueryInstances(self, names, fields, use_locking): + return self.CallMethod(REQ_QUERY_INSTANCES, (names, fields, use_locking)) + + def QueryNodes(self, names, fields, use_locking): + return self.CallMethod(REQ_QUERY_NODES, (names, fields, use_locking)) + + def QueryExports(self, nodes, use_locking): + return self.CallMethod(REQ_QUERY_EXPORTS, (nodes, use_locking)) + + def QueryClusterInfo(self): + return self.CallMethod(REQ_QUERY_CLUSTER_INFO, ()) + + def QueryConfigValues(self, fields): + return self.CallMethod(REQ_QUERY_CONFIG_VALUES, fields) + + # TODO: class Server(object)