Don't update AgentCache when Chassis_Private.chassis == []

When we delete a Chassis object when deleting an agent, the
corresponding value in Chassis_Private.chassis is automatically
set to []. Even though we use frozen rows, since we listen for
updates to Chassis_Private, we will replace the row in the
AgentCache with this new "chassis-less" entry, which will break
things since Chassis_Private.chassis is used to display information
which is only stored there like 'hostname'.

This patch avoids updating the AgentCache when Chassis_Private
has an empty Chassis field.

Related-Bug: #1914757
Change-Id: Iad01db7f33d6c61b29c552d2dc8893e2946a369a
This commit is contained in:
Terry Wilson 2021-02-08 18:40:36 +00:00
parent 27255fce30
commit f06268a8ff
1 changed files with 11 additions and 1 deletions

View File

@ -265,7 +265,12 @@ class ChassisAgentWriteEvent(ChassisAgentEvent):
events = (BaseEvent.ROW_CREATE, BaseEvent.ROW_UPDATE)
def match_fn(self, event, row, old=None):
return event == self.ROW_CREATE or getattr(old, 'nb_cfg', False)
# On updates to Chassis_Private because the Chassis has been deleted,
# don't update the AgentCache. We use chassis_private.chassis to return
# data about the agent.
return event == self.ROW_CREATE or (
getattr(old, 'nb_cfg', False) and not
(self.table == 'Chassis_Private' and not row.chassis))
def run(self, event, row, old):
n_agent.AgentCache().update(ovn_const.OVN_CONTROLLER_AGENT, row,
@ -291,6 +296,11 @@ class ChassisMetadataAgentWriteEvent(ChassisAgentEvent):
if event == self.ROW_CREATE:
return True
try:
# On updates to Chassis_Private because the Chassis has been
# deleted, don't update the AgentCache. We use
# chassis_private.chassis to return data about the agent.
if self.table == 'Chassis_Private' and not row.chassis:
return False
return self._metadata_nb_cfg(row) != self._metadata_nb_cfg(old)
except (AttributeError, KeyError):
return False