Recover VPN fabric lease expiry

2026-05-15 18:52:37 +03:00
parent 52dfce316d
commit be25ff5725
5 changed files with 115 additions and 5 deletions
@@ -350,8 +350,13 @@ func (g *Gateway) uploadGatewayPackets(ctx context.Context, priorityPackets <-ch
 		return true
 	}
 	flushPriority := func(packet []byte) {
-		flush()
+		pendingBatch := batch
+		pendingBatchBytes := batchBytes
+		batch = make([][]byte, 0, vpnGatewayBatchMaxPackets)
+		batchBytes = 0
 		if !addPacket(packet) {
+			batch = pendingBatch
+			batchBytes = pendingBatchBytes
 			return
 		}
 		deadline := time.Now().Add(vpnGatewayPriorityBatchWait)
@@ -379,6 +384,14 @@ func (g *Gateway) uploadGatewayPackets(ctx context.Context, priorityPackets <-ch
 			}
 		}
 		flush()
+		if len(pendingBatch) > 0 {
+			batch = pendingBatch
+			batchBytes = pendingBatchBytes
+			if !timerActive {
+				timer.Reset(vpnGatewayBatchFlushTimeout)
+				timerActive = true
+			}
+		}
 	}
 	for {
 		if len(batch) == 0 && timerActive {