Skip to content

types: add option to disable taildrop, improve tests #2955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
kradalby merged 2 commits into from
Dec 12, 2025
Merged

types: add option to disable taildrop, improve tests #2955

kradalby merged 2 commits into from
Dec 12, 2025
+356 −85

Conversation

@kradalby
Copy link
Collaborator

@kradalby kradalby commented Dec 11, 2025

types: add option to disable taildrop

Update TestTaildrop to validate that #2462 is fixed
through #2885 and #2931.

Fixes #2462

@kradalby kradalby requested a review from juanfont as a code owner December 11, 2025 17:04
@kradalby kradalby force-pushed the kradalby/taildrop-tagged branch from 1c1b94d to c6ec3d1 Compare December 11, 2025 17:13
nblock
nblock approved these changes Dec 11, 2025
View reviewed changes
Copy link
Collaborator

@nblock nblock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add a section to the bottom of the configuration file to document that taildrop can now be enabled/disabled as desired? This would fix #2463.

It'd be great if you could add a changelog entry.

@nblock
Copy link
Collaborator

nblock commented Dec 11, 2025

There's some panic in the tests

{"level":"debug","caller":"/home/runner/work/headscale/headscale/hscontrol/mapper/batcher_lockfree.go:573","node.id":6,"chan":"0xc0003268c0","conn.id":"3302d23c766dbd14","connection_index":0,"time":"2025-12-11T17:25:50Z","message":"send: attempting to send to connection"}
panic: send on closed channel

goroutine 2830 [running]:
github.com/juanfont/headscale/hscontrol/mapper.(*connectionEntry).send(0xc0003d0000, 0x1430a82?)
	/home/runner/work/headscale/headscale/hscontrol/mapper/batcher_lockfree.go:626 +0x85
github.com/juanfont/headscale/hscontrol/mapper.(*multiChannelNodeConn).send(0xc0002b03c0, 0xc0004331e0)
	/home/runner/work/headscale/headscale/hscontrol/mapper/batcher_lockfree.go:577 +0x37b
github.com/juanfont/headscale/hscontrol/mapper.handleNodeChange({0x15ee920, 0xc0002b03c0}, 0xc000485a80, {0x16, 0x0, 0x5, 0x0, 0x0, 0x0})
	/home/runner/work/headscale/headscale/hscontrol/mapper/batcher.go:228 +0x193
github.com/juanfont/headscale/hscontrol/mapper.(*multiChannelNodeConn).change(...)
	/home/runner/work/headscale/headscale/hscontrol/mapper/batcher_lockfree.go:658
github.com/juanfont/headscale/hscontrol/mapper.(*LockFreeBatcher).worker(0xc0002b4fc0, 0x1)
	/home/runner/work/headscale/headscale/hscontrol/mapper/batcher_lockfree.go:251 +0x4e5
created by github.com/juanfont/headscale/hscontrol/mapper.(*LockFreeBatcher).doWork in goroutine 2990
	/home/runner/work/headscale/headscale/hscontrol/mapper/batcher_lockfree.go:174 +0x58

@kradalby
types: add option to disable taildrop
224487b 
Fixes juanfont#2463

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
@kradalby
integration: validate taildrop with tags and multi user
8b93e86 
Update TestTaildrop to validate that juanfont#2462 is fixed
through juanfont#2885 and juanfont#2931.

Fixes juanfont#2462

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
@kradalby kradalby force-pushed the kradalby/taildrop-tagged branch from c6ec3d1 to 8b93e86 Compare December 11, 2025 22:26
@kradalby
Copy link
Collaborator Author

kradalby commented Dec 12, 2025

There's some panic in the tests

I'll aim to fix that in a followup.

@kradalby kradalby merged commit 642073f into juanfont:main Dec 12, 2025
123 of 127 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nblock nblock nblock approved these changes

@juanfont juanfont Awaiting requested review from juanfont juanfont is a code owner

@ohdearaugustin ohdearaugustin Awaiting requested review from ohdearaugustin ohdearaugustin is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[Bug] Taildrop between un-tagged and tagged nodes works

2 participants

@kradalby @nblock