Skip to content
Snippets Groups Projects
Commit 0a2203ec authored by Fabian Seidl's avatar Fabian Seidl
Browse files

added go routine to event publishing to prevent blocking

parent 6fd47d43
No related branches found
No related tags found
1 merge request!370Resolve "Error handling in event publishing via entity services could be improved"
Pipeline #111649 passed
Stage: build
Stage: test
Stage: analyze
Stage: integration-test
This commit is part of merge request !370. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 144 additions and 24 deletions
controller/nucleus/deviceService.go
+ 24
− 4
View file @ 0a2203ec
......@@ -82,7 +82,12 @@ func (s *DeviceService) Add(deviceToAdd device.Device) error {
pubEvent := event.NewAddEvent(deviceToAdd.ID())
if err := s.eventService.PublishEvent(DeviceEventTopic, pubEvent); err != nil {
if retryErr := s.eventService.RetryPublish(DeviceEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = s.eventService.RetryPublish(DeviceEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -116,7 +121,12 @@ func (s *DeviceService) UpdateModel(deviceToUpdate device.Device, modelAsString
pubEvent := event.NewUpdateEvent(deviceToUpdate.ID())
if err := s.eventService.PublishEvent(DeviceEventTopic, pubEvent); err != nil {
if retryErr := s.eventService.RetryPublish(DeviceEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = s.eventService.RetryPublish(DeviceEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -133,7 +143,12 @@ func (s *DeviceService) Update(deviceToUpdate device.Device) error {
pubEvent := event.NewUpdateEvent(deviceToUpdate.ID())
if err := s.eventService.PublishEvent(DeviceEventTopic, pubEvent); err != nil {
if retryErr := s.eventService.RetryPublish(DeviceEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = s.eventService.RetryPublish(DeviceEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -156,7 +171,12 @@ func (s *DeviceService) Delete(deviceToDelete device.Device) error {
pubEvent := event.NewDeleteEvent(deviceToDelete.ID())
if err := s.eventService.PublishEvent(DeviceEventTopic, pubEvent); err != nil {
if retryErr := s.eventService.RetryPublish(DeviceEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = s.eventService.RetryPublish(DeviceEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......
controller/nucleus/sbiService.go
+ 12
− 2
View file @ 0a2203ec
......@@ -75,7 +75,12 @@ func (s *SbiService) Add(sbiToAdd southbound.SouthboundInterface) error {
pubEvent := event.NewAddEvent(sbiToAdd.ID())
if err := s.eventService.PublishEvent(SbiEventTopic, pubEvent); err != nil {
if retryErr := s.eventService.RetryPublish(SbiEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = s.eventService.RetryPublish(SbiEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -99,7 +104,12 @@ func (s *SbiService) Delete(sbiToDelete southbound.SouthboundInterface) error {
pubEvent := event.NewDeleteEvent(sbiToDelete.ID())
if err := s.eventService.PublishEvent(SbiEventTopic, pubEvent); err != nil {
if retryErr := s.eventService.RetryPublish(SbiEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = s.eventService.RetryPublish(SbiEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......
controller/rbac/rbacService.go
+ 36
− 6
View file @ 0a2203ec
......@@ -42,7 +42,12 @@ func (s *UserService) Add(userToAdd rbac.User) error {
pubEvent := event.NewAddEvent(userToAdd.ID())
if err := s.eventService.PublishEvent(UserEventTopic, pubEvent); err != nil {
if retryErr := s.eventService.RetryPublish(UserEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = s.eventService.RetryPublish(UserEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -59,7 +64,12 @@ func (s *UserService) Delete(userToDelete rbac.User) error {
pubEvent := event.NewDeleteEvent(userToDelete.ID())
if err := s.eventService.PublishEvent(UserEventTopic, pubEvent); err != nil {
if retryErr := s.eventService.RetryPublish(UserEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = s.eventService.RetryPublish(UserEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -76,7 +86,12 @@ func (s *UserService) Update(userToUpdate rbac.User) error {
pubEvent := event.NewUpdateEvent(userToUpdate.ID())
if err := s.eventService.PublishEvent(UserEventTopic, pubEvent); err != nil {
if retryErr := s.eventService.RetryPublish(UserEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = s.eventService.RetryPublish(UserEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -137,7 +152,12 @@ func (s *RoleService) Add(roleToAdd rbac.Role) error {
pubEvent := event.NewAddEvent(roleToAdd.ID())
if err := s.eventService.PublishEvent(RoleEventTopic, pubEvent); err != nil {
if retryErr := s.eventService.RetryPublish(RoleEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = s.eventService.RetryPublish(RoleEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -154,7 +174,12 @@ func (s *RoleService) Delete(roleToDelete rbac.Role) error {
pubEvent := event.NewDeleteEvent(roleToDelete.ID())
if err := s.eventService.PublishEvent(RoleEventTopic, pubEvent); err != nil {
if retryErr := s.eventService.RetryPublish(RoleEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = s.eventService.RetryPublish(RoleEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -170,7 +195,12 @@ func (s *RoleService) Update(roleToUpdate rbac.Role) error {
pubEvent := event.NewUpdateEvent(roleToUpdate.ID())
if err := s.eventService.PublishEvent(RoleEventTopic, pubEvent); err != nil {
if retryErr := s.eventService.RetryPublish(RoleEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = s.eventService.RetryPublish(RoleEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......
controller/topology/nodes/nodeService.go
+ 18
− 3
View file @ 0a2203ec
......@@ -62,7 +62,12 @@ func (n *NodeService) createNode(node Node) (Node, error) {
pubEvent := event.NewAddEvent(node.ID)
if err := n.eventService.PublishEvent(NodeEventTopic, pubEvent); err != nil {
if retryErr := n.eventService.RetryPublish(NodeEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = n.eventService.RetryPublish(NodeEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -79,7 +84,12 @@ func (n *NodeService) Update(node Node) error {
pubEvent := event.NewUpdateEvent(node.ID)
if err := n.eventService.PublishEvent(NodeEventTopic, pubEvent); err != nil {
if retryErr := n.eventService.RetryPublish(NodeEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = n.eventService.RetryPublish(NodeEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -96,7 +106,12 @@ func (n *NodeService) Delete(node Node) error {
pubEvent := event.NewDeleteEvent(node.ID)
if err := n.eventService.PublishEvent(NodeEventTopic, pubEvent); err != nil {
if retryErr := n.eventService.RetryPublish(NodeEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = n.eventService.RetryPublish(NodeEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......
controller/topology/ports/portService.go
+ 18
− 3
View file @ 0a2203ec
......@@ -60,7 +60,12 @@ func (p *PortService) createPort(port Port) (Port, error) {
pubEvent := event.NewAddEvent(port.ID)
if err := p.eventService.PublishEvent(PortEventTopic, pubEvent); err != nil {
if retryErr := p.eventService.RetryPublish(PortEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = p.eventService.RetryPublish(PortEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -77,7 +82,12 @@ func (p *PortService) Update(port Port) error {
pubEvent := event.NewUpdateEvent(port.ID)
if err := p.eventService.PublishEvent(PortEventTopic, pubEvent); err != nil {
if retryErr := p.eventService.RetryPublish(PortEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = p.eventService.RetryPublish(PortEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -94,7 +104,12 @@ func (p *PortService) Delete(port Port) error {
pubEvent := event.NewDeleteEvent(port.ID)
if err := p.eventService.PublishEvent(PortEventTopic, pubEvent); err != nil {
if retryErr := p.eventService.RetryPublish(PortEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = p.eventService.RetryPublish(PortEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......
controller/topology/routing-tables/routingTableService.go
+ 18
− 3
View file @ 0a2203ec
......@@ -70,7 +70,12 @@ func (r *RoutingTableService) createRoutingTable(routingTable RoutingTable) (Rou
pubEvent := event.NewAddEvent(routingTable.ID)
if err := r.eventService.PublishEvent(RoutingTableEventTopic, pubEvent); err != nil {
if retryErr := r.eventService.RetryPublish(RoutingTableEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = r.eventService.RetryPublish(RoutingTableEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -87,7 +92,12 @@ func (r *RoutingTableService) Update(routingTable RoutingTable) error {
pubEvent := event.NewUpdateEvent(routingTable.ID)
if err := r.eventService.PublishEvent(RoutingTableEventTopic, pubEvent); err != nil {
if retryErr := r.eventService.RetryPublish(RoutingTableEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = r.eventService.RetryPublish(RoutingTableEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -104,7 +114,12 @@ func (r *RoutingTableService) Delete(routingTable RoutingTable) error {
pubEvent := event.NewDeleteEvent(routingTable.ID)
if err := r.eventService.PublishEvent(RoutingTableEventTopic, pubEvent); err != nil {
if retryErr := r.eventService.RetryPublish(RoutingTableEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = r.eventService.RetryPublish(RoutingTableEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......
controller/topology/topologyService.go
+ 18
− 3
View file @ 0a2203ec
......@@ -76,7 +76,12 @@ func (t *service) AddLink(link links.Link) error {
pubEvent := event.NewAddEvent(link.ID)
if err := t.eventService.PublishEvent(LinkEventTopic, pubEvent); err != nil {
if retryErr := t.eventService.RetryPublish(LinkEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = t.eventService.RetryPublish(LinkEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -93,7 +98,12 @@ func (t *service) UpdateLink(link links.Link) error {
pubEvent := event.NewUpdateEvent(link.ID)
if err := t.eventService.PublishEvent(LinkEventTopic, pubEvent); err != nil {
if retryErr := t.eventService.RetryPublish(LinkEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = t.eventService.RetryPublish(LinkEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......@@ -112,7 +122,12 @@ func (t *service) DeleteLink(link links.Link) error {
pubEvent := event.NewDeleteEvent(link.ID)
if err := t.eventService.PublishEvent(LinkEventTopic, pubEvent); err != nil {
if retryErr := t.eventService.RetryPublish(LinkEventTopic, pubEvent); retryErr != nil {
var retryErr error
go func() {
retryErr = t.eventService.RetryPublish(LinkEventTopic, pubEvent)
}()
if retryErr != nil {
log.Error(retryErr)
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment