VOL-3501 Code changes to support rpc event
Change-Id: I2536c0c03faa5fb026349c906ebef46323398e9a
diff --git a/rw_core/core/device/event/event.go b/rw_core/core/device/event/event.go
index 21d535f..4489196 100644
--- a/rw_core/core/device/event/event.go
+++ b/rw_core/core/device/event/event.go
@@ -20,12 +20,18 @@
"context"
"encoding/binary"
"encoding/hex"
- "sync"
-
+ "fmt"
"github.com/golang/protobuf/ptypes/empty"
+ "github.com/opencord/voltha-go/rw_core/utils"
+ "github.com/opencord/voltha-lib-go/v4/pkg/events/eventif"
"github.com/opencord/voltha-lib-go/v4/pkg/log"
+ "github.com/opencord/voltha-protos/v4/go/common"
"github.com/opencord/voltha-protos/v4/go/openflow_13"
"github.com/opencord/voltha-protos/v4/go/voltha"
+ "github.com/opentracing/opentracing-go"
+ jtracing "github.com/uber/jaeger-client-go"
+ "sync"
+ "time"
)
type Manager struct {
@@ -33,21 +39,34 @@
packetInQueueDone chan bool
changeEventQueue chan openflow_13.ChangeEvent
changeEventQueueDone chan bool
+ RPCEventManager *RPCEventManager
}
-func NewManager() *Manager {
+type RPCEventManager struct {
+ eventProxy eventif.EventProxy
+ coreInstanceID string
+}
+
+func NewManager(proxyForRPCEvents eventif.EventProxy, instanceID string) *Manager {
return &Manager{
packetInQueue: make(chan openflow_13.PacketIn, 100),
packetInQueueDone: make(chan bool, 1),
changeEventQueue: make(chan openflow_13.ChangeEvent, 100),
changeEventQueueDone: make(chan bool, 1),
+ RPCEventManager: NewRPCEventManager(proxyForRPCEvents, instanceID),
}
}
+func NewRPCEventManager(proxyForRPCEvents eventif.EventProxy, instanceID string) *RPCEventManager {
+ return &RPCEventManager{
+ eventProxy: proxyForRPCEvents,
+ coreInstanceID: instanceID,
+ }
+}
func (q *Manager) SendPacketIn(ctx context.Context, deviceID string, transationID string, packet *openflow_13.OfpPacketIn) {
// TODO: Augment the OF PacketIn to include the transactionId
packetIn := openflow_13.PacketIn{Id: deviceID, PacketIn: packet}
- logger.Debugw(ctx, "SendPacketIn", log.Fields{"packetIn": packetIn})
+ logger.Debugw(ctx, "send-packet-in", log.Fields{"packet-in": packetIn})
q.packetInQueue <- packetIn
}
@@ -66,9 +85,9 @@
defer streamingTracker.Unlock()
if _, ok := streamingTracker.calls[method]; ok {
// bail out the other packet in thread
- logger.Debugf(ctx, "%s streaming call already running. Exiting it", method)
+ logger.Debugf(ctx, "%s-streaming-call-already-running-exiting-it", method)
done <- true
- logger.Debugf(ctx, "Last %s exited. Continuing ...", method)
+ logger.Debugf(ctx, "last-%s-exited-continuing", method)
} else {
streamingTracker.calls[method] = &callTracker{failedPacket: nil}
}
@@ -79,10 +98,10 @@
if tracker.failedPacket != nil {
switch tracker.failedPacket.(type) {
case openflow_13.PacketIn:
- logger.Debug(ctx, "Enqueueing last failed packetIn")
+ logger.Debug(ctx, "enqueueing-last-failed-packet-in")
q.packetInQueue <- tracker.failedPacket.(openflow_13.PacketIn)
case openflow_13.ChangeEvent:
- logger.Debug(ctx, "Enqueueing last failed changeEvent")
+ logger.Debug(ctx, "enqueueing-last-failed-change-event")
q.changeEventQueue <- tracker.failedPacket.(openflow_13.ChangeEvent)
}
}
@@ -92,8 +111,9 @@
// ReceivePacketsIn receives packets from adapter
func (q *Manager) ReceivePacketsIn(_ *empty.Empty, packetsIn voltha.VolthaService_ReceivePacketsInServer) error {
ctx := context.Background()
+ ctx = utils.WithRPCMetadataContext(ctx, "ReceivePacketsIn")
var streamingTracker = q.getStreamingTracker(ctx, "ReceivePacketsIn", q.packetInQueueDone)
- logger.Debugw(ctx, "ReceivePacketsIn-request", log.Fields{"packetsIn": packetsIn})
+ logger.Debugw(ctx, "receive-packets-in-request", log.Fields{"packets-in": packetsIn})
err := q.flushFailedPackets(ctx, streamingTracker)
if err != nil {
@@ -109,6 +129,9 @@
})
if err := packetsIn.Send(&packet); err != nil {
logger.Errorw(ctx, "failed-to-send-packet", log.Fields{"error": err})
+ go q.RPCEventManager.GetAndSendRPCEvent(ctx, packet.Id, err.Error(),
+ nil, "RPC_ERROR_RAISE_EVENT", voltha.EventCategory_COMMUNICATION,
+ nil, time.Now().UnixNano())
// save the last failed packet in
streamingTracker.failedPacket = packet
} else {
@@ -118,7 +141,7 @@
}
}
case <-q.packetInQueueDone:
- logger.Debug(ctx, "Another ReceivePacketsIn running. Bailing out ...")
+ logger.Debug(ctx, "another-receive-packets-in-running-bailing-out")
break loop
}
}
@@ -128,7 +151,7 @@
}
func (q *Manager) SendChangeEvent(ctx context.Context, deviceID string, reason openflow_13.OfpPortReason, desc *openflow_13.OfpPort) {
- logger.Debugw(ctx, "SendChangeEvent", log.Fields{"device-id": deviceID, "reason": reason, "desc": desc})
+ logger.Debugw(ctx, "send-change-event", log.Fields{"device-id": deviceID, "reason": reason, "desc": desc})
q.changeEventQueue <- openflow_13.ChangeEvent{
Id: deviceID,
Event: &openflow_13.ChangeEvent_PortStatus{
@@ -141,8 +164,8 @@
}
func (q *Manager) SendFlowChangeEvent(ctx context.Context, deviceID string, res []error, xid uint32, flowCookie uint64) {
- logger.Debugw(ctx, "SendChangeEvent", log.Fields{"device-id": deviceID,
- "flowId": xid, "flowCookie": flowCookie, "errors": res})
+ logger.Debugw(ctx, "send-change-event", log.Fields{"device-id": deviceID,
+ "flow-id": xid, "flow-cookie": flowCookie, "errors": res})
errorType := openflow_13.OfpErrorType_OFPET_FLOW_MOD_FAILED
//Manually creating the data payload for the flow error message
bs := make([]byte, 2)
@@ -179,8 +202,9 @@
// ReceiveChangeEvents receives change in events
func (q *Manager) ReceiveChangeEvents(_ *empty.Empty, changeEvents voltha.VolthaService_ReceiveChangeEventsServer) error {
ctx := context.Background()
+ ctx = utils.WithRPCMetadataContext(ctx, "ReceiveChangeEvents")
var streamingTracker = q.getStreamingTracker(ctx, "ReceiveChangeEvents", q.changeEventQueueDone)
- logger.Debugw(ctx, "ReceiveChangeEvents-request", log.Fields{"changeEvents": changeEvents})
+ logger.Debugw(ctx, "receive-change-events-request", log.Fields{"change-events": changeEvents})
err := q.flushFailedPackets(ctx, streamingTracker)
if err != nil {
@@ -195,7 +219,10 @@
logger.Debugw(ctx, "sending-change-event", log.Fields{"event": event})
if err := changeEvents.Send(&event); err != nil {
logger.Errorw(ctx, "failed-to-send-change-event", log.Fields{"error": err})
- // save last failed changeevent
+ go q.RPCEventManager.GetAndSendRPCEvent(ctx, event.Id, err.Error(),
+ nil, "RPC_ERROR_RAISE_EVENT", voltha.EventCategory_COMMUNICATION, nil,
+ time.Now().UnixNano())
+ // save last failed change event
streamingTracker.failedPacket = event
} else {
if streamingTracker.failedPacket != nil {
@@ -204,7 +231,7 @@
}
}
case <-q.changeEventQueueDone:
- logger.Debug(ctx, "Another ReceiveChangeEvents already running. Bailing out ...")
+ logger.Debug(ctx, "another-receive-change-events-already-running-bailing-out")
break loop
}
}
@@ -215,3 +242,44 @@
func (q *Manager) GetChangeEventsQueueForTest() <-chan openflow_13.ChangeEvent {
return q.changeEventQueue
}
+
+func (q *RPCEventManager) NewRPCEvent(ctx context.Context, resourceID, desc string, context map[string]string) *voltha.RPCEvent {
+ logger.Debugw(ctx, "new-rpc-event", log.Fields{"resource-id": resourceID})
+ var opID string
+ var rpc string
+
+ if span := opentracing.SpanFromContext(ctx); span != nil {
+ if jSpan, ok := span.(*jtracing.Span); ok {
+ opID = fmt.Sprintf("%016x", jSpan.SpanContext().TraceID().Low) // Using Sprintf to avoid removal of leading 0s
+ }
+ }
+ rpc = utils.GetRPCMetadataFromContext(ctx)
+ rpcev := &voltha.RPCEvent{
+ Rpc: rpc,
+ OperationId: opID,
+ ResourceId: resourceID,
+ Service: q.coreInstanceID,
+ Status: &common.OperationResp{
+ Code: common.OperationResp_OPERATION_FAILURE,
+ },
+ Description: desc,
+ Context: context,
+ }
+ return rpcev
+}
+
+func (q *RPCEventManager) SendRPCEvent(ctx context.Context, id string, rpcEvent *voltha.RPCEvent, category voltha.EventCategory_Types, subCategory *voltha.EventSubCategory_Types, raisedTs int64) {
+ //TODO Instead of directly sending to the kafka bus, queue the message and send it asynchronously
+ if rpcEvent.Rpc != "" {
+ _ = q.eventProxy.SendRPCEvent(ctx, id, rpcEvent, category, subCategory, raisedTs)
+ }
+}
+
+func (q *RPCEventManager) GetAndSendRPCEvent(ctx context.Context, resourceID, desc string, context map[string]string,
+ id string, category voltha.EventCategory_Types, subCategory *voltha.EventSubCategory_Types, raisedTs int64) {
+ rpcEvent := q.NewRPCEvent(ctx, resourceID, desc, context)
+ //TODO Instead of directly sending to the kafka bus, queue the message and send it asynchronously
+ if rpcEvent.Rpc != "" {
+ _ = q.eventProxy.SendRPCEvent(ctx, id, rpcEvent, category, subCategory, raisedTs)
+ }
+}