diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-27 21:22:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-27 21:22:58 +0000 |
| commit | 7e658bd45db6c14b4cd7e3a976caf769873d4ca1 (patch) | |
| tree | 37453345185f9407975b0679e3829df1be1f136f | |
| parent | c62ce3f98f2c40bd82b9b5b2cec03f3d15ad4766 (diff) | |
| parent | c689891226baa8877f6fb7b3c468b06972068847 (diff) | |
| download | nova-7e658bd45db6c14b4cd7e3a976caf769873d4ca1.tar.gz nova-7e658bd45db6c14b4cd7e3a976caf769873d4ca1.tar.xz nova-7e658bd45db6c14b4cd7e3a976caf769873d4ca1.zip | |
Merge "Avoid casts in network manager to prevent races"
| -rw-r--r-- | nova/network/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index fb37499e4..2fc75eec1 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -230,7 +230,7 @@ class RPCAllocateFixedIP(object): def deallocate_fixed_ip(self, context, address, host, **kwargs): """Call the superclass deallocate_fixed_ip if i'm the correct host - otherwise cast to the correct host""" + otherwise call to the correct host""" fixed_ip = self.db.fixed_ip_get_by_address(context, address) network = self._get_network_by_id(context, fixed_ip['network_id']) @@ -243,7 +243,7 @@ class RPCAllocateFixedIP(object): topic = rpc.queue_get_for(context, FLAGS.network_topic, host) args = {'address': address, 'host': host} - rpc.cast(context, topic, + rpc.call(context, topic, {'method': 'deallocate_fixed_ip', 'args': args}) else: |