]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Big Switch: Don't clear hash before sync
authorKevin Benton <blak111@gmail.com>
Tue, 7 Oct 2014 11:34:41 +0000 (04:34 -0700)
committerKevin Benton <kevinbenton@buttewifi.com>
Sat, 18 Oct 2014 00:09:33 +0000 (00:09 +0000)
This patch removes the step of clearing the consistency
hash from the DB before a topology sync. This will ensure
that inconsistency will be detected if the topology sync
fails.

This logic was originally there to make sure the hash header
was not present on the topology sync call to the backend.
However, the hash header is ignored by the backend in a sync
call so it wasn't necessary.

Closes-Bug: #1379510
Change-Id: I2d58fa2aea3b692834d64192d06ace727c7df8a0
(cherry picked from commit 24e4110eb284078775496501ff81630eb1619c11)

neutron/plugins/bigswitch/servermanager.py

index 6fdbec36a6ca73451328e2b62eb4734aeb48d508..0a86ff437433b9b4c3edc2f4aed02d7b303d8cd4 100644 (file)
@@ -447,8 +447,6 @@ class ServerPool(object):
                 if not self.get_topo_function:
                     raise cfg.Error(_('Server requires synchronization, '
                                       'but no topology function was defined.'))
-                # The hash was incorrect so it needs to be removed
-                hash_handler.put_hash('')
                 data = self.get_topo_function(**self.get_topo_function_args)
                 active_server.rest_call('PUT', TOPOLOGY_PATH, data,
                                         timeout=None)