starred/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-03-24 10:21:33 +01:00
Code Issues 98 Packages Projects Releases 10 Wiki Activity

mapper/batcher: clean up test constants and output

Browse Source 
L8: Rename SCREAMING_SNAKE_CASE test constants to idiomatic Go
camelCase. Remove highLoad* and extremeLoad* constants that were
only referenced by disabled (X-prefixed) tests.

L10: Fix misleading assert message that said "1337" while checking
for region ID 999.

L12: Remove emoji from test log output to avoid encoding issues
in CI environments.

Updates #2545
This commit is contained in:
Kristoffer Dalby
2026-03-13 16:07:35 +00:00
parent 86e279869e
commit feaf85bfbc
3 changed files with 36 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hscontrol/mapper/batcher_bench_test.go
View File

@@ -624,7 +624,7 @@ func BenchmarkAddNode(b *testing.B) {
for _, nodeCount := range []int{10, 100} { for _, nodeCount := range []int{10, 100} {
b.Run(fmt.Sprintf("%dnodes", nodeCount), func(b *testing.B) { b.Run(fmt.Sprintf("%dnodes", nodeCount), func(b *testing.B) {
testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, LARGE_BUFFER_SIZE) testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, largeBufferSize)
defer cleanup() defer cleanup()
batcher := testData.Batcher batcher := testData.Batcher
@@ -687,7 +687,7 @@ func BenchmarkFullPipeline(b *testing.B) {
for _, nodeCount := range []int{10, 100} { for _, nodeCount := range []int{10, 100} {
b.Run(fmt.Sprintf("%dnodes", nodeCount), func(b *testing.B) { b.Run(fmt.Sprintf("%dnodes", nodeCount), func(b *testing.B) {
testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, LARGE_BUFFER_SIZE) testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, largeBufferSize)
defer cleanup() defer cleanup()
batcher := testData.Batcher batcher := testData.Batcher
@@ -742,7 +742,7 @@ func BenchmarkMapResponseFromChange(b *testing.B) {
for _, nodeCount := range []int{10, 100} { for _, nodeCount := range []int{10, 100} {
b.Run(fmt.Sprintf("%dnodes", nodeCount), func(b *testing.B) { b.Run(fmt.Sprintf("%dnodes", nodeCount), func(b *testing.B) {
testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, LARGE_BUFFER_SIZE) testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, largeBufferSize)
defer cleanup() defer cleanup()
batcher := testData.Batcher batcher := testData.Batcher

8
hscontrol/mapper/batcher_scale_bench_test.go
View File

@@ -724,7 +724,7 @@ func BenchmarkScale_AddAllNodes(b *testing.B) {
for _, nodeCount := range []int{10, 50, 100, 200, 500} { for _, nodeCount := range []int{10, 50, 100, 200, 500} {
b.Run(strconv.Itoa(nodeCount), func(b *testing.B) { b.Run(strconv.Itoa(nodeCount), func(b *testing.B) {
testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, LARGE_BUFFER_SIZE) testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, largeBufferSize)
defer cleanup() defer cleanup()
batcher := testData.Batcher batcher := testData.Batcher
@@ -787,7 +787,7 @@ func BenchmarkScale_SingleAddNode(b *testing.B) {
for _, nodeCount := range []int{10, 50, 100, 200, 500, 1000} { for _, nodeCount := range []int{10, 50, 100, 200, 500, 1000} {
b.Run(strconv.Itoa(nodeCount), func(b *testing.B) { b.Run(strconv.Itoa(nodeCount), func(b *testing.B) {
testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, LARGE_BUFFER_SIZE) testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, largeBufferSize)
defer cleanup() defer cleanup()
batcher := testData.Batcher batcher := testData.Batcher
@@ -853,7 +853,7 @@ func BenchmarkScale_MapResponse_DERPMap(b *testing.B) {
for _, nodeCount := range []int{10, 50, 100, 200, 500} { for _, nodeCount := range []int{10, 50, 100, 200, 500} {
b.Run(strconv.Itoa(nodeCount), func(b *testing.B) { b.Run(strconv.Itoa(nodeCount), func(b *testing.B) {
testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, LARGE_BUFFER_SIZE) testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, largeBufferSize)
defer cleanup() defer cleanup()
batcher := testData.Batcher batcher := testData.Batcher
@@ -905,7 +905,7 @@ func BenchmarkScale_MapResponse_FullUpdate(b *testing.B) {
for _, nodeCount := range []int{10, 50, 100, 200, 500} { for _, nodeCount := range []int{10, 50, 100, 200, 500} {
b.Run(strconv.Itoa(nodeCount), func(b *testing.B) { b.Run(strconv.Itoa(nodeCount), func(b *testing.B) {
testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, LARGE_BUFFER_SIZE) testData, cleanup := setupBatcherWithTestData(b, NewBatcherAndMapper, 1, nodeCount, largeBufferSize)
defer cleanup() defer cleanup()
batcher := testData.Batcher batcher := testData.Batcher

68
hscontrol/mapper/batcher_test.go
View File

@@ -104,29 +104,19 @@ func emptyCache() *zcache.Cache[types.AuthID, types.AuthRequest] {
// Test configuration constants. // Test configuration constants.
const ( const (
// Test data configuration. // Test data configuration.
TEST_USER_COUNT = 3 testUserCount = 3
TEST_NODES_PER_USER = 2 testNodesPerUser = 2
// Load testing configuration.
HIGH_LOAD_NODES = 25 // Increased from 9
HIGH_LOAD_CYCLES = 100 // Increased from 20
HIGH_LOAD_UPDATES = 50 // Increased from 20
// Extreme load testing configuration.
EXTREME_LOAD_NODES = 50
EXTREME_LOAD_CYCLES = 200
EXTREME_LOAD_UPDATES = 100
// Timing configuration. // Timing configuration.
TEST_TIMEOUT = 120 * time.Second // Increased for more intensive tests testTimeout = 120 * time.Second // Increased for more intensive tests
UPDATE_TIMEOUT = 5 * time.Second updateTimeout = 5 * time.Second
DEADLOCK_TIMEOUT = 30 * time.Second deadlockTimeout = 30 * time.Second
// Channel configuration. // Channel configuration.
NORMAL_BUFFER_SIZE = 50 normalBufferSize = 50
SMALL_BUFFER_SIZE = 3 smallBufferSize = 3
TINY_BUFFER_SIZE = 1 // For maximum contention tinyBufferSize = 1 // For maximum contention
LARGE_BUFFER_SIZE = 200 largeBufferSize = 200
) )
// TestData contains all test entities created for a test scenario. // TestData contains all test entities created for a test scenario.
@@ -355,7 +345,7 @@ func assertDERPMapResponse(t *testing.T, resp *tailcfg.MapResponse) {
assert.NotNil(t, resp.DERPMap, "DERPMap should not be nil in response") assert.NotNil(t, resp.DERPMap, "DERPMap should not be nil in response")
assert.Len(t, resp.DERPMap.Regions, 1, "Expected exactly one DERP region in response") assert.Len(t, resp.DERPMap.Regions, 1, "Expected exactly one DERP region in response")
assert.Equal(t, 999, resp.DERPMap.Regions[999].RegionID, "Expected DERP region ID to be 1337") assert.Equal(t, 999, resp.DERPMap.Regions[999].RegionID, "Expected DERP region ID to be 999")
} }
func assertOnlineMapResponse(t *testing.T, resp *tailcfg.MapResponse, expected bool) { func assertOnlineMapResponse(t *testing.T, resp *tailcfg.MapResponse, expected bool) {
@@ -690,7 +680,7 @@ func TestBatcherScalabilityAllToAll(t *testing.T) {
assert.Equal(c, len(allNodes), connectedCount, "all nodes should achieve full connectivity") assert.Equal(c, len(allNodes), connectedCount, "all nodes should achieve full connectivity")
}, 5*time.Minute, 5*time.Second, "waiting for full connectivity") }, 5*time.Minute, 5*time.Second, "waiting for full connectivity")
t.Logf("✅ All nodes achieved full connectivity!") t.Logf("All nodes achieved full connectivity")
totalTime := time.Since(startTime) totalTime := time.Since(startTime)
@@ -778,13 +768,13 @@ func TestBatcherScalabilityAllToAll(t *testing.T) {
// this should always pass, but we verify the final state for completeness // this should always pass, but we verify the final state for completeness
if successfulNodes == len(allNodes) { if successfulNodes == len(allNodes) {
t.Logf( t.Logf(
"✅ PASS: All-to-all connectivity achieved for %d nodes", "PASS: All-to-all connectivity achieved for %d nodes",
len(allNodes), len(allNodes),
) )
} else { } else {
// This should not happen since we loop until success, but handle it just in case // This should not happen since we loop until success, but handle it just in case
failedNodes := len(allNodes) - successfulNodes failedNodes := len(allNodes) - successfulNodes
t.Errorf("❌ UNEXPECTED: %d/%d nodes still failed after waiting for connectivity (expected %d, some saw %d-%d)", t.Errorf("UNEXPECTED: %d/%d nodes still failed after waiting for connectivity (expected %d, some saw %d-%d)",
failedNodes, len(allNodes), expectedPeers, minPeersSeen, maxPeersGlobal) failedNodes, len(allNodes), expectedPeers, minPeersSeen, maxPeersGlobal)
// Show details of failed nodes for debugging // Show details of failed nodes for debugging
@@ -1362,8 +1352,8 @@ func TestBatcherConcurrentClients(t *testing.T) {
testData, cleanup := setupBatcherWithTestData( testData, cleanup := setupBatcherWithTestData(
t, t,
batcherFunc.fn, batcherFunc.fn,
TEST_USER_COUNT, testUserCount,
TEST_NODES_PER_USER, testNodesPerUser,
8, 8,
) )
defer cleanup() defer cleanup()
@@ -1380,7 +1370,7 @@ func TestBatcherConcurrentClients(t *testing.T) {
for i := range stableNodes { for i := range stableNodes {
node := &stableNodes[i] node := &stableNodes[i]
ch := make(chan *tailcfg.MapResponse, NORMAL_BUFFER_SIZE) ch := make(chan *tailcfg.MapResponse, normalBufferSize)
stableChannels[node.n.ID] = ch stableChannels[node.n.ID] = ch
_ = batcher.AddNode(node.n.ID, ch, tailcfg.CapabilityVersion(100), nil) _ = batcher.AddNode(node.n.ID, ch, tailcfg.CapabilityVersion(100), nil)
@@ -1402,7 +1392,7 @@ func TestBatcherConcurrentClients(t *testing.T) {
} else { } else {
t.Errorf("Invalid update received for stable node %d: %s", nodeID, reason) t.Errorf("Invalid update received for stable node %d: %s", nodeID, reason)
} }
case <-time.After(TEST_TIMEOUT): case <-time.After(testTimeout):
return return
} }
} }
@@ -1450,7 +1440,7 @@ func TestBatcherConcurrentClients(t *testing.T) {
wg.Done() wg.Done()
}() }()
ch := make(chan *tailcfg.MapResponse, SMALL_BUFFER_SIZE) ch := make(chan *tailcfg.MapResponse, smallBufferSize)
churningChannelsMutex.Lock() churningChannelsMutex.Lock()
@@ -1545,7 +1535,7 @@ func TestBatcherConcurrentClients(t *testing.T) {
select { select {
case <-done: case <-done:
t.Logf("Connection churn cycles completed successfully") t.Logf("Connection churn cycles completed successfully")
case <-time.After(DEADLOCK_TIMEOUT): case <-time.After(deadlockTimeout):
t.Error("Test timed out - possible deadlock detected") t.Error("Test timed out - possible deadlock detected")
return return
} }
@@ -1963,7 +1953,7 @@ func XTestBatcherScalability(t *testing.T) {
select { select {
case <-done: case <-done:
t.Logf("Test completed successfully") t.Logf("Test completed successfully")
case <-time.After(TEST_TIMEOUT): case <-time.After(testTimeout):
deadlockDetected = true deadlockDetected = true
// Collect diagnostic information // Collect diagnostic information
allStats := tracker.getAllStats() allStats := tracker.getAllStats()
@@ -1975,7 +1965,7 @@ func XTestBatcherScalability(t *testing.T) {
interimPanics := atomic.LoadInt64(&panicCount) interimPanics := atomic.LoadInt64(&panicCount)
t.Logf("TIMEOUT DIAGNOSIS: Test timed out after %v", TEST_TIMEOUT) t.Logf("TIMEOUT DIAGNOSIS: Test timed out after %v", testTimeout)
t.Logf( t.Logf(
" Progress at timeout: %d total updates, %d panics", " Progress at timeout: %d total updates, %d panics",
totalUpdates, totalUpdates,
@@ -2129,10 +2119,10 @@ func XTestBatcherScalability(t *testing.T) {
// Clear success/failure indication // Clear success/failure indication
if testPassed { if testPassed {
t.Logf("✅ PASS: %s | %d nodes, %d updates, 0 panics, no deadlock", t.Logf("PASS: %s | %d nodes, %d updates, 0 panics, no deadlock",
tc.name, len(testNodes), totalUpdates) tc.name, len(testNodes), totalUpdates)
} else { } else {
t.Logf("❌ FAIL: %s | %d nodes, %d updates, %d panics, deadlock: %v", t.Logf("FAIL: %s | %d nodes, %d updates, %d panics, deadlock: %v",
tc.name, len(testNodes), totalUpdates, finalPanicCount, deadlockDetected) tc.name, len(testNodes), totalUpdates, finalPanicCount, deadlockDetected)
} }
}) })
@@ -2656,7 +2646,7 @@ func TestNodeDeletedWhileChangesPending(t *testing.T) {
for _, batcherFunc := range allBatcherFunctions { for _, batcherFunc := range allBatcherFunctions {
t.Run(batcherFunc.name, func(t *testing.T) { t.Run(batcherFunc.name, func(t *testing.T) {
// Create test environment with 3 nodes // Create test environment with 3 nodes
testData, cleanup := setupBatcherWithTestData(t, batcherFunc.fn, 1, 3, NORMAL_BUFFER_SIZE) testData, cleanup := setupBatcherWithTestData(t, batcherFunc.fn, 1, 3, normalBufferSize)
defer cleanup() defer cleanup()
batcher := testData.Batcher batcher := testData.Batcher
@@ -2771,13 +2761,13 @@ func TestRemoveNodeChannelAlreadyRemoved(t *testing.T) {
for _, batcherFunc := range allBatcherFunctions { for _, batcherFunc := range allBatcherFunctions {
t.Run(batcherFunc.name, func(t *testing.T) { t.Run(batcherFunc.name, func(t *testing.T) {
t.Run("marks disconnected when removed channel was last active connection", func(t *testing.T) { t.Run("marks disconnected when removed channel was last active connection", func(t *testing.T) {
testData, cleanup := setupBatcherWithTestData(t, batcherFunc.fn, 1, 1, NORMAL_BUFFER_SIZE) testData, cleanup := setupBatcherWithTestData(t, batcherFunc.fn, 1, 1, normalBufferSize)
defer cleanup() defer cleanup()
lfb := unwrapBatcher(testData.Batcher) lfb := unwrapBatcher(testData.Batcher)
nodeID := testData.Nodes[0].n.ID nodeID := testData.Nodes[0].n.ID
ch := make(chan *tailcfg.MapResponse, NORMAL_BUFFER_SIZE) ch := make(chan *tailcfg.MapResponse, normalBufferSize)
require.NoError(t, lfb.AddNode(nodeID, ch, tailcfg.CapabilityVersion(100), nil)) require.NoError(t, lfb.AddNode(nodeID, ch, tailcfg.CapabilityVersion(100), nil))
assert.EventuallyWithT(t, func(c *assert.CollectT) { assert.EventuallyWithT(t, func(c *assert.CollectT) {
@@ -2799,14 +2789,14 @@ func TestRemoveNodeChannelAlreadyRemoved(t *testing.T) {
}) })
t.Run("keeps connected when another connection is still active", func(t *testing.T) { t.Run("keeps connected when another connection is still active", func(t *testing.T) {
testData, cleanup := setupBatcherWithTestData(t, batcherFunc.fn, 1, 1, NORMAL_BUFFER_SIZE) testData, cleanup := setupBatcherWithTestData(t, batcherFunc.fn, 1, 1, normalBufferSize)
defer cleanup() defer cleanup()
lfb := unwrapBatcher(testData.Batcher) lfb := unwrapBatcher(testData.Batcher)
nodeID := testData.Nodes[0].n.ID nodeID := testData.Nodes[0].n.ID
ch1 := make(chan *tailcfg.MapResponse, NORMAL_BUFFER_SIZE) ch1 := make(chan *tailcfg.MapResponse, normalBufferSize)
ch2 := make(chan *tailcfg.MapResponse, NORMAL_BUFFER_SIZE) ch2 := make(chan *tailcfg.MapResponse, normalBufferSize)
require.NoError(t, lfb.AddNode(nodeID, ch1, tailcfg.CapabilityVersion(100), nil)) require.NoError(t, lfb.AddNode(nodeID, ch1, tailcfg.CapabilityVersion(100), nil))
require.NoError(t, lfb.AddNode(nodeID, ch2, tailcfg.CapabilityVersion(100), nil)) require.NoError(t, lfb.AddNode(nodeID, ch2, tailcfg.CapabilityVersion(100), nil))