TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-07-31 16:23:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

only serve debug monitor if asked for

Browse Source
This commit is contained in:
Fran Bull 2025-02-26 09:04:51 -08:00
parent e13b8c271b
commit 3a35ac716d
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tsconsensus/tsconsensus.go
View File

@ -151,7 +151,7 @@ func (sl StreamLayer) Accept() (net.Conn, error) {
// with other nodes on the tailnet tagged with the clusterTag. The *tsnet.Server will run the state
// machine defined by the raft.FSM also provided, and keep it in sync with the other cluster members'
// state machines using Raft.
func Start(ctx context.Context, ts *tsnet.Server, fsm raft.FSM, clusterTag string, cfg Config) (*Consensus, error) {
func Start(ctx context.Context, ts *tsnet.Server, fsm raft.FSM, clusterTag string, cfg Config, serveDebugMonitor bool) (*Consensus, error) {
if clusterTag == "" {
return nil, errors.New("cluster tag must be provided")
}
@ -200,11 +200,13 @@ func Start(ctx context.Context, ts *tsnet.Server, fsm raft.FSM, clusterTag strin
c.bootstrap(auth.allowedPeers())
srv, err = serveMonitor(&c, ts, addr(c.self.host, cfg.MonitorPort))
if err != nil {
return nil, err
if serveDebugMonitor {
srv, err = serveMonitor(&c, ts, addr(c.self.host, cfg.MonitorPort))
if err != nil {
return nil, err
}
c.monitorHttpServer = srv
}
c.monitorHttpServer = srv
return &c, nil
}
@ -328,9 +330,11 @@ func (c *Consensus) Stop(ctx context.Context) error {
if err != nil {
log.Printf("Stop: Error in command HTTP Shutdown: %v", err)
}
err = c.monitorHttpServer.Shutdown(ctx)
if err != nil {
log.Printf("Stop: Error in monitor HTTP Shutdown: %v", err)
if c.monitorHttpServer != nil {
err = c.monitorHttpServer.Shutdown(ctx)
if err != nil {
log.Printf("Stop: Error in monitor HTTP Shutdown: %v", err)
}
}
return nil
}

24
tsconsensus/tsconsensus_test.go
View File

@ -221,7 +221,7 @@ func TestStart(t *testing.T) {
waitForNodesToBeTaggedInStatus(t, ctx, one, []key.NodePublic{k}, clusterTag)
sm := &fsm{}
r, err := Start(ctx, one, (*fsm)(sm), clusterTag, warnLogConfig())
r, err := Start(ctx, one, (*fsm)(sm), clusterTag, warnLogConfig(), false)
if err != nil {
t.Fatal(err)
}
@ -286,12 +286,12 @@ func startNodesAndWaitForPeerStatus(t *testing.T, ctx context.Context, clusterTa
// populates participants with their consensus fields, waits for all nodes to show all nodes
// as part of the same consensus cluster. Starts the first participant first and waits for it to
// become leader before adding other nodes.
func createConsensusCluster(t *testing.T, ctx context.Context, clusterTag string, participants []*participant, cfg Config) {
func createConsensusCluster(t *testing.T, ctx context.Context, clusterTag string, participants []*participant, cfg Config, serveDebugMonitor bool) {
participants[0].sm = &fsm{}
rand.Seed(uint64(time.Now().UnixNano()))
randomNumber := rand.Intn(8999) + 1000
myCfg := addIDedLogger(fmt.Sprintf("0(%d)", randomNumber), cfg)
first, err := Start(ctx, participants[0].ts, (*fsm)(participants[0].sm), clusterTag, myCfg)
first, err := Start(ctx, participants[0].ts, (*fsm)(participants[0].sm), clusterTag, myCfg, serveDebugMonitor)
if err != nil {
t.Fatal(err)
}
@ -305,7 +305,7 @@ func createConsensusCluster(t *testing.T, ctx context.Context, clusterTag string
participants[i].sm = &fsm{}
randomNumber := rand.Intn(8999) + 1000
myCfg := addIDedLogger(fmt.Sprintf("%d(%d)", i, randomNumber), cfg)
c, err := Start(ctx, participants[i].ts, (*fsm)(participants[i].sm), clusterTag, myCfg)
c, err := Start(ctx, participants[i].ts, (*fsm)(participants[i].sm), clusterTag, myCfg, false)
if err != nil {
t.Fatal(err)
}
@ -335,7 +335,7 @@ func TestApply(t *testing.T) {
clusterTag := "tag:whatever"
ps, _, _ := startNodesAndWaitForPeerStatus(t, ctx, clusterTag, 2)
cfg := warnLogConfig()
createConsensusCluster(t, ctx, clusterTag, ps, cfg)
createConsensusCluster(t, ctx, clusterTag, ps, cfg, false)
for _, p := range ps {
defer p.c.Stop(ctx)
}
@ -393,7 +393,7 @@ func TestConfig(t *testing.T) {
cfg.RaftPort = 11882
mp := uint16(8798)
cfg.MonitorPort = mp
createConsensusCluster(t, ctx, clusterTag, ps, cfg)
createConsensusCluster(t, ctx, clusterTag, ps, cfg, true)
for _, p := range ps {
defer p.c.Stop(ctx)
}
@ -427,7 +427,7 @@ func TestFollowerFailover(t *testing.T) {
clusterTag := "tag:whatever"
ps, _, _ := startNodesAndWaitForPeerStatus(t, ctx, clusterTag, 3)
cfg := warnLogConfig()
createConsensusCluster(t, ctx, clusterTag, ps, cfg)
createConsensusCluster(t, ctx, clusterTag, ps, cfg, false)
for _, p := range ps {
defer p.c.Stop(ctx)
}
@ -472,7 +472,7 @@ func TestFollowerFailover(t *testing.T) {
// follower comes back
smThreeAgain := &fsm{}
cfg = addIDedLogger("2 after restarting", warnLogConfig())
rThreeAgain, err := Start(ctx, ps[2].ts, (*fsm)(smThreeAgain), clusterTag, cfg)
rThreeAgain, err := Start(ctx, ps[2].ts, (*fsm)(smThreeAgain), clusterTag, cfg, false)
if err != nil {
t.Fatal(err)
}
@ -493,7 +493,7 @@ func TestRejoin(t *testing.T) {
clusterTag := "tag:whatever"
ps, control, controlURL := startNodesAndWaitForPeerStatus(t, ctx, clusterTag, 3)
cfg := warnLogConfig()
createConsensusCluster(t, ctx, clusterTag, ps, cfg)
createConsensusCluster(t, ctx, clusterTag, ps, cfg, false)
for _, p := range ps {
defer p.c.Stop(ctx)
}
@ -508,7 +508,7 @@ func TestRejoin(t *testing.T) {
tagNodes(t, control, []key.NodePublic{keyJoiner}, clusterTag)
waitForNodesToBeTaggedInStatus(t, ctx, ps[0].ts, []key.NodePublic{keyJoiner}, clusterTag)
smJoiner := &fsm{}
cJoiner, err := Start(ctx, tsJoiner, (*fsm)(smJoiner), clusterTag, cfg)
cJoiner, err := Start(ctx, tsJoiner, (*fsm)(smJoiner), clusterTag, cfg, false)
if err != nil {
t.Fatal(err)
}
@ -529,7 +529,7 @@ func TestOnlyTaggedPeersCanDialRaftPort(t *testing.T) {
clusterTag := "tag:whatever"
ps, control, controlURL := startNodesAndWaitForPeerStatus(t, ctx, clusterTag, 3)
cfg := warnLogConfig()
createConsensusCluster(t, ctx, clusterTag, ps, cfg)
createConsensusCluster(t, ctx, clusterTag, ps, cfg, false)
for _, p := range ps {
defer p.c.Stop(ctx)
}
@ -659,7 +659,7 @@ func TestOnlyTaggedPeersCanJoin(t *testing.T) {
clusterTag := "tag:whatever"
ps, _, controlURL := startNodesAndWaitForPeerStatus(t, ctx, clusterTag, 3)
cfg := warnLogConfig()
createConsensusCluster(t, ctx, clusterTag, ps, cfg)
createConsensusCluster(t, ctx, clusterTag, ps, cfg, false)
for _, p := range ps {
defer p.c.Stop(ctx)
}