commit 6371af54e866e7d0d1dfe46afbf9c75523ef1dad
author serkant.uluderya <serkant.uluderya@netsia.com> Fri May 29 23:26:57 2020 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Tue Jun 16 16:57:07 2020 -0700
tree 664310b2b204fb1f763980f6eec81dcd52e92cf2
parent c344f3031fcfdcee426f48e3f54d7918d1caec1f

[VOL-3223] Retrying ONU_INDICATIONs

Change-Id: I23d16fb03f5ab0d0f1d277c077a2e4e3bbbb67f1

VERSION

diff --git a/VERSION b/VERSION
index 59aa62c..7bf4b6a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.5
+2.4.6

pyvoltha/adapters/kafka/adapter_request_facade.py

diff --git a/pyvoltha/adapters/kafka/adapter_request_facade.py b/pyvoltha/adapters/kafka/adapter_request_facade.py
index 2159ebe..b0001fe 100644
--- a/pyvoltha/adapters/kafka/adapter_request_facade.py
+++ b/pyvoltha/adapters/kafka/adapter_request_facade.py
@@ -376,7 +376,12 @@
             return False, Error(code=ErrorCode.INVALID_PARAMETERS,
                                 reason="msg-invalid")
 
-        return (True, self.adapter.process_inter_adapter_message(m))
+        max_retry = 0
+        # NOTE as per VOL-3223 a race condition on ONU_IND_REQUEST may occur,
+        # so if that's the message retry up to 10 times
+        if m.header.type == 6:
+            max_retry = 10
+        return (True, self.adapter.process_inter_adapter_message(m, max_retry=max_retry))
 
 
     def receive_packet_out(self, deviceId, outPort, packet, **kwargs):