VOL-1497 : Further improved data synchronization between cores
- Introduced locking when modifying branches
- Introduced locking when modifying rev children
- Rewrote persistence loading logic to avoid unecessary changes
- Access controlled CreateProxy to ensure a proxy is not created
against an incomplete device entry
- Removed locking logic from etcd client
- Replaced revision merging logic with persistence loading
VOL-1544 : Cleanup revisions to improve overall performance
- Ensure that old revisions are discarded
- Ensure that children do not contain discarded revisions
- Disabled cache logic for now
Change-Id: I1b952c82aba379fce64a47a71b5309a6f28fb5ff
diff --git a/rw_core/core/adapter_manager.go b/rw_core/core/adapter_manager.go
index be5b589..07a4826 100644
--- a/rw_core/core/adapter_manager.go
+++ b/rw_core/core/adapter_manager.go
@@ -119,8 +119,8 @@
aMgr.loadAdaptersAndDevicetypesInMemory()
//// Create the proxies
- aMgr.adapterProxy = aMgr.clusterDataProxy.Root.CreateProxy("/adapters", false)
- aMgr.deviceTypeProxy = aMgr.clusterDataProxy.Root.CreateProxy("/device_types", false)
+ aMgr.adapterProxy = aMgr.clusterDataProxy.CreateProxy("/adapters", false)
+ aMgr.deviceTypeProxy = aMgr.clusterDataProxy.CreateProxy("/device_types", false)
// Register the callbacks
aMgr.adapterProxy.RegisterCallback(model.POST_UPDATE, aMgr.adapterUpdated)
diff --git a/rw_core/core/device_agent.go b/rw_core/core/device_agent.go
index af4cb7b..d00375f 100644
--- a/rw_core/core/device_agent.go
+++ b/rw_core/core/device_agent.go
@@ -98,13 +98,13 @@
}
}
- agent.deviceProxy = agent.clusterDataProxy.Root.CreateProxy("/devices/"+agent.deviceId, false)
+ agent.deviceProxy = agent.clusterDataProxy.CreateProxy("/devices/"+agent.deviceId, false)
agent.deviceProxy.RegisterCallback(model.POST_UPDATE, agent.processUpdate)
- agent.flowProxy = agent.clusterDataProxy.Root.CreateProxy(
+ agent.flowProxy = agent.clusterDataProxy.CreateProxy(
fmt.Sprintf("/devices/%s/flows", agent.deviceId),
false)
- agent.groupProxy = agent.clusterDataProxy.Root.CreateProxy(
+ agent.groupProxy = agent.clusterDataProxy.CreateProxy(
fmt.Sprintf("/devices/%s/flow_groups", agent.deviceId),
false)
@@ -140,7 +140,7 @@
// getDeviceWithoutLock is a helper function to be used ONLY by any device agent function AFTER it has acquired the device lock.
// This function is meant so that we do not have duplicate code all over the device agent functions
func (agent *DeviceAgent) getDeviceWithoutLock() (*voltha.Device, error) {
- if device := agent.clusterDataProxy.Get("/devices/"+agent.deviceId, 0, true, ""); device != nil {
+ if device := agent.clusterDataProxy.Get("/devices/"+agent.deviceId, 0, false, ""); device != nil {
if d, ok := device.(*voltha.Device); ok {
cloned := proto.Clone(d).(*voltha.Device)
return cloned, nil
diff --git a/rw_core/core/device_ownership.go b/rw_core/core/device_ownership.go
index 0921561..f52efea 100644
--- a/rw_core/core/device_ownership.go
+++ b/rw_core/core/device_ownership.go
@@ -186,7 +186,11 @@
// Not owned by me or maybe anybody else. Try to reserve it
reservedByMe := da.tryToReserveKey(ownershipKey)
myChnl := make(chan int)
+
+ da.deviceMapLock.Lock()
da.deviceMap[ownershipKey] = &ownership{id: ownershipKey, owned: reservedByMe, chnl: myChnl}
+ da.deviceMapLock.Unlock()
+
log.Debugw("set-new-ownership", log.Fields{"Id": ownershipKey, "owned": reservedByMe})
go da.MonitorOwnership(ownershipKey, myChnl)
return reservedByMe
diff --git a/rw_core/core/logical_device_agent.go b/rw_core/core/logical_device_agent.go
index e123be7..193ba9a 100644
--- a/rw_core/core/logical_device_agent.go
+++ b/rw_core/core/logical_device_agent.go
@@ -121,13 +121,13 @@
}
agent.lockLogicalDevice.Lock()
- agent.flowProxy = agent.clusterDataProxy.Root.CreateProxy(
+ agent.flowProxy = agent.clusterDataProxy.CreateProxy(
fmt.Sprintf("/logical_devices/%s/flows", agent.logicalDeviceId),
false)
- agent.groupProxy = agent.clusterDataProxy.Root.CreateProxy(
+ agent.groupProxy = agent.clusterDataProxy.CreateProxy(
fmt.Sprintf("/logical_devices/%s/flow_groups", agent.logicalDeviceId),
false)
- agent.ldProxy = agent.clusterDataProxy.Root.CreateProxy(
+ agent.ldProxy = agent.clusterDataProxy.CreateProxy(
fmt.Sprintf("/logical_devices/%s", agent.logicalDeviceId),
false)
@@ -1084,7 +1084,7 @@
// Set the proxy and callback for that port
agent.portProxiesLock.Lock()
- agent.portProxies[port.Id] = agent.clusterDataProxy.Root.CreateProxy(
+ agent.portProxies[port.Id] = agent.clusterDataProxy.CreateProxy(
fmt.Sprintf("/logical_devices/%s/ports/%s", agent.logicalDeviceId, port.Id),
false)
agent.portProxies[port.Id].RegisterCallback(model.POST_UPDATE, agent.portUpdated)
diff --git a/rw_core/core/logical_device_manager.go b/rw_core/core/logical_device_manager.go
index 2417b60..5cfb475 100644
--- a/rw_core/core/logical_device_manager.go
+++ b/rw_core/core/logical_device_manager.go
@@ -278,7 +278,7 @@
// addLogicalPort sets up a logical port on the logical device based on the device port
// information.
func (ldMgr *LogicalDeviceManager) addLogicalPort(device *voltha.Device, port *voltha.Port) error {
- if ldID, err := ldMgr.getLogicalDeviceId(device); err != nil {
+ if ldID, err := ldMgr.getLogicalDeviceId(device); err != nil || *ldID == "" {
// This is not an error as the logical device may not have been created at this time. In such a case,
// the ports will be created when the logical device is ready.
return nil