[VOL-1825] Implemetation of the reconcile feature in the Core
This commit implements the reconcile feature in the Core as
well as the necessary changes in the GO libraries. Changes were
also made in the simulated OLT and ONU adapters to react to a
reconcile request following an adapter restart. These changes
were tested in a 1-node deployment (1 core pair) and 3-nodes
deployment (3 core-pairs but single adapter instances). Test
was also done using the openolt to ensure the reconcile request
does not cause panic in the Core or Openolt since the reconcile
feature is not implemented in Openolt.
Change-Id: I178d619fbcfcc6caa0ee3abfd70fc03c384c5fea
diff --git a/rw_core/core/adapter_manager.go b/rw_core/core/adapter_manager.go
index ac856df..0ce1828 100644
--- a/rw_core/core/adapter_manager.go
+++ b/rw_core/core/adapter_manager.go
@@ -93,13 +93,14 @@
clusterDataProxy *model.Proxy
adapterProxy *model.Proxy
deviceTypeProxy *model.Proxy
+ deviceMgr *DeviceManager
coreInstanceId string
exitChannel chan int
lockAdaptersMap sync.RWMutex
lockdDeviceTypeToAdapterMap sync.RWMutex
}
-func newAdapterManager(cdProxy *model.Proxy, coreInstanceId string) *AdapterManager {
+func newAdapterManager(cdProxy *model.Proxy, coreInstanceId string, deviceMgr *DeviceManager) *AdapterManager {
var adapterMgr AdapterManager
adapterMgr.exitChannel = make(chan int, 1)
adapterMgr.coreInstanceId = coreInstanceId
@@ -108,6 +109,7 @@
adapterMgr.deviceTypeToAdapterMap = make(map[string]string)
adapterMgr.lockAdaptersMap = sync.RWMutex{}
adapterMgr.lockdDeviceTypeToAdapterMap = sync.RWMutex{}
+ adapterMgr.deviceMgr = deviceMgr
return &adapterMgr
}
@@ -169,7 +171,13 @@
}
//updateAdaptersAndDevicetypesInMemory loads the existing set of adapters and device types in memory
-func (aMgr *AdapterManager) updateAdaptersAndDevicetypesInMemory() {
+func (aMgr *AdapterManager) updateAdaptersAndDevicetypesInMemory(adapter *voltha.Adapter) {
+ if aMgr.getAdapter(adapter.Id) != nil {
+ // Already registered - Adapter may have restarted. Trigger the reconcile process for that adapter
+ go aMgr.deviceMgr.adapterRestarted(adapter)
+ return
+ }
+
// Update the adapters
if adaptersIf := aMgr.clusterDataProxy.List(context.Background(), "/adapters", 0, false, ""); adaptersIf != nil {
for _, adapterIf := range adaptersIf.([]interface{}) {
@@ -306,7 +314,8 @@
log.Debugw("registerAdapter", log.Fields{"adapter": adapter, "deviceTypes": deviceTypes.Items})
if aMgr.getAdapter(adapter.Id) != nil {
- // Already registered
+ // Already registered - Adapter may have restarted. Trigger the reconcile process for that adapter
+ go aMgr.deviceMgr.adapterRestarted(adapter)
return &voltha.CoreInstance{InstanceId: aMgr.coreInstanceId}
}
// Save the adapter and the device types