johanels/akvorado
1
0
Fork 0
mirror of https://github.com/akvorado/akvorado.git synced 2025-12-11 22:14:02 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

inlet/flow: make some of the socket options not fatal

Browse Source 
If the kernel is too old for timestamping, it should not be fatal. I
prefer to not accept SO_TIMESTAMP_OLD as the size of the timestamp is
arch-dependent.

Fix #1978
This commit is contained in:
Vincent Bernat
2025-09-22 18:29:17 +02:00
parent 2c567a806f
commit 5ce0c949f2
6 changed files with 123 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
console/data/docs/99-changelog.md
View File

@@ -10,6 +10,10 @@ identified with a specific icon:
- 🩹: bug fix
- 🌱: miscellaneous change
## Unreleased
- 🩹 *inlet*: disable kernel timestamping on Linux kernel older than 5.1
## 2.0.0 - 2025-09-22
This release introduces a new component: the outlet. Previously, ClickHouse was

3
inlet/flow/input/udp/root.go
View File

@@ -120,7 +120,8 @@ func (in *Input) Start() error {
return fmt.Errorf("unable to resolve %v: %w", in.config.Listen, err)
}
}
pconn, err := listenConfig.ListenPacket(in.t.Context(context.Background()), "udp", listenAddr.String())
pconn, err := listenConfig(in.r, udpSocketOptions).
ListenPacket(in.t.Context(context.Background()), "udp", listenAddr.String())
if err != nil {
return fmt.Errorf("unable to listen to %v: %w", listenAddr, err)
}

37
inlet/flow/input/udp/socket.go
View File

@@ -4,10 +4,13 @@
package udp
import (
"fmt"
"net"
"syscall"
"time"
"akvorado/common/reporter"
"golang.org/x/sys/unix"
)
@@ -16,19 +19,31 @@ type oobMessage struct {
Received time.Time
}
// listenConfig configures a listening socket to reuse port and return overflows
var listenConfig = net.ListenConfig{
Control: func(_, _ string, c syscall.RawConn) error {
var err error
c.Control(func(fd uintptr) {
opts := udpSocketOptions
// socketOption describes a socket option to be applied.
type socketOption struct {
Name string
Level int
Option int
Mandatory bool
}
// listenConfig configures a listening socket with the udpSocketOptions.
var listenConfig = func(r *reporter.Reporter, opts []socketOption) *net.ListenConfig {
return &net.ListenConfig{
Control: func(_, _ string, c syscall.RawConn) error {
var err error
for _, opt := range opts {
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, opt, 1)
c.Control(func(fd uintptr) {
err = unix.SetsockoptInt(int(fd), opt.Level, opt.Option, 1)
})
if err != nil {
return
if opt.Mandatory {
return fmt.Errorf("cannot set option %s: %w", opt.Name, err)
}
r.Warn().Err(err).Msgf("cannot set option %s", opt.Name)
}
}
})
return err
},
return nil
},
}
}

31
inlet/flow/input/udp/socket_linux.go
View File

@@ -15,13 +15,30 @@ import (
var (
oobLength = syscall.CmsgLen(4) + syscall.CmsgLen(16) // uint32 + 2*int64
udpSocketOptions = []int{
// Allow multiple listeners to bind to the same IP/port
unix.SO_REUSEADDR, unix.SO_REUSEPORT,
// Get the number of dropped packets
unix.SO_RXQ_OVFL,
// Ask the kernel to timestamp incoming packets
unix.SO_TIMESTAMP_NEW | unix.SOF_TIMESTAMPING_RX_SOFTWARE,
udpSocketOptions = []socketOption{
{
// Allow multiple listeners to bind to the same IP
Name: "SO_REUSEADDR",
Level: unix.SOL_SOCKET,
Option: unix.SO_REUSEADDR,
Mandatory: true,
}, {
// Allow multiple listeners to bind to the same port
Name: "SO_REUSEPORT",
Level: unix.SOL_SOCKET,
Option: unix.SO_REUSEPORT,
Mandatory: true,
}, {
// Get the number of dropped packets
Name: "SO_RXQ_OVFL",
Level: unix.SOL_SOCKET,
Option: unix.SO_RXQ_OVFL,
}, {
// Ask the kernel to timestamp incoming packets
Name: "SO_TIMESTAMP_NEW",
Level: unix.SOL_SOCKET,
Option: unix.SO_TIMESTAMP_NEW | unix.SOF_TIMESTAMPING_RX_SOFTWARE,
},
}
)

16
inlet/flow/input/udp/socket_others.go
View File

@@ -9,7 +9,21 @@ import "golang.org/x/sys/unix"
var (
oobLength = 0
udpSocketOptions = []int{unix.SO_REUSEADDR, unix.SO_REUSEPORT}
udpSocketOptions = []socketOption{
{
// Allow multiple listeners to bind to the same IP
Name: "SO_REUSEADDR",
Level: unix.SOL_SOCKET,
Option: unix.SO_REUSEADDR,
Mandatory: true,
}, {
// Allow multiple listeners to bind to the same port
Name: "SO_REUSEPORT",
Level: unix.SOL_SOCKET,
Option: unix.SO_REUSEPORT,
Mandatory: true,
},
}
)
// parseSocketControlMessage always returns 0.

53
inlet/flow/input/udp/socket_test.go
View File

@@ -11,13 +11,19 @@ import (
"runtime"
"testing"
"time"
"akvorado/common/reporter"
"golang.org/x/sys/unix"
)
func TestParseSocketControlMessage(t *testing.T) {
if runtime.GOOS != "linux" {
t.Skip("Skip Linux-only test")
}
server, err := listenConfig.ListenPacket(context.Background(), "udp", "127.0.0.1:0")
r := reporter.NewMock(t)
server, err := listenConfig(r, udpSocketOptions).
ListenPacket(context.Background(), "udp", "127.0.0.1:0")
if err != nil {
t.Fatalf("ListenPacket() error:\n%+v", err)
}
@@ -78,3 +84,48 @@ outer:
t.Fatal("too many drops detected")
}
}
func TestListenConfig(t *testing.T) {
r := reporter.NewMock(t)
t.Run("one mandatory option", func(t *testing.T) {
_, err := listenConfig(r, []socketOption{
{
Name: "SO_REUSEADDR",
Level: unix.SOL_SOCKET,
Option: unix.SO_REUSEADDR,
Mandatory: true,
},
}).ListenPacket(t.Context(), "udp", "127.0.0.1:0")
if err != nil {
t.Fatalf("ListenPacket() error:\n%+v", err)
}
})
t.Run("one mandatory not implemented option", func(t *testing.T) {
_, err := listenConfig(r, []socketOption{
{
Name: "SO_UNKNOWN",
Level: unix.SOL_SOCKET,
Option: 9999,
Mandatory: true,
},
}).ListenPacket(t.Context(), "udp", "127.0.0.1:0")
if err == nil {
t.Fatal("ListenPacket() did not error error")
}
})
t.Run("one optional not implemented option", func(t *testing.T) {
_, err := listenConfig(r, []socketOption{
{
Name: "SO_UNKNOWN",
Level: unix.SOL_SOCKET,
Option: 9999,
},
}).ListenPacket(t.Context(), "udp", "127.0.0.1:0")
if err != nil {
t.Fatalf("ListenPacket() error:\n%+v", err)
}
})
}