diff options
| author | Russell Bryant <rbryant@redhat.com> | 2012-05-29 18:39:07 -0400 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2012-05-31 15:19:31 -0400 |
| commit | 093bdd6edff7ec391145018a0d3ce8e9dc1f84ff (patch) | |
| tree | 81f47a5cd2b7edaf1abad37dba5172ffde2c01c6 /nova/compute | |
| parent | 3a829e3543b8a346fce95f71cd51f68e7c4aae41 (diff) | |
Add pre_live_migration() to the compute rpcapi.
Part of bug 1006467.
This patch adds pre_live_migration() to the compute rpcapi. It is used
by the compute manager.
Change-Id: I70fb66ad194837faa1139e644888c4a7c7a5a0a6
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 8 | ||||
| -rw-r--r-- | nova/compute/rpcapi.py | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 95c5bd763..2ac5a7eaf 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2027,12 +2027,8 @@ class ComputeManager(manager.SchedulerDependentManager): else: disk = None - rpc.call(context, - rpc.queue_get_for(context, FLAGS.compute_topic, dest), - {'method': 'pre_live_migration', - 'args': {'instance_id': instance_id, - 'block_migration': block_migration, - 'disk': disk}}) + self.compute_rpcapi.pre_live_migration(context, instance_ref, + block_migration, disk, dest) except Exception: with excutils.save_and_reraise_exception(): diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index c08cdfe15..18da7b779 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -176,6 +176,12 @@ class ComputeAPI(nova.rpc.proxy.RpcProxy): instance_uuid=instance['uuid']), topic=self._compute_topic(ctxt, None, instance)) + def pre_live_migration(self, ctxt, instance, block_migration, disk, + host): + return self.call(ctxt, self.make_msg('pre_live_migration', + instance_id=instance['id'], block_migration=block_migration, + disk=disk), self._compute_topic(ctxt, host, None)) + def reboot_instance(self, ctxt, instance, reboot_type): self.cast(ctxt, self.make_msg('reboot_instance', instance_uuid=instance['uuid'], reboot_type=reboot_type), |