VOL-4670: Fix for flowIDsForGem cache in openolt adapter
resource manager is not updated on adapter restarts
- The cache flowIDsForGem is empty on adapter restarts.
So use GetFlowIDsForGem API to update the cache and use it.
VOL-4672: Stale etcd data in openolt adapter after olt device delete
- If OLT device is getting deleted ignore ChildDeviceLost processing.
The ChildDeviceLost could create entries already cleaned up by
OLT device delete processing under some race conditions.
Change-Id: I535d9c968acb6bcee897fea49c78362230a52ac9
diff --git a/internal/pkg/core/device_handler.go b/internal/pkg/core/device_handler.go
index 78e2eb3..bfdd3ee 100644
--- a/internal/pkg/core/device_handler.go
+++ b/internal/pkg/core/device_handler.go
@@ -2495,6 +2495,13 @@
// ChildDeviceLost deletes ONU and clears pon resources related to it.
func (dh *DeviceHandler) ChildDeviceLost(ctx context.Context, pPortNo uint32, onuID uint32, onuSn string) error {
logger.Debugw(ctx, "child-device-lost", log.Fields{"parent-device-id": dh.device.Id})
+ if dh.getDeviceDeletionInProgressFlag() {
+ // Given that the OLT device itself is getting deleted, everything will be cleaned up in the DB and the OLT
+ // will reboot, so everything will be reset on the pOLT too.
+ logger.Infow(ctx, "olt-device-delete-in-progress-not-handling-child-device-lost",
+ log.Fields{"parent-device-id": dh.device.Id, "pon-port": pPortNo, "onuID": onuID, "onuSN": onuSn})
+ return nil
+ }
intfID := plt.PortNoToIntfID(pPortNo, voltha.Port_PON_OLT)
onuKey := dh.formOnuKey(intfID, onuID)