Implement some sort of rate limiting
Some checks failed
Run Tests / Test (push) Failing after 17s
Benchmark BufferPool / RunBenchmarks (push) Failing after 28s

This commit is contained in:
2024-08-02 11:13:40 +02:00
parent e8b9eb934b
commit 0315a0877b
4 changed files with 69 additions and 23 deletions

View File

@@ -1,18 +1,33 @@
package client
import (
"context"
"fmt"
"log"
"net"
"smpptester/pdu"
"smpptester/utils"
"time"
"golang.org/x/time/rate"
)
const RETRY_TIMEOUT = 1 * time.Second
var (
SMPP_CLIENT_RETRY_TIMEOUT = 1 * time.Second
SMPP_CLIENT_SEND_QUEUE_SIZE = 1024 * 8
SMPP_CLIENT_RECEIVE_QUEUE_SIZE = 1024 * 8
SMPP_CLIENT_ASYNC_SEND_WORKERS = 16
SMPP_CLIENT_SEND_LIMIT = 4
)
type SMPPClient struct {
Id int
Connected bool
SendQueue chan pdu.PDU
ReceiveQueue chan pdu.PDU
SendLimit *utils.ReactiveValue[int]
sendLimiter *rate.Limiter
enabled bool
running bool
conn net.Conn
@@ -24,12 +39,29 @@ type SMPPClient struct {
func NewSMPPClient(port string, id int) *SMPPClient {
client := &SMPPClient{
Id: id,
SendQueue: make(chan pdu.PDU, SMPP_CLIENT_SEND_QUEUE_SIZE),
ReceiveQueue: make(chan pdu.PDU, SMPP_CLIENT_RECEIVE_QUEUE_SIZE),
SendLimit: utils.NewReactiveValue[int](SMPP_CLIENT_SEND_LIMIT),
sendLimiter: rate.NewLimiter(rate.Limit(SMPP_CLIENT_SEND_LIMIT), SMPP_CLIENT_SEND_LIMIT),
port: port,
log: log.Logger{},
dcErr: make(chan error, 128),
}
client.log = *log.New(log.Writer(), "", log.LstdFlags)
client.log = *log.New(log.Writer(), "", log.LstdFlags|log.Lshortfile)
client.log.SetPrefix(fmt.Sprintf("SMPP client %d: ", client.Id))
go func() {
limit := client.SendLimit.Subscribe()
defer client.SendLimit.Unsubscribe(limit)
for {
v := <-limit
client.log.Printf("Send limit changed to %d", *v)
client.sendLimiter.SetLimit(rate.Limit(*v))
client.sendLimiter.SetBurst(*v)
}
}()
return client
}
@@ -78,8 +110,8 @@ func (c *SMPPClient) start() {
err := <-c.dcErr
c.Connected = false
if c.enabled {
c.log.Printf("Disconnected: '%v' trying again in %d second(s)", err, int(RETRY_TIMEOUT.Seconds()))
time.Sleep(RETRY_TIMEOUT)
c.log.Printf("Disconnected: '%v' trying again in %d second(s)", err, int(SMPP_CLIENT_RETRY_TIMEOUT.Seconds()))
time.Sleep(SMPP_CLIENT_RETRY_TIMEOUT)
} else {
c.log.Printf("Disconnected: '%v' & client is disabled, quitting", err)
break
@@ -117,12 +149,17 @@ func (c *SMPPClient) Send(pdata pdu.PDU) error {
return fmt.Errorf("failed to encode PDU: %w", err)
}
err = c.sendLimiter.Wait(context.Background())
if err != nil {
return fmt.Errorf("failed to wait for rate limiter: %w", err)
}
_, err = c.conn.Write(buf.Bytes())
if err != nil {
c.dcErr <- err
return fmt.Errorf("failed to send PDU: %w", err)
}
c.log.Printf("SMPP client %d sent PDU: %+v", c.Id, pdata)
// c.log.Printf("SMPP client %d sent PDU: %+v", c.Id, pdata)
return nil
}

5
go.mod
View File

@@ -2,4 +2,7 @@ module smpptester
go 1.22.4
require github.com/yuin/gopher-lua v1.1.1
require (
github.com/yuin/gopher-lua v1.1.1
golang.org/x/time v0.5.0
)

2
go.sum
View File

@@ -1,2 +1,4 @@
github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=

14
main.go
View File

@@ -175,12 +175,16 @@ func main() {
client.Enable()
for {
if client.Connected {
err := client.Send(submit)
if err != nil {
log.Printf("Failed to send PDU: %v", err)
// err := client.Send(submit)
// if err != nil {
// log.Printf("Failed to send PDU: %v", err)
// }
go client.Send(submit)
// if rand.Int() % 1000 == 0 {
// client.SendLimit.Set(rand.Int() % 1000)
// }
}
}
time.Sleep(10 * time.Millisecond)
time.Sleep(500 * time.Millisecond)
}
log.Println("Are we done")