go routines removed but writing to kafka is still done via go routines
<Please press edit button to view in proper formatting>
The go routines related to port , device , transition state and kafka writing was removed from the voltha core and the PONC scale test performance was compared with the voltha core keeping the go routines intact.
The tests were carried out for an average of 5 runs with :
NUM_OLTS=6
NUM_ONUS_PER_PON=32
STACK_COUNT=1
NUM_PON_PORTS=16
The table below shows the performance in different cases:
| Test suite | with go routine | without go routine(only port and device op goroutine removed) | without go routine(port and device op go routine removed,tansition state processing,kafka writing is in go routine) | without go routine(port and device operation ,transition state processing and kafka writing go routine removed) | without go routine(port and device op and tansition state processing go routine removed ,only kafka writing is in go routine) |
|---------------------------------------|----------------------------------------------------------|---------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------|
| | | | | | |
| vOLTHA Scale Test | 04 minutes : 36 seconds : 957.5999999999767 milliseconds | 04 minutes : 30 seconds : 233.79999999998836 milliseconds | 04 minutes : 33 seconds : 859.5999999999767 milliseconds | 05 minutes : 47 seconds : 175.20000000001164 milliseconds | 04 minutes : 34 seconds : 200 milliseconds |
| vOLTHA Scale Test.Activate OLTs | 02 minutes : 15 seconds : 440.3999999999942 milliseconds | 02 minutes : 02 seconds : 861.8000000000029 milliseconds | 02 minutes : 12 seconds : 925.6000000000058 milliseconds | 02 minutes : 16 seconds : 199.39999999999418 milliseconds | 02 minutes : 11 seconds : 800 milliseconds<br/> |
| vOLTHA Scale Test.Onos Checks | 11 seconds : 191.39999999999964 milliseconds | 10 seconds : 976.3999999999996 milliseconds | 11 seconds : 552.6000000000004 milliseconds | 10 seconds : 826.3999999999996 milliseconds | 12 seconds : 00 milliseconds |
| vOLTHA Scale Test.Activate Onus | 02 minutes : 10 seconds : 314.1999999999971 milliseconds | 02 minutes : 07 seconds : 102.80000000000291 milliseconds | 02 minutes : 09 seconds : 381.3999999999942 milliseconds | 03 minutes : 20 seconds : 149.39999999999418 milliseconds | 02 minutes : 11 seconds : 00 milliseconds |
| vOLTHA Scale Test.Activate Onus.Scale | 02 minutes : 09 seconds : 207 milliseconds | 02 minutes : 06 seconds : 858.8000000000029 milliseconds | 02 minutes : 07 seconds : 153 milliseconds | 03 minutes : 17 seconds : 63 milliseconds | 02 minutes : 08 seconds : 400 milliseconds<br/> |
Change-Id: I7a7ed75be37065094c2f6b3524101e76a6a795ea
diff --git a/rw_core/core/device/logical_agent_port.go b/rw_core/core/device/logical_agent_port.go
index 719b6b8..54fa620 100644
--- a/rw_core/core/device/logical_agent_port.go
+++ b/rw_core/core/device/logical_agent_port.go
@@ -57,24 +57,21 @@
}
case voltha.Port_PON_OLT:
// Rebuilt the routes on Parent PON port addition
- go func() {
- subCtx := coreutils.WithSpanAndRPCMetadataFromContext(ctx)
- if err := agent.buildRoutes(subCtx); err != nil {
- // Not an error - temporary state
- logger.Infow(ctx, "failed-to-update-routes-after-adding-parent-pon-port", log.Fields{"device-id": device.Id, "port": port, "ports-count": len(devicePorts), "error": err})
- }
- }()
+ if err := agent.buildRoutes(ctx); err != nil {
+ // Not an error - temporary state
+ logger.Infow(ctx, "failed-to-update-routes-after-adding-parent-pon-port", log.Fields{"device-id": device.Id, "port": port, "ports-count": len(devicePorts), "error": err})
+ }
+
//fallthrough
case voltha.Port_PON_ONU:
// Add the routes corresponding to that child device
- go func() {
- subCtx := coreutils.WithSpanAndRPCMetadataFromContext(ctx)
- if err := agent.updateAllRoutes(subCtx, device.Id, devicePorts); err != nil {
- // Not an error - temporary state
- logger.Infow(ctx, "failed-to-update-routes-after-adding-child-pon-port", log.Fields{"device-id": device.Id, "port": port, "ports-count": len(devicePorts), "error": err})
- }
- }()
+
+ if err := agent.updateAllRoutes(ctx, device.Id, devicePorts); err != nil {
+ // Not an error - temporary state
+ logger.Infow(ctx, "failed-to-update-routes-after-adding-child-pon-port", log.Fields{"device-id": device.Id, "port": port, "ports-count": len(devicePorts), "error": err})
+ }
+
default:
return fmt.Errorf("invalid port type %v", port)
}
@@ -218,12 +215,10 @@
}
// Reset the logical device routes
- go func() {
- subCtx := coreutils.WithSpanAndRPCMetadataFromContext(ctx)
- if err := agent.removeRoutes(subCtx); err != nil {
- logger.Warnw(ctx, "error-removing-routes", log.Fields{"logical-device-id": agent.logicalDeviceID, "error": err})
- }
- }()
+ if err := agent.removeRoutes(ctx); err != nil {
+ logger.Warnw(ctx, "error-removing-routes", log.Fields{"logical-device-id": agent.logicalDeviceID, "error": err})
+ }
+
return nil
}
@@ -249,12 +244,11 @@
}
// Reset the logical device routes
- go func() {
- subCtx := coreutils.WithSpanAndRPCMetadataFromContext(ctx)
- if err := agent.buildRoutes(subCtx); err != nil {
- logger.Warnw(ctx, "routes-not-ready", log.Fields{"logical-device-id": agent.logicalDeviceID, "error": err})
- }
- }()
+
+ if err := agent.buildRoutes(ctx); err != nil {
+ logger.Warnw(ctx, "routes-not-ready", log.Fields{"logical-device-id": agent.logicalDeviceID, "error": err})
+ }
+
return nil
}
@@ -346,7 +340,6 @@
// created yet.
logger.Infow(ctx, "routes-not-ready", log.Fields{"logical-device-id": agent.logicalDeviceID, "logical-port": nniPort.OfpPort.PortNo, "error": err})
}
-
// send event, and allow any queued events to be sent as well
queuePosition.send(ctx, agent, agent.logicalDeviceID, ofp.OfpPortReason_OFPPR_ADD, nniPort.OfpPort)
}()
@@ -398,9 +391,8 @@
// created yet.
logger.Infow(ctx, "routes-not-ready", log.Fields{"logical-device-id": agent.logicalDeviceID, "logical-port": uniPort.OfpPort.PortNo, "error": err})
}
-
// send event, and allow any queued events to be sent as well
- queuePosition.send(subCtx, agent, agent.logicalDeviceID, ofp.OfpPortReason_OFPPR_ADD, uniPort.OfpPort)
+ queuePosition.send(ctx, agent, agent.logicalDeviceID, ofp.OfpPortReason_OFPPR_ADD, uniPort.OfpPort)
}()
return nil
}