tailcfg: add MapResponse.Debug mechanism to trigger logging heap pprof
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>reviewable/pr385/r1
parent
b0c10fa610
commit
703d789005
|
@ -27,6 +27,7 @@ import (
|
||||||
"github.com/tailscale/wireguard-go/wgcfg"
|
"github.com/tailscale/wireguard-go/wgcfg"
|
||||||
"golang.org/x/crypto/nacl/box"
|
"golang.org/x/crypto/nacl/box"
|
||||||
"golang.org/x/oauth2"
|
"golang.org/x/oauth2"
|
||||||
|
"tailscale.com/log/logheap"
|
||||||
"tailscale.com/net/tlsdial"
|
"tailscale.com/net/tlsdial"
|
||||||
"tailscale.com/tailcfg"
|
"tailscale.com/tailcfg"
|
||||||
"tailscale.com/types/logger"
|
"tailscale.com/types/logger"
|
||||||
|
@ -588,6 +589,9 @@ func (c *Direct) PollNetMap(ctx context.Context, maxPolls int, cb func(*NetworkM
|
||||||
vlogf("netmap: new map contains DERP map")
|
vlogf("netmap: new map contains DERP map")
|
||||||
lastDERPMap = resp.DERPMap
|
lastDERPMap = resp.DERPMap
|
||||||
}
|
}
|
||||||
|
if resp.Debug != nil && resp.Debug.LogHeapPprof {
|
||||||
|
logheap.LogHeap()
|
||||||
|
}
|
||||||
|
|
||||||
nm := &NetworkMap{
|
nm := &NetworkMap{
|
||||||
NodeKey: tailcfg.NodeKey(persist.PrivateNodeKey.Public()),
|
NodeKey: tailcfg.NodeKey(persist.PrivateNodeKey.Public()),
|
||||||
|
|
|
@ -0,0 +1,45 @@
|
||||||
|
// Copyright (c) 2020 Tailscale Inc & AUTHORS All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
// Package logheap logs a heap pprof profile.
|
||||||
|
package logheap
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"runtime"
|
||||||
|
"runtime/pprof"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// LogHeap writes a JSON logtail record with the base64 heap pprof to
|
||||||
|
// os.Stderr.
|
||||||
|
func LogHeap() {
|
||||||
|
logHeap(os.Stderr)
|
||||||
|
}
|
||||||
|
|
||||||
|
type logTail struct {
|
||||||
|
ClientTime string `json:"client_time"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type pprofRec struct {
|
||||||
|
Heap []byte `json:"heap,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type logLine struct {
|
||||||
|
LogTail logTail `json:"logtail"`
|
||||||
|
Pprof pprofRec `json:"pprof"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func logHeap(w io.Writer) error {
|
||||||
|
runtime.GC()
|
||||||
|
buf := new(bytes.Buffer)
|
||||||
|
pprof.WriteHeapProfile(buf)
|
||||||
|
return json.NewEncoder(w).Encode(logLine{
|
||||||
|
LogTail: logTail{ClientTime: time.Now().Format(time.RFC3339Nano)},
|
||||||
|
Pprof: pprofRec{Heap: buf.Bytes()},
|
||||||
|
})
|
||||||
|
}
|
|
@ -0,0 +1,40 @@
|
||||||
|
// Copyright (c) 2020 Tailscale Inc & AUTHORS All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package logheap
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"compress/gzip"
|
||||||
|
"encoding/json"
|
||||||
|
"io/ioutil"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestLogHeap(t *testing.T) {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
if err := logHeap(&buf); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
t.Logf("Got line: %s", buf.Bytes())
|
||||||
|
|
||||||
|
var ll logLine
|
||||||
|
if err := json.Unmarshal(buf.Bytes(), &ll); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
zr, err := gzip.NewReader(bytes.NewReader(ll.Pprof.Heap))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
rawProto, err := ioutil.ReadAll(zr)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
// Just sanity check it. Too lazy to properly decode the protobuf. But see that
|
||||||
|
// it contains an expected sample name.
|
||||||
|
if !bytes.Contains(rawProto, []byte("alloc_objects")) {
|
||||||
|
t.Errorf("raw proto didn't contain `alloc_objects`: %q", rawProto)
|
||||||
|
}
|
||||||
|
}
|
|
@ -500,6 +500,19 @@ type MapResponse struct {
|
||||||
Roles []Role
|
Roles []Role
|
||||||
// TODO: Groups []Group
|
// TODO: Groups []Group
|
||||||
// TODO: Capabilities []Capability
|
// TODO: Capabilities []Capability
|
||||||
|
|
||||||
|
// Debug is normally nil, except for when the control server
|
||||||
|
// is setting debug settings on a node.
|
||||||
|
Debug *Debug `json:",omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Debug are instructions from the control server to the client
|
||||||
|
// to adjust debug settings.
|
||||||
|
type Debug struct {
|
||||||
|
// LogHeapPprof controls whether the client should logs
|
||||||
|
// its heap pprof data. Each true value sent from the server
|
||||||
|
// means that client should do one more log.
|
||||||
|
LogHeapPprof bool `json:",omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (k MachineKey) String() string { return fmt.Sprintf("mkey:%x", k[:]) }
|
func (k MachineKey) String() string { return fmt.Sprintf("mkey:%x", k[:]) }
|
||||||
|
|
Loading…
Reference in New Issue