fix: stopping service with API issue

celestiaorg · Nov 30, 2023 · 46e3d67 · 46e3d67
1 parent f71de74
commit 46e3d67
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/xdp/bandwidth/bandwidth.go b/xdp/bandwidth/bandwidth.go
@@ -44,7 +44,8 @@ func (b *Bandwidth) Start(ctx context.Context, logger *zap.Logger) {
 	<-ctx.Done()
 
 	// Update the map with a rate of 0 to disable the bandwidth limiter.
-	err = x.BpfObjs.BandwidthLimitMap.Update(key, 0, ebpf.UpdateAny)
+	zero := int64(0)
+	err = x.BpfObjs.BandwidthLimitMap.Update(key, zero, ebpf.UpdateAny)
 	if err != nil {
 		logger.Error(fmt.Sprintf("could not update bandwidth limit rate to zero: %v", err))
 		return

diff --git a/xdp/packetloss/packetloss.go b/xdp/packetloss/packetloss.go
@@ -44,7 +44,8 @@ func (p *PacketLoss) Start(ctx context.Context, logger *zap.Logger) {
 	<-ctx.Done()
 
 	// Update the map with a rate of 0 to disable the packetloss.
-	err = x.BpfObjs.PacketlossRateMap.Update(key, 0, ebpf.UpdateAny)
+	zero := int32(0)
+	err = x.BpfObjs.PacketlossRateMap.Update(key, zero, ebpf.UpdateAny)
 	if err != nil {
 		logger.Error(fmt.Sprintf("could not update packetloss drop rate to zero: %v", err))
 		return

diff --git a/xdp/types.go b/xdp/types.go
@@ -17,10 +17,11 @@ type XdpLoader interface {
 }
 
 type XdpObject struct {
-	BpfObjs       bpfObjects
-	Link          link.Link
-	totalServices int32
-	mu            sync.Mutex
+	BpfObjs           bpfObjects
+	Link              link.Link
+	totalServices     int32
+	mu                sync.Mutex
+	netInterfaceIndex int
 }
 
 var xdpObject XdpObject
@@ -33,9 +34,11 @@ func GetPreparedXdpObject(netInterfaceIndex int) (*XdpObject, error) {
 	// We add this once, so we know how many services are using this object.
 	xdpObject.totalServices++
 
-	if xdpObject.Link != nil {
+	if xdpObject.Link != nil && xdpObject.netInterfaceIndex == netInterfaceIndex {
 		return &xdpObject, nil
 	}
+	xdpObject.netInterfaceIndex = netInterfaceIndex
+
 	// Load pre-compiled programs into the kernel.
 	err := loadBpfObjects(&xdpObject.BpfObjs, nil)
 	if err != nil {