X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/d3c8b36010e3348cca3f41875c37edf1d3bc33ee..b13dfb92ab93b63c3feb238d27e8b5cd2a495fce:/lib/rpc.py diff --git a/lib/rpc.py b/lib/rpc.py index e46df3e..69e692c 100644 --- a/lib/rpc.py +++ b/lib/rpc.py @@ -31,7 +31,6 @@ # R0904: Too many public methods import os -import socket import logging import zlib import base64 @@ -43,7 +42,8 @@ from ganeti import serializer from ganeti import constants from ganeti import errors -import ganeti.http.client +# pylint has a bug here, doesn't see this import +import ganeti.http.client # pylint: disable-msg=W0611 # Module level variable @@ -56,10 +56,12 @@ def Init(): Must be called before using any RPC function. """ - global _http_manager + global _http_manager # pylint: disable-msg=W0603 assert not _http_manager, "RPC module initialized more than once" + http.InitSsl() + _http_manager = http.client.HttpClientManager() @@ -69,7 +71,7 @@ def Shutdown(): Must be called before quitting the program. """ - global _http_manager + global _http_manager # pylint: disable-msg=W0603 if _http_manager: _http_manager.Shutdown() @@ -83,47 +85,53 @@ class RpcResult(object): calls we can't raise an exception just because one one out of many failed, and therefore we use this class to encapsulate the result. - @ivar data: the data payload, for successfull results, or None - @type failed: boolean - @ivar failed: whether the operation failed at transport level (not - application level on the remote node) + @ivar data: the data payload, for successful results, or None @ivar call: the name of the RPC call @ivar node: the name of the node to which we made the call @ivar offline: whether the operation failed because the node was offline, as opposed to actual failure; offline=True will always imply failed=True, in order to allow simpler checking if the user doesn't care about the exact failure mode - @ivar error: the error message if the call failed + @ivar fail_msg: the error message if the call failed """ def __init__(self, data=None, failed=False, offline=False, call=None, node=None): - self.failed = failed self.offline = offline self.call = call self.node = node + if offline: - self.failed = True - self.error = "Node is marked offline" + self.fail_msg = "Node is marked offline" self.data = self.payload = None elif failed: - self.error = self._EnsureErr(data) + self.fail_msg = self._EnsureErr(data) self.data = self.payload = None else: self.data = data if not isinstance(self.data, (tuple, list)): - self.error = ("RPC layer error: invalid result type (%s)" % - type(self.data)) + self.fail_msg = ("RPC layer error: invalid result type (%s)" % + type(self.data)) + self.payload = None elif len(data) != 2: - self.error = ("RPC layer error: invalid result length (%d), " - "expected 2" % len(self.data)) + self.fail_msg = ("RPC layer error: invalid result length (%d), " + "expected 2" % len(self.data)) + self.payload = None elif not self.data[0]: - self.error = self._EnsureErr(self.data[1]) + self.fail_msg = self._EnsureErr(self.data[1]) + self.payload = None else: # finally success - self.error = None + self.fail_msg = None self.payload = data[1] + assert hasattr(self, "call") + assert hasattr(self, "data") + assert hasattr(self, "fail_msg") + assert hasattr(self, "node") + assert hasattr(self, "offline") + assert hasattr(self, "payload") + @staticmethod def _EnsureErr(val): """Helper to ensure we return a 'True' value for error.""" @@ -132,24 +140,30 @@ class RpcResult(object): else: return "No error information" - def Raise(self): + def Raise(self, msg, prereq=False, ecode=None): """If the result has failed, raise an OpExecError. This is used so that LU code doesn't have to check for each result, but instead can call this function. """ - if self.failed: - raise errors.OpExecError("Call '%s' to node '%s' has failed: %s" % - (self.call, self.node, self.error)) - - def RemoteFailMsg(self): - """Check if the remote procedure failed. - - @return: the fail_msg attribute + if not self.fail_msg: + return - """ - return self.error + if not msg: # one could pass None for default message + msg = ("Call '%s' to node '%s' has failed: %s" % + (self.call, self.node, self.fail_msg)) + else: + msg = "%s: %s" % (msg, self.fail_msg) + if prereq: + ec = errors.OpPrereqError + else: + ec = errors.OpExecError + if ecode is not None: + args = (msg, prereq) + else: + args = (msg, ) + raise ec(*args) # pylint: disable-msg=W0142 class Client: @@ -159,7 +173,7 @@ class Client: list of nodes, will contact (in parallel) all nodes, and return a dict of results (key: node name, value: result). - One current bug is that generic failure is still signalled by + One current bug is that generic failure is still signaled by 'False' result, which is not good. This overloading of values can cause bugs. @@ -218,7 +232,7 @@ class Client: @return: List of RPC results """ - assert _http_manager, "RPC module not intialized" + assert _http_manager, "RPC module not initialized" _http_manager.ExecRequests(self.nc.values()) @@ -256,7 +270,7 @@ class RpcRunner(object): """ self._cfg = cfg - self.port = utils.GetNodeDaemonPort() + self.port = utils.GetDaemonPort(constants.NODED) def _InstDict(self, instance, hvp=None, bep=None): """Convert the given instance to a dict. @@ -267,9 +281,9 @@ class RpcRunner(object): @type instance: L{objects.Instance} @param instance: an Instance object @type hvp: dict or None - @param hvp: a dictionary with overriden hypervisor parameters + @param hvp: a dictionary with overridden hypervisor parameters @type bep: dict or None - @param bep: a dictionary with overriden backend parameters + @param bep: a dictionary with overridden backend parameters @rtype: dict @return: the instance dict, with the hvparams filled with the cluster defaults @@ -292,7 +306,7 @@ class RpcRunner(object): def _ConnectList(self, client, node_list, call): """Helper for computing node addresses. - @type client: L{Client} + @type client: L{ganeti.rpc.Client} @param client: a C{Client} instance @type node_list: list @param node_list: the node list we should connect @@ -322,7 +336,7 @@ class RpcRunner(object): def _ConnectNode(self, client, node, call): """Helper for computing one node's address. - @type client: L{Client} + @type client: L{ganeti.rpc.Client} @param client: a C{Client} instance @type node: str @param node: the node we should connect @@ -357,7 +371,7 @@ class RpcRunner(object): """ body = serializer.DumpJson(args, indent=False) - c = Client(procedure, body, utils.GetNodeDaemonPort()) + c = Client(procedure, body, utils.GetDaemonPort(constants.NODED)) c.ConnectList(node_list, address_list=address_list) return c.GetResults() @@ -379,7 +393,7 @@ class RpcRunner(object): """ body = serializer.DumpJson(args, indent=False) - c = Client(procedure, body, utils.GetNodeDaemonPort()) + c = Client(procedure, body, utils.GetDaemonPort(constants.NODED)) c.ConnectNode(node) return c.GetResults()[node] @@ -407,13 +421,13 @@ class RpcRunner(object): # Begin RPC calls # - def call_volume_list(self, node_list, vg_name): + def call_lv_list(self, node_list, vg_name): """Gets the logical volumes present in a given volume group. This is a multi-node call. """ - return self._MultiNodeCall(node_list, "volume_list", [vg_name]) + return self._MultiNodeCall(node_list, "lv_list", [vg_name]) def call_vg_list(self, node_list): """Gets the volume group list. @@ -423,6 +437,33 @@ class RpcRunner(object): """ return self._MultiNodeCall(node_list, "vg_list", []) + def call_storage_list(self, node_list, su_name, su_args, name, fields): + """Get list of storage units. + + This is a multi-node call. + + """ + return self._MultiNodeCall(node_list, "storage_list", + [su_name, su_args, name, fields]) + + def call_storage_modify(self, node, su_name, su_args, name, changes): + """Modify a storage unit. + + This is a single-node call. + + """ + return self._SingleNodeCall(node, "storage_modify", + [su_name, su_args, name, changes]) + + def call_storage_execute(self, node, su_name, su_args, name, op): + """Executes an operation on a storage unit. + + This is a single-node call. + + """ + return self._SingleNodeCall(node, "storage_execute", + [su_name, su_args, name, op]) + def call_bridges_exist(self, node, bridges_list): """Checks if a node has all the bridges given. @@ -444,14 +485,14 @@ class RpcRunner(object): idict = self._InstDict(instance, hvp=hvp, bep=bep) return self._SingleNodeCall(node, "instance_start", [idict]) - def call_instance_shutdown(self, node, instance): + def call_instance_shutdown(self, node, instance, timeout): """Stops an instance. This is a single-node call. """ return self._SingleNodeCall(node, "instance_shutdown", - [self._InstDict(instance)]) + [self._InstDict(instance), timeout]) def call_migration_info(self, node, instance): """Gather the information necessary to prepare an instance migration. @@ -525,14 +566,15 @@ class RpcRunner(object): return self._SingleNodeCall(node, "instance_migrate", [self._InstDict(instance), target, live]) - def call_instance_reboot(self, node, instance, reboot_type): + def call_instance_reboot(self, node, inst, reboot_type, shutdown_timeout): """Reboots an instance. This is a single-node call. """ return self._SingleNodeCall(node, "instance_reboot", - [self._InstDict(instance), reboot_type]) + [self._InstDict(inst), reboot_type, + shutdown_timeout]) def call_instance_os_add(self, node, inst, reinstall): """Installs an OS on the given instance. @@ -667,14 +709,14 @@ class RpcRunner(object): [checkdict, cluster_name]) @classmethod - def call_node_start_master(cls, node, start_daemons): + def call_node_start_master(cls, node, start_daemons, no_voting): """Tells a node to activate itself as a master. This is a single-node call. """ return cls._StaticSingleNodeCall(node, "node_start_master", - [start_daemons]) + [start_daemons, no_voting]) @classmethod def call_node_stop_master(cls, node, stop_daemons): @@ -695,13 +737,14 @@ class RpcRunner(object): # TODO: should this method query down nodes? return cls._StaticMultiNodeCall(node_list, "master_info", []) - def call_version(self, node_list): + @classmethod + def call_version(cls, node_list): """Query node version. This is a multi-node call. """ - return self._MultiNodeCall(node_list, "version", []) + return cls._StaticMultiNodeCall(node_list, "version", []) def call_blockdev_create(self, node, bdev, size, owner, on_primary, info): """Request creation of a given block device. @@ -772,8 +815,12 @@ class RpcRunner(object): This is a single-node call. """ - return self._SingleNodeCall(node, "blockdev_getmirrorstatus", - [dsk.ToDict() for dsk in disks]) + result = self._SingleNodeCall(node, "blockdev_getmirrorstatus", + [dsk.ToDict() for dsk in disks]) + if not result.fail_msg: + result.payload = [objects.BlockDevStatus.FromDict(i) + for i in result.payload] + return result def call_blockdev_find(self, node, disk): """Request identification of a given block device. @@ -781,7 +828,10 @@ class RpcRunner(object): This is a single-node call. """ - return self._SingleNodeCall(node, "blockdev_find", [disk.ToDict()]) + result = self._SingleNodeCall(node, "blockdev_find", [disk.ToDict()]) + if not result.fail_msg and result.payload is not None: + result.payload = objects.BlockDevStatus.FromDict(result.payload) + return result def call_blockdev_close(self, node, instance_name, disks): """Closes the given block devices. @@ -792,6 +842,15 @@ class RpcRunner(object): params = [instance_name, [cf.ToDict() for cf in disks]] return self._SingleNodeCall(node, "blockdev_close", params) + def call_blockdev_getsizes(self, node, disks): + """Returns the size of the given disks. + + This is a single-node call. + + """ + params = [[cf.ToDict() for cf in disks]] + return self._SingleNodeCall(node, "blockdev_getsize", params) + def call_drbd_disconnect_net(self, node_list, nodes_ip, disks): """Disconnects the network of the given drbd devices. @@ -871,8 +930,8 @@ class RpcRunner(object): """ result = self._SingleNodeCall(node, "os_get", [name]) - if not result.failed and isinstance(result.data, dict): - result.data = objects.OS.FromDict(result.data) + if not result.fail_msg and isinstance(result.payload, dict): + result.payload = objects.OS.FromDict(result.payload) return result def call_hooks_runner(self, node_list, hpath, phase, env): @@ -909,6 +968,17 @@ class RpcRunner(object): return self._SingleNodeCall(node, "blockdev_grow", [cf_bdev.ToDict(), amount]) + def call_blockdev_export(self, node, cf_bdev, + dest_node, dest_path, cluster_name): + """Export a given disk to another node. + + This is a single-node call. + + """ + return self._SingleNodeCall(node, "blockdev_export", + [cf_bdev.ToDict(), dest_node, dest_path, + cluster_name]) + def call_blockdev_snapshot(self, node, cf_bdev): """Request a snapshot of the given block device. @@ -938,7 +1008,10 @@ class RpcRunner(object): """ flat_disks = [] for disk in snap_disks: - flat_disks.append(disk.ToDict()) + if isinstance(disk, bool): + flat_disks.append(disk) + else: + flat_disks.append(disk.ToDict()) return self._SingleNodeCall(node, "finalize_export", [self._InstDict(instance), flat_disks]) @@ -979,7 +1052,7 @@ class RpcRunner(object): return self._SingleNodeCall(node, "export_remove", [export]) @classmethod - def call_node_leave_cluster(cls, node): + def call_node_leave_cluster(cls, node, modify_ssh_setup): """Requests a node to clean the cluster information it has. This will remove the configuration information from the ganeti data @@ -988,7 +1061,8 @@ class RpcRunner(object): This is a single-node call. """ - return cls._StaticSingleNodeCall(node, "node_leave_cluster", []) + return cls._StaticSingleNodeCall(node, "node_leave_cluster", + [modify_ssh_setup]) def call_node_volumes(self, node_list): """Gets all volumes on node(s).