From 11f480ea272ad41da542e55e0d35bd84c48d64eb Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Tue, 7 Oct 2014 04:34:41 -0700 Subject: [PATCH] Big Switch: Don't clear hash before sync 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 | 2 -- 1 file changed, 2 deletions(-) diff --git a/neutron/plugins/bigswitch/servermanager.py b/neutron/plugins/bigswitch/servermanager.py index 6fdbec36a..0a86ff437 100644 --- a/neutron/plugins/bigswitch/servermanager.py +++ b/neutron/plugins/bigswitch/servermanager.py @@ -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) -- 2.45.2