Fixes a deadlock issue when both a model change and a notification of
that change is in the queue.
Change-Id: I76554242b45f90c474fc772572820b9cdde16df2
diff --git a/voltha/core/config/config_node.py b/voltha/core/config/config_node.py
index f679786..56518bb 100644
--- a/voltha/core/config/config_node.py
+++ b/voltha/core/config/config_node.py
@@ -304,18 +304,13 @@
proceed_on_errors=1,
)
-
- # TODO: This fix needs to be investigated/reworked as it causes an
- # extra item to be queued in the main branch. This item does
- # not get consumed, hence preventing any device update on the
- # main branch
- # for change_type, data in change_announcements:
- # self._root.enqueue_callback(
- # self._mk_event_bus().advertise,
- # change_type,
- # data,
- # hash=rev.hash
- # )
+ for change_type, data in change_announcements:
+ self._root.enqueue_notification_callback(
+ self._mk_event_bus().advertise,
+ change_type,
+ data,
+ hash=rev.hash,
+ )
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ add operation ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~