[VOL-5572]:Optimising logs in rw core
Change-Id: Ic4d0d60002bc384438fca9319b2ce99dba0e7add
Signed-off-by: balaji.nagarajan <balaji.nagarajan@radisys.com>
diff --git a/VERSION b/VERSION
index 9a4c437..972d41a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.7.17
+3.7.18
diff --git a/rw_core/core/adapter/manager.go b/rw_core/core/adapter/manager.go
index d81fff9..e7f4fbb 100644
--- a/rw_core/core/adapter/manager.go
+++ b/rw_core/core/adapter/manager.go
@@ -530,7 +530,7 @@
ok := false
aMgr.rxStreamCloseChLock.RLock()
if closeCh, ok = aMgr.rxStreamCloseChMap[endpoint]; !ok {
- logger.Infow(ctx, "no entry on rxStreamCloseChMap", log.Fields{"endpoint": endpoint})
+ logger.Debugw(ctx, "no entry on rxStreamCloseChMap", log.Fields{"endpoint": endpoint})
aMgr.rxStreamCloseChLock.RUnlock()
return
}
diff --git a/rw_core/core/device/agent.go b/rw_core/core/device/agent.go
index 7692dd2..54be97f 100755
--- a/rw_core/core/device/agent.go
+++ b/rw_core/core/device/agent.go
@@ -204,7 +204,7 @@
}
defer agent.requestQueue.RequestComplete()
- logger.Infow(ctx, "stopping-device-agent", log.Fields{"device-id": agent.deviceID, "parent-id": agent.parentID})
+ logger.Debugw(ctx, "stopping-device-agent", log.Fields{"device-id": agent.deviceID, "parent-id": agent.parentID})
// Remove the device transient loader
if err := agent.deleteTransientState(ctx); err != nil {
return err
@@ -1647,6 +1647,7 @@
if state != core.DeviceTransientState_REBOOT_IN_PROGRESS {
var err error
+ logger.Debugw(ctx, "reconciling-state", log.Fields{"deviceID": device.Id, "endpoint": device.AdapterEndpoint})
if state != core.DeviceTransientState_RECONCILE_IN_PROGRESS {
// set transient state to RECONCILE IN PROGRESS
if err = agent.UpdateTransientStateToReconcile(ctx); err != nil {
diff --git a/rw_core/core/device/event/event.go b/rw_core/core/device/event/event.go
index 90c7708..db1dc42 100644
--- a/rw_core/core/device/event/event.go
+++ b/rw_core/core/device/event/event.go
@@ -199,7 +199,7 @@
// SendDeviceDeletionEvent notifies the ofAgent that the logical device was removed.
func (q *Manager) SendDeviceDeletionEvent(ctx context.Context, logicalDeviceID string) {
- logger.Infow(ctx, "send-change-event-for-device-deletion", log.Fields{"logical-device-id": logicalDeviceID})
+ logger.Debugw(ctx, "send-change-event-for-device-deletion", log.Fields{"logical-device-id": logicalDeviceID})
q.changeEventQueue <- &openflow_13.ChangeEvent{
Id: logicalDeviceID,
Event: &openflow_13.ChangeEvent_DeviceStatus{
diff --git a/rw_core/core/device/logical_agent.go b/rw_core/core/device/logical_agent.go
index 03c50ad..6f60817 100644
--- a/rw_core/core/device/logical_agent.go
+++ b/rw_core/core/device/logical_agent.go
@@ -219,7 +219,7 @@
func (agent *LogicalAgent) stop(ctx context.Context) error {
var returnErr error
agent.stopOnce.Do(func() {
- logger.Info(ctx, "stopping-logical-device-agent")
+ logger.Debugw(ctx, "stopping-logical-device-agent", log.Fields{"logical-device-id": agent.logicalDeviceID})
if err := agent.requestQueue.WaitForGreenLight(ctx); err != nil {
// This should never happen - an error is returned only if the agent is stopped and an agent is only stopped once.
@@ -253,7 +253,7 @@
close(agent.exitChannel)
agent.stopped = true
- logger.Info(ctx, "logical-device-agent-stopped")
+ logger.Infow(ctx, "logical-device-agent-stopped", log.Fields{"logical-device-id": agent.logicalDeviceID})
})
return returnErr
}
diff --git a/rw_core/core/device/logical_agent_port.go b/rw_core/core/device/logical_agent_port.go
index c44c879..3dd2e06 100644
--- a/rw_core/core/device/logical_agent_port.go
+++ b/rw_core/core/device/logical_agent_port.go
@@ -83,7 +83,7 @@
// added to it. While the logical device was being created we could have received requests to add
// NNI and UNI ports which were discarded. Now is the time to add them if needed
func (agent *LogicalAgent) setupLogicalPorts(ctx context.Context) error {
- logger.Infow(ctx, "setup-logical-ports", log.Fields{"logical-device-id": agent.logicalDeviceID})
+ logger.Debugw(ctx, "setup-logical-ports", log.Fields{"logical-device-id": agent.logicalDeviceID})
// First add any NNI ports which could have been missing
if err := agent.setupNNILogicalPorts(ctx, agent.rootDeviceID); err != nil {
logger.Errorw(ctx, "error-setting-up-nni-ports", log.Fields{"error": err, "device-id": agent.rootDeviceID})
@@ -184,7 +184,7 @@
// setupUNILogicalPorts creates a UNI port on the logical device that represents a child UNI interface
func (agent *LogicalAgent) setupUNILogicalPorts(ctx context.Context, childDevice *voltha.Device, childDevicePorts map[uint32]*voltha.Port) error {
- logger.Infow(ctx, "setup-uni-logical-ports", log.Fields{"logical-device-id": agent.logicalDeviceID})
+
// Build the logical device based on information retrieved from the device adapter
var err error
// Get UNI port number
@@ -200,7 +200,7 @@
// deleteAllLogicalPorts deletes all logical ports associated with this logical device
func (agent *LogicalAgent) deleteAllLogicalPorts(ctx context.Context) error {
- logger.Infow(ctx, "update-ports-state-start", log.Fields{"logical-device-id": agent.logicalDeviceID})
+ logger.Debugw(ctx, "update-ports-state-start", log.Fields{"logical-device-id": agent.logicalDeviceID})
// for each port
for portID := range agent.portLoader.ListIDs() {
@@ -357,7 +357,7 @@
func (agent *LogicalAgent) addUNILogicalPort(ctx context.Context, deviceID string, deviceAdminState voltha.AdminState_Types, deviceOperStatus voltha.OperStatus_Types, devicePorts map[uint32]*voltha.Port, port *voltha.Port) error {
logger.Debugw(ctx, "add-uni-logical-port", log.Fields{"port": port})
if deviceAdminState != voltha.AdminState_ENABLED || deviceOperStatus != voltha.OperStatus_ACTIVE {
- logger.Infow(ctx, "device-not-ready", log.Fields{"device-id": deviceID, "admin": deviceAdminState, "oper": deviceOperStatus})
+ logger.Warnw(ctx, "device-not-ready", log.Fields{"device-id": deviceID, "admin": deviceAdminState, "oper": deviceOperStatus})
return nil
}
ofpPort := proto.Clone(port.OfpPort).(*ofp.OfpPort)
diff --git a/rw_core/core/device/logical_manager.go b/rw_core/core/device/logical_manager.go
index 0742185..0d58cbb 100644
--- a/rw_core/core/device/logical_manager.go
+++ b/rw_core/core/device/logical_manager.go
@@ -252,7 +252,7 @@
}
func (ldMgr *LogicalManager) deleteLogicalDevice(ctx context.Context, device *voltha.Device) error {
- logger.Infow(ctx, "deleting-logical-device", log.Fields{"device-id": device.Id})
+ logger.Debugw(ctx, "deleting-logical-device", log.Fields{"device-id": device.Id})
// Sanity check
if !device.Root {
return errors.New("device-not-root")
diff --git a/rw_core/core/device/manager.go b/rw_core/core/device/manager.go
index 1394a56..9523eba 100755
--- a/rw_core/core/device/manager.go
+++ b/rw_core/core/device/manager.go
@@ -192,7 +192,7 @@
// This function is called only in the Core that does not own this device. In the Core that owns this device then a
// deletion deletion also includes removal of any reference of this device.
func (dMgr *Manager) stopManagingDevice(ctx context.Context, id string) {
- logger.Infow(ctx, "stop-managing-device", log.Fields{"device-id": id})
+ logger.Debugw(ctx, "stop-managing-device", log.Fields{"device-id": id})
if dMgr.IsDeviceInCache(id) { // Proceed only if an agent is present for this device
if device, err := dMgr.getDeviceReadOnly(ctx, id); err == nil && device.Root {
// stop managing the logical device
@@ -768,7 +768,7 @@
// GetParentDeviceID returns parent device id, either from memory or from the dB, if present
func (dMgr *Manager) GetParentDeviceID(ctx context.Context, deviceID string) string {
if device, _ := dMgr.getDeviceReadOnly(ctx, deviceID); device != nil {
- logger.Infow(ctx, "get-parent-device-id", log.Fields{"device-id": device.Id, "parent-id": device.ParentId})
+ logger.Debugw(ctx, "get-parent-device-id", log.Fields{"device-id": device.Id, "parent-id": device.ParentId})
return device.ParentId
}
return ""
diff --git a/rw_core/core/device/manager_state_callback.go b/rw_core/core/device/manager_state_callback.go
index a909d3a..efa77ee 100644
--- a/rw_core/core/device/manager_state_callback.go
+++ b/rw_core/core/device/manager_state_callback.go
@@ -27,15 +27,15 @@
// CreateLogicalDevice creates logical device in core
func (dMgr *Manager) CreateLogicalDevice(ctx context.Context, cDevice *voltha.Device) error {
- logger.Info(ctx, "create-logical-device")
+ logger.Infow(ctx, "create-logical-device", log.Fields{"device-id": cDevice.Id, "parent-id": cDevice.ParentId})
// Verify whether the logical device has already been created
if cDevice.ParentId != "" {
- logger.Debugw(ctx, "parent-device-already-exist", log.Fields{"device-id": cDevice.Id, "logical-device-id": cDevice.Id})
+ logger.Warnw(ctx, "parent-device-already-exist", log.Fields{"device-id": cDevice.Id, "logical-device-id": cDevice.Id})
return nil
}
var err error
if _, err = dMgr.logicalDeviceMgr.createLogicalDevice(ctx, cDevice); err != nil {
- logger.Warnw(ctx, "create-logical-device-error", log.Fields{"device": cDevice})
+ logger.Errorw(ctx, "create-logical-device-error", log.Fields{"device": cDevice})
return err
}
return nil
@@ -43,7 +43,7 @@
// DeleteLogicalDevice deletes logical device from core
func (dMgr *Manager) DeleteLogicalDevice(ctx context.Context, cDevice *voltha.Device) error {
- logger.Info(ctx, "delete-logical-device")
+ logger.Infow(ctx, "delete-logical-device", log.Fields{"device-id": cDevice.Id, "parent-id": cDevice.ParentId})
if err := dMgr.logicalDeviceMgr.deleteLogicalDevice(ctx, cDevice); err != nil {
return err
}
@@ -65,7 +65,7 @@
// SetupUNILogicalPorts creates UNI ports on the logical device that represents a child UNI interface
func (dMgr *Manager) SetupUNILogicalPorts(ctx context.Context, cDevice *voltha.Device) error {
- logger.Info(ctx, "setup-uni-logical-ports")
+ logger.Debugw(ctx, "setup-uni-logical-ports", log.Fields{"device-id": cDevice.Id})
cDevicePorts, err := dMgr.listDevicePorts(ctx, cDevice.Id)
if err != nil {
return err
diff --git a/rw_core/core/device/state/transitions.go b/rw_core/core/device/state/transitions.go
index 49c8cbc..39aefa4 100644
--- a/rw_core/core/device/state/transitions.go
+++ b/rw_core/core/device/state/transitions.go
@@ -487,7 +487,6 @@
deviceType := parent
if !cDevice.Root {
- logger.Info(ctx, "device is child")
deviceType = child
}
logger.Infof(ctx, "deviceType:%d-deviceId:%s-previous:%v-current:%v", deviceType, cDevice.Id, pState, cState)