tstest/integration/nat: stream daemon logs directly

Updates #13038

Signed-off-by: Maisem Ali <maisem@tailscale.com>
Change-Id: I5da5706149c082c27d74c8b894bf53dd9b259e84
dependabot/go_modules/github.com/docker/docker-26.1.5incompatible
Maisem Ali 3 months ago committed by Maisem Ali
parent 17a10f702f
commit f8d23b3582

@ -11,10 +11,8 @@
package main package main
import ( import (
"bufio"
"errors" "errors"
"flag" "flag"
"fmt"
"io" "io"
"log" "log"
"net" "net"
@ -134,38 +132,8 @@ func main() {
return return
}) })
mux.HandleFunc("/up", func(w http.ResponseWriter, r *http.Request) { mux.HandleFunc("/up", func(w http.ResponseWriter, r *http.Request) {
cmd := exec.Command(absify("tailscale"), "debug", "daemon-logs")
out, err := cmd.StdoutPipe()
if err != nil {
http.Error(w, err.Error(), 500)
return
}
defer out.Close()
cmd.Start()
defer cmd.Process.Kill()
go func() {
bs := bufio.NewScanner(out)
for bs.Scan() {
log.Printf("Daemon: %s", bs.Text())
}
}()
serveCmd(w, "tailscale", "up", "--login-server=http://control.tailscale") serveCmd(w, "tailscale", "up", "--login-server=http://control.tailscale")
}) })
mux.HandleFunc("/status", func(w http.ResponseWriter, r *http.Request) {
serveCmd(w, "tailscale", "status", "--json")
})
mux.HandleFunc("/ping", func(w http.ResponseWriter, r *http.Request) {
target := r.FormValue("target")
cmd := exec.Command(absify("tailscale"), "ping", target)
w.Header().Set("Content-Type", "text/plain; charset=utf-8")
w.(http.Flusher).Flush()
cmd.Stdout = w
cmd.Stderr = w
if err := cmd.Run(); err != nil {
fmt.Fprintf(w, "error: %v\n", err)
}
})
go hs.Serve(chanListener(conns)) go hs.Serve(chanListener(conns))
var lastErr string var lastErr string

@ -5,9 +5,11 @@ package nat
import ( import (
"context" "context"
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"io" "io"
"log"
"net" "net"
"net/http" "net/http"
"net/netip" "net/netip"
@ -196,6 +198,11 @@ func (nt *natTest) runTest(node1, node2 addNodeFunc) {
for i, c := range clients { for i, c := range clients {
i, c := i, c i, c := i, c
eg.Go(func() error { eg.Go(func() error {
wg.Add(1)
go func() {
defer wg.Done()
streamDaemonLogs(ctx, t, c, fmt.Sprintf("node%d:", i))
}()
st, err := c.Status(ctx) st, err := c.Status(ctx)
if err != nil { if err != nil {
return fmt.Errorf("node%d status: %w", i, err) return fmt.Errorf("node%d status: %w", i, err)
@ -226,6 +233,35 @@ func (nt *natTest) runTest(node1, node2 addNodeFunc) {
t.Logf("ping route: %v, %v", logger.AsJSON(route), err) t.Logf("ping route: %v, %v", logger.AsJSON(route), err)
} }
func streamDaemonLogs(ctx context.Context, t testing.TB, c *vnet.NodeAgentClient, nodeID string) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
r, err := c.TailDaemonLogs(ctx)
if err != nil {
t.Errorf("tailDaemonLogs: %v", err)
return
}
logger := log.New(os.Stderr, nodeID+" ", log.Lmsgprefix)
dec := json.NewDecoder(r)
for {
// /{"logtail":{"client_time":"2024-08-08T17:42:31.95095956Z","proc_id":2024742977,"proc_seq":232},"text":"magicsock: derp-1 connected; connGen=1\n"}
var logEntry struct {
LogTail struct {
ClientTime time.Time `json:"client_time"`
}
Text string `json:"text"`
}
if err := dec.Decode(&logEntry); err != nil {
if err == io.EOF {
return
}
t.Errorf("log entry: %v", err)
return
}
logger.Printf("%s %s", logEntry.LogTail.ClientTime.Format("2006/01/02 15:04:05"), logEntry.Text)
}
}
func ping(ctx context.Context, c *vnet.NodeAgentClient, target netip.Addr) (*ipnstate.PingResult, error) { func ping(ctx context.Context, c *vnet.NodeAgentClient, target netip.Addr) (*ipnstate.PingResult, error) {
n := 0 n := 0
var res *ipnstate.PingResult var res *ipnstate.PingResult
@ -245,11 +281,11 @@ func ping(ctx context.Context, c *vnet.NodeAgentClient, target netip.Addr) (*ipn
if pr.DERPRegionID == 0 { if pr.DERPRegionID == 0 {
return pr, nil return pr, nil
} }
res = pr
select { select {
case <-ctx.Done(): case <-ctx.Done():
case <-time.After(time.Second): case <-time.After(time.Second):
} }
res = pr
} }
if res == nil { if res == nil {
return nil, errors.New("no ping response") return nil, errors.New("no ping response")

Loading…
Cancel
Save