X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/200de24167d7f0ffa2189ad0a825c866b955375c..46c293f01640a2fd71b88b8da7960a6f56ee4284:/lib/rpc.py diff --git a/lib/rpc.py b/lib/rpc.py index 07ca905..6f36ceb 100644 --- a/lib/rpc.py +++ b/lib/rpc.py @@ -437,21 +437,6 @@ class _RpcProcessor: return self._CombineResults(results, requests, procedure) -def _EncodeImportExportIO(ieio, ieioargs): - """Encodes import/export I/O information. - - """ - if ieio == constants.IEIO_RAW_DISK: - assert len(ieioargs) == 1 - return (ieioargs[0].ToDict(), ) - - if ieio == constants.IEIO_SCRIPT: - assert len(ieioargs) == 2 - return (ieioargs[0].ToDict(), ieioargs[1]) - - return ieioargs - - class RpcRunner(_generated_rpc.RpcClientDefault): """RPC runner class. @@ -556,79 +541,89 @@ class RpcRunner(_generated_rpc.RpcClientDefault): netutils.GetDaemonPort(constants.NODED)) return proc([node], procedure, body, read_timeout=read_timeout)[node] - # - # Begin RPC calls - # - - @_RpcTimeout(_TMO_URGENT) - def call_bdev_sizes(self, node_list, devices): - """Gets the sizes of requested block devices present on a node + @staticmethod + def _BlockdevFindPostProc(result): + if not result.fail_msg and result.payload is not None: + result.payload = objects.BlockDevStatus.FromDict(result.payload) + return result - This is a multi-node call. + @staticmethod + def _BlockdevGetMirrorStatusPostProc(result): + if not result.fail_msg: + result.payload = [objects.BlockDevStatus.FromDict(i) + for i in result.payload] + return result - """ - return self._MultiNodeCall(node_list, "bdev_sizes", [devices]) + @staticmethod + def _BlockdevGetMirrorStatusMultiPostProc(result): + for nres in result.values(): + if nres.fail_msg: + continue - @_RpcTimeout(_TMO_URGENT) - def call_lv_list(self, node_list, vg_name): - """Gets the logical volumes present in a given volume group. + for idx, (success, status) in enumerate(nres.payload): + if success: + nres.payload[idx] = (success, objects.BlockDevStatus.FromDict(status)) - This is a multi-node call. + return result - """ - return self._MultiNodeCall(node_list, "lv_list", [vg_name]) + @staticmethod + def _OsGetPostProc(result): + if not result.fail_msg and isinstance(result.payload, dict): + result.payload = objects.OS.FromDict(result.payload) + return result - @_RpcTimeout(_TMO_URGENT) - def call_vg_list(self, node_list): - """Gets the volume group list. + @staticmethod + def _PrepareFinalizeExportDisks(snap_disks): + flat_disks = [] - This is a multi-node call. + for disk in snap_disks: + if isinstance(disk, bool): + flat_disks.append(disk) + else: + flat_disks.append(disk.ToDict()) - """ - return self._MultiNodeCall(node_list, "vg_list", []) + return flat_disks - @_RpcTimeout(_TMO_NORMAL) - def call_storage_list(self, node_list, su_name, su_args, name, fields): - """Get list of storage units. + @staticmethod + def _ImpExpStatusPostProc(result): + """Post-processor for import/export status. - This is a multi-node call. + @rtype: Payload containing list of L{objects.ImportExportStatus} instances + @return: Returns a list of the state of each named import/export or None if + a status couldn't be retrieved """ - return self._MultiNodeCall(node_list, "storage_list", - [su_name, su_args, name, fields]) - - @_RpcTimeout(_TMO_NORMAL) - def call_storage_modify(self, node, su_name, su_args, name, changes): - """Modify a storage unit. + if not result.fail_msg: + decoded = [] - This is a single-node call. + for i in result.payload: + if i is None: + decoded.append(None) + continue + decoded.append(objects.ImportExportStatus.FromDict(i)) - """ - return self._SingleNodeCall(node, "storage_modify", - [su_name, su_args, name, changes]) + result.payload = decoded - @_RpcTimeout(_TMO_NORMAL) - def call_storage_execute(self, node, su_name, su_args, name, op): - """Executes an operation on a storage unit. + return result - This is a single-node call. + @staticmethod + def _EncodeImportExportIO(ieio, ieioargs): + """Encodes import/export I/O information. """ - return self._SingleNodeCall(node, "storage_execute", - [su_name, su_args, name, op]) + if ieio == constants.IEIO_RAW_DISK: + assert len(ieioargs) == 1 + return (ieioargs[0].ToDict(), ) - @_RpcTimeout(_TMO_URGENT) - def call_bridges_exist(self, node, bridges_list): - """Checks if a node has all the bridges given. - - This method checks if all bridges given in the bridges_list are - present on the remote node, so that an instance that uses interfaces - on those bridges can be started. + if ieio == constants.IEIO_SCRIPT: + assert len(ieioargs) == 2 + return (ieioargs[0].ToDict(), ieioargs[1]) - This is a single-node call. + return ieioargs - """ - return self._SingleNodeCall(node, "bridges_exist", [bridges_list]) + # + # Begin RPC calls + # @_RpcTimeout(_TMO_NORMAL) def call_instance_start(self, node, instance, hvp, bep, startup_paused): @@ -640,140 +635,6 @@ class RpcRunner(_generated_rpc.RpcClientDefault): idict = self._InstDict(instance, hvp=hvp, bep=bep) return self._SingleNodeCall(node, "instance_start", [idict, startup_paused]) - @_RpcTimeout(_TMO_NORMAL) - 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), timeout]) - - @_RpcTimeout(_TMO_NORMAL) - def call_migration_info(self, node, instance): - """Gather the information necessary to prepare an instance migration. - - This is a single-node call. - - @type node: string - @param node: the node on which the instance is currently running - @type instance: C{objects.Instance} - @param instance: the instance definition - - """ - return self._SingleNodeCall(node, "migration_info", - [self._InstDict(instance)]) - - @_RpcTimeout(_TMO_NORMAL) - def call_accept_instance(self, node, instance, info, target): - """Prepare a node to accept an instance. - - This is a single-node call. - - @type node: string - @param node: the target node for the migration - @type instance: C{objects.Instance} - @param instance: the instance definition - @type info: opaque/hypervisor specific (string/data) - @param info: result for the call_migration_info call - @type target: string - @param target: target hostname (usually ip address) (on the node itself) - - """ - return self._SingleNodeCall(node, "accept_instance", - [self._InstDict(instance), info, target]) - - @_RpcTimeout(_TMO_NORMAL) - def call_instance_finalize_migration_dst(self, node, instance, info, success): - """Finalize any target-node migration specific operation. - - This is called both in case of a successful migration and in case of error - (in which case it should abort the migration). - - This is a single-node call. - - @type node: string - @param node: the target node for the migration - @type instance: C{objects.Instance} - @param instance: the instance definition - @type info: opaque/hypervisor specific (string/data) - @param info: result for the call_migration_info call - @type success: boolean - @param success: whether the migration was a success or a failure - - """ - return self._SingleNodeCall(node, "instance_finalize_migration_dst", - [self._InstDict(instance), info, success]) - - @_RpcTimeout(_TMO_SLOW) - def call_instance_migrate(self, node, instance, target, live): - """Migrate an instance. - - This is a single-node call. - - @type node: string - @param node: the node on which the instance is currently running - @type instance: C{objects.Instance} - @param instance: the instance definition - @type target: string - @param target: the target node name - @type live: boolean - @param live: whether the migration should be done live or not (the - interpretation of this parameter is left to the hypervisor) - - """ - return self._SingleNodeCall(node, "instance_migrate", - [self._InstDict(instance), target, live]) - - @_RpcTimeout(_TMO_SLOW) - def call_instance_finalize_migration_src(self, node, instance, success, live): - """Finalize the instance migration on the source node. - - This is a single-node call. - - @type instance: L{objects.Instance} - @param instance: the instance that was migrated - @type success: bool - @param success: whether the migration succeeded or not - @type live: bool - @param live: whether the user requested a live migration or not - - """ - return self._SingleNodeCall(node, "instance_finalize_migration_src", - [self._InstDict(instance), success, live]) - - @_RpcTimeout(_TMO_SLOW) - def call_instance_get_migration_status(self, node, instance): - """Report migration status. - - This is a single-node call that must be executed on the source node. - - @type instance: L{objects.Instance} - @param instance: the instance that is being migrated - @rtype: L{objects.MigrationStatus} - @return: the status of the current migration (one of - L{constants.HV_MIGRATION_VALID_STATUSES}), plus any additional - progress info that can be retrieved from the hypervisor - - """ - result = self._SingleNodeCall(node, "instance_get_migration_status", - [self._InstDict(instance)]) - if not result.fail_msg and result.payload is not None: - result.payload = objects.MigrationStatus.FromDict(result.payload) - return result - - @_RpcTimeout(_TMO_NORMAL) - 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(inst), reboot_type, - shutdown_timeout]) - @_RpcTimeout(_TMO_1DAY) def call_instance_os_add(self, node, inst, reinstall, debug, osparams=None): """Installs an OS on the given instance. @@ -785,133 +646,6 @@ class RpcRunner(_generated_rpc.RpcClientDefault): [self._InstDict(inst, osp=osparams), reinstall, debug]) - @_RpcTimeout(_TMO_SLOW) - def call_instance_run_rename(self, node, inst, old_name, debug): - """Run the OS rename script for an instance. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "instance_run_rename", - [self._InstDict(inst), old_name, debug]) - - @_RpcTimeout(_TMO_URGENT) - def call_instance_info(self, node, instance, hname): - """Returns information about a single instance. - - This is a single-node call. - - @type node: list - @param node: the list of nodes to query - @type instance: string - @param instance: the instance name - @type hname: string - @param hname: the hypervisor type of the instance - - """ - return self._SingleNodeCall(node, "instance_info", [instance, hname]) - - @_RpcTimeout(_TMO_NORMAL) - def call_instance_migratable(self, node, instance): - """Checks whether the given instance can be migrated. - - This is a single-node call. - - @param node: the node to query - @type instance: L{objects.Instance} - @param instance: the instance to check - - - """ - return self._SingleNodeCall(node, "instance_migratable", - [self._InstDict(instance)]) - - @_RpcTimeout(_TMO_URGENT) - def call_all_instances_info(self, node_list, hypervisor_list): - """Returns information about all instances on the given nodes. - - This is a multi-node call. - - @type node_list: list - @param node_list: the list of nodes to query - @type hypervisor_list: list - @param hypervisor_list: the hypervisors to query for instances - - """ - return self._MultiNodeCall(node_list, "all_instances_info", - [hypervisor_list]) - - @_RpcTimeout(_TMO_URGENT) - def call_instance_list(self, node_list, hypervisor_list): - """Returns the list of running instances on a given node. - - This is a multi-node call. - - @type node_list: list - @param node_list: the list of nodes to query - @type hypervisor_list: list - @param hypervisor_list: the hypervisors to query for instances - - """ - return self._MultiNodeCall(node_list, "instance_list", [hypervisor_list]) - - @_RpcTimeout(_TMO_FAST) - def call_node_has_ip_address(self, node, address): - """Checks if a node has the given IP address. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "node_has_ip_address", [address]) - - @_RpcTimeout(_TMO_URGENT) - def call_node_info(self, node_list, vg_name, hypervisor_type): - """Return node information. - - This will return memory information and volume group size and free - space. - - This is a multi-node call. - - @type node_list: list - @param node_list: the list of nodes to query - @type vg_name: C{string} - @param vg_name: the name of the volume group to ask for disk space - information - @type hypervisor_type: C{str} - @param hypervisor_type: the name of the hypervisor to ask for - memory information - - """ - return self._MultiNodeCall(node_list, "node_info", - [vg_name, hypervisor_type]) - - @_RpcTimeout(_TMO_NORMAL) - def call_etc_hosts_modify(self, node, mode, name, ip): - """Modify hosts file with name - - @type node: string - @param node: The node to call - @type mode: string - @param mode: The mode to operate. Currently "add" or "remove" - @type name: string - @param name: The host name to be modified - @type ip: string - @param ip: The ip of the entry (just valid if mode is "add") - - """ - return self._SingleNodeCall(node, "etc_hosts_modify", [mode, name, ip]) - - @_RpcTimeout(_TMO_NORMAL) - def call_node_verify(self, node_list, checkdict, cluster_name): - """Request verification of given parameters. - - This is a multi-node call. - - """ - return self._MultiNodeCall(node_list, "node_verify", - [checkdict, cluster_name]) - @classmethod @_RpcTimeout(_TMO_FAST) def call_node_start_master_daemons(cls, node, no_voting): @@ -985,203 +719,6 @@ class RpcRunner(_generated_rpc.RpcClientDefault): """ return cls._StaticMultiNodeCall(node_list, "version", []) - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_create(self, node, bdev, size, owner, on_primary, info): - """Request creation of a given block device. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "blockdev_create", - [bdev.ToDict(), size, owner, on_primary, info]) - - @_RpcTimeout(_TMO_SLOW) - def call_blockdev_wipe(self, node, bdev, offset, size): - """Request wipe at given offset with given size of a block device. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "blockdev_wipe", - [bdev.ToDict(), offset, size]) - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_remove(self, node, bdev): - """Request removal of a given block device. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "blockdev_remove", [bdev.ToDict()]) - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_rename(self, node, devlist): - """Request rename of the given block devices. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "blockdev_rename", - [[(d.ToDict(), uid) for d, uid in devlist]]) - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_pause_resume_sync(self, node, disks, pause): - """Request a pause/resume of given block device. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "blockdev_pause_resume_sync", - [[bdev.ToDict() for bdev in disks], pause]) - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_assemble(self, node, disk, owner, on_primary, idx): - """Request assembling of a given block device. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "blockdev_assemble", - [disk.ToDict(), owner, on_primary, idx]) - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_shutdown(self, node, disk): - """Request shutdown of a given block device. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "blockdev_shutdown", [disk.ToDict()]) - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_addchildren(self, node, bdev, ndevs): - """Request adding a list of children to a (mirroring) device. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "blockdev_addchildren", - [bdev.ToDict(), - [disk.ToDict() for disk in ndevs]]) - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_removechildren(self, node, bdev, ndevs): - """Request removing a list of children from a (mirroring) device. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "blockdev_removechildren", - [bdev.ToDict(), - [disk.ToDict() for disk in ndevs]]) - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_getmirrorstatus(self, node, disks): - """Request status of a (mirroring) device. - - This is a single-node call. - - """ - 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 - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_getmirrorstatus_multi(self, node_list, node_disks): - """Request status of (mirroring) devices from multiple nodes. - - This is a multi-node call. - - """ - result = self._MultiNodeCall(node_list, "blockdev_getmirrorstatus_multi", - [dict((name, [dsk.ToDict() for dsk in disks]) - for name, disks in node_disks.items())]) - for nres in result.values(): - if nres.fail_msg: - continue - - for idx, (success, status) in enumerate(nres.payload): - if success: - nres.payload[idx] = (success, objects.BlockDevStatus.FromDict(status)) - - return result - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_find(self, node, disk): - """Request identification of a given block device. - - This is a single-node call. - - """ - 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 - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_close(self, node, instance_name, disks): - """Closes the given block devices. - - This is a single-node call. - - """ - params = [instance_name, [cf.ToDict() for cf in disks]] - return self._SingleNodeCall(node, "blockdev_close", params) - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_getsize(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) - - @_RpcTimeout(_TMO_NORMAL) - def call_drbd_disconnect_net(self, node_list, nodes_ip, disks): - """Disconnects the network of the given drbd devices. - - This is a multi-node call. - - """ - return self._MultiNodeCall(node_list, "drbd_disconnect_net", - [nodes_ip, [cf.ToDict() for cf in disks]]) - - @_RpcTimeout(_TMO_NORMAL) - def call_drbd_attach_net(self, node_list, nodes_ip, - disks, instance_name, multimaster): - """Disconnects the given drbd devices. - - This is a multi-node call. - - """ - return self._MultiNodeCall(node_list, "drbd_attach_net", - [nodes_ip, [cf.ToDict() for cf in disks], - instance_name, multimaster]) - - @_RpcTimeout(_TMO_SLOW) - def call_drbd_wait_sync(self, node_list, nodes_ip, disks): - """Waits for the synchronization of drbd devices is complete. - - This is a multi-node call. - - """ - return self._MultiNodeCall(node_list, "drbd_wait_sync", - [nodes_ip, [cf.ToDict() for cf in disks]]) - - @_RpcTimeout(_TMO_URGENT) - def call_drbd_helper(self, node_list): - """Gets drbd helper. - - This is a multi-node call. - - """ - return self._MultiNodeCall(node_list, "drbd_helper", []) - @classmethod @_RpcTimeout(_TMO_NORMAL) def call_upload_file(cls, node_list, file_name, address_list=None): @@ -1220,151 +757,6 @@ class RpcRunner(_generated_rpc.RpcClientDefault): """ return cls._StaticMultiNodeCall(node_list, "write_ssconf_files", [values]) - @_RpcTimeout(_TMO_NORMAL) - def call_run_oob(self, node, oob_program, command, remote_node, timeout): - """Runs OOB. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "run_oob", [oob_program, command, - remote_node, timeout]) - - @_RpcTimeout(_TMO_FAST) - def call_os_diagnose(self, node_list): - """Request a diagnose of OS definitions. - - This is a multi-node call. - - """ - return self._MultiNodeCall(node_list, "os_diagnose", []) - - @_RpcTimeout(_TMO_FAST) - def call_os_get(self, node, name): - """Returns an OS definition. - - This is a single-node call. - - """ - result = self._SingleNodeCall(node, "os_get", [name]) - if not result.fail_msg and isinstance(result.payload, dict): - result.payload = objects.OS.FromDict(result.payload) - return result - - @_RpcTimeout(_TMO_FAST) - def call_os_validate(self, nodes, required, name, checks, params): - """Run a validation routine for a given OS. - - This is a multi-node call. - - """ - return self._MultiNodeCall(nodes, "os_validate", - [required, name, checks, params]) - - @_RpcTimeout(_TMO_NORMAL) - def call_hooks_runner(self, node_list, hpath, phase, env): - """Call the hooks runner. - - Args: - - op: the OpCode instance - - env: a dictionary with the environment - - This is a multi-node call. - - """ - params = [hpath, phase, env] - return self._MultiNodeCall(node_list, "hooks_runner", params) - - @_RpcTimeout(_TMO_NORMAL) - def call_iallocator_runner(self, node, name, idata): - """Call an iallocator on a remote node - - Args: - - name: the iallocator name - - input: the json-encoded input string - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "iallocator_runner", [name, idata]) - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_grow(self, node, cf_bdev, amount, dryrun): - """Request a snapshot of the given block device. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "blockdev_grow", - [cf_bdev.ToDict(), amount, dryrun]) - - @_RpcTimeout(_TMO_1DAY) - 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]) - - @_RpcTimeout(_TMO_NORMAL) - def call_blockdev_snapshot(self, node, cf_bdev): - """Request a snapshot of the given block device. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "blockdev_snapshot", [cf_bdev.ToDict()]) - - @_RpcTimeout(_TMO_NORMAL) - def call_finalize_export(self, node, instance, snap_disks): - """Request the completion of an export operation. - - This writes the export config file, etc. - - This is a single-node call. - - """ - flat_disks = [] - for disk in snap_disks: - 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]) - - @_RpcTimeout(_TMO_FAST) - def call_export_info(self, node, path): - """Queries the export information in a given path. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "export_info", [path]) - - @_RpcTimeout(_TMO_FAST) - def call_export_list(self, node_list): - """Gets the stored exports list. - - This is a multi-node call. - - """ - return self._MultiNodeCall(node_list, "export_list", []) - - @_RpcTimeout(_TMO_FAST) - def call_export_remove(self, node, export): - """Requests removal of a given export. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "export_remove", [export]) - @classmethod @_RpcTimeout(_TMO_NORMAL) def call_node_leave_cluster(cls, node, modify_ssh_setup): @@ -1379,73 +771,15 @@ class RpcRunner(_generated_rpc.RpcClientDefault): return cls._StaticSingleNodeCall(node, "node_leave_cluster", [modify_ssh_setup]) - @_RpcTimeout(_TMO_FAST) - def call_node_volumes(self, node_list): - """Gets all volumes on node(s). - - This is a multi-node call. - - """ - return self._MultiNodeCall(node_list, "node_volumes", []) - - @_RpcTimeout(_TMO_FAST) - def call_node_demote_from_mc(self, node): - """Demote a node from the master candidate role. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "node_demote_from_mc", []) - - @_RpcTimeout(_TMO_NORMAL) - def call_node_powercycle(self, node, hypervisor): - """Tries to powercycle a node. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "node_powercycle", [hypervisor]) - - @_RpcTimeout(None) - def call_test_delay(self, node_list, duration): + def call_test_delay(self, node_list, duration, read_timeout=None): """Sleep for a fixed time on given node(s). This is a multi-node call. """ - return self._MultiNodeCall(node_list, "test_delay", [duration], - read_timeout=int(duration + 5)) - - @_RpcTimeout(_TMO_FAST) - def call_file_storage_dir_create(self, node, file_storage_dir): - """Create the given file storage directory. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "file_storage_dir_create", - [file_storage_dir]) - - @_RpcTimeout(_TMO_FAST) - def call_file_storage_dir_remove(self, node, file_storage_dir): - """Remove the given file storage directory. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "file_storage_dir_remove", - [file_storage_dir]) - - @_RpcTimeout(_TMO_FAST) - def call_file_storage_dir_rename(self, node, old_file_storage_dir, - new_file_storage_dir): - """Rename file storage directory. - - This is a single-node call. - - """ - return self._SingleNodeCall(node, "file_storage_dir_rename", - [old_file_storage_dir, new_file_storage_dir]) + assert read_timeout is None + return self.call_test_delay(node_list, duration, + read_timeout=int(duration + 5)) @classmethod @_RpcTimeout(_TMO_URGENT) @@ -1498,126 +832,3 @@ class RpcRunner(_generated_rpc.RpcClientDefault): hv_full = objects.FillDict(cluster.hvparams.get(hvname, {}), hvparams) return self._MultiNodeCall(node_list, "hypervisor_validate_params", [hvname, hv_full]) - - @_RpcTimeout(_TMO_NORMAL) - def call_x509_cert_create(self, node, validity): - """Creates a new X509 certificate for SSL/TLS. - - This is a single-node call. - - @type validity: int - @param validity: Validity in seconds - - """ - return self._SingleNodeCall(node, "x509_cert_create", [validity]) - - @_RpcTimeout(_TMO_NORMAL) - def call_x509_cert_remove(self, node, name): - """Removes a X509 certificate. - - This is a single-node call. - - @type name: string - @param name: Certificate name - - """ - return self._SingleNodeCall(node, "x509_cert_remove", [name]) - - @_RpcTimeout(_TMO_NORMAL) - def call_import_start(self, node, opts, instance, component, - dest, dest_args): - """Starts a listener for an import. - - This is a single-node call. - - @type node: string - @param node: Node name - @type instance: C{objects.Instance} - @param instance: Instance object - @type component: string - @param component: which part of the instance is being imported - - """ - return self._SingleNodeCall(node, "import_start", - [opts.ToDict(), - self._InstDict(instance), component, dest, - _EncodeImportExportIO(dest, dest_args)]) - - @_RpcTimeout(_TMO_NORMAL) - def call_export_start(self, node, opts, host, port, - instance, component, source, source_args): - """Starts an export daemon. - - This is a single-node call. - - @type node: string - @param node: Node name - @type instance: C{objects.Instance} - @param instance: Instance object - @type component: string - @param component: which part of the instance is being imported - - """ - return self._SingleNodeCall(node, "export_start", - [opts.ToDict(), host, port, - self._InstDict(instance), - component, source, - _EncodeImportExportIO(source, source_args)]) - - @_RpcTimeout(_TMO_FAST) - def call_impexp_status(self, node, names): - """Gets the status of an import or export. - - This is a single-node call. - - @type node: string - @param node: Node name - @type names: List of strings - @param names: Import/export names - @rtype: List of L{objects.ImportExportStatus} instances - @return: Returns a list of the state of each named import/export or None if - a status couldn't be retrieved - - """ - result = self._SingleNodeCall(node, "impexp_status", [names]) - - if not result.fail_msg: - decoded = [] - - for i in result.payload: - if i is None: - decoded.append(None) - continue - decoded.append(objects.ImportExportStatus.FromDict(i)) - - result.payload = decoded - - return result - - @_RpcTimeout(_TMO_NORMAL) - def call_impexp_abort(self, node, name): - """Aborts an import or export. - - This is a single-node call. - - @type node: string - @param node: Node name - @type name: string - @param name: Import/export name - - """ - return self._SingleNodeCall(node, "impexp_abort", [name]) - - @_RpcTimeout(_TMO_NORMAL) - def call_impexp_cleanup(self, node, name): - """Cleans up after an import or export. - - This is a single-node call. - - @type node: string - @param node: Node name - @type name: string - @param name: Import/export name - - """ - return self._SingleNodeCall(node, "impexp_cleanup", [name])