Skip to content

K
k3s
Commit f1b6a354 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Fix stack log on panic

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent c44d33d2
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
pkg/agent/cridockerd/cridockerd.go
View file @ f1b6a354
...@@ -34,7 +34,7 @@ func Run(ctx context.Context, cfg *config.Node) error { ...@@ -34,7 +34,7 @@ func Run(ctx context.Context, cfg *config.Node) error {
go func() { go func() {
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
logrus.Fatalf("cri-dockerd panic: %s", debug.Stack()) logrus.WithField("stack", string(debug.Stack())).Fatalf("cri-dockerd panic: %v", err)
} }
}() }()
logrus.Fatalf("cri-dockerd exited: %v", command.ExecuteContext(ctx)) logrus.Fatalf("cri-dockerd exited: %v", command.ExecuteContext(ctx))
......
pkg/daemons/executor/embed.go
View file @ f1b6a354
...@@ -57,7 +57,7 @@ func (e *Embedded) Kubelet(ctx context.Context, args []string) error { ...@@ -57,7 +57,7 @@ func (e *Embedded) Kubelet(ctx context.Context, args []string) error {
go func() { go func() {
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
logrus.WithField("stack", debug.Stack()).Fatalf("kubelet panic: %v", err) logrus.WithField("stack", string(debug.Stack())).Fatalf("kubelet panic: %v", err)
} }
}() }()
// The embedded executor doesn't need the kubelet to come up to host any components, and // The embedded executor doesn't need the kubelet to come up to host any components, and
...@@ -79,7 +79,7 @@ func (*Embedded) KubeProxy(ctx context.Context, args []string) error { ...@@ -79,7 +79,7 @@ func (*Embedded) KubeProxy(ctx context.Context, args []string) error {
go func() { go func() {
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
logrus.WithField("stack", debug.Stack()).Fatalf("kube-proxy panic: %v", err) logrus.WithField("stack", string(debug.Stack())).Fatalf("kube-proxy panic: %v", err)
} }
}() }()
logrus.Fatalf("kube-proxy exited: %v", command.ExecuteContext(ctx)) logrus.Fatalf("kube-proxy exited: %v", command.ExecuteContext(ctx))
...@@ -101,7 +101,7 @@ func (*Embedded) APIServer(ctx context.Context, etcdReady <-chan struct{}, args ...@@ -101,7 +101,7 @@ func (*Embedded) APIServer(ctx context.Context, etcdReady <-chan struct{}, args
<-etcdReady <-etcdReady
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
logrus.WithField("stack", debug.Stack()).Fatalf("apiserver panic: %v", err) logrus.WithField("stack", string(debug.Stack())).Fatalf("apiserver panic: %v", err)
} }
}() }()
logrus.Fatalf("apiserver exited: %v", command.ExecuteContext(ctx)) logrus.Fatalf("apiserver exited: %v", command.ExecuteContext(ctx))
...@@ -130,7 +130,7 @@ func (e *Embedded) Scheduler(ctx context.Context, apiReady <-chan struct{}, args ...@@ -130,7 +130,7 @@ func (e *Embedded) Scheduler(ctx context.Context, apiReady <-chan struct{}, args
} }
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
logrus.WithField("stack", debug.Stack()).Fatalf("scheduler panic: %v", err) logrus.WithField("stack", string(debug.Stack())).Fatalf("scheduler panic: %v", err)
} }
}() }()
logrus.Fatalf("scheduler exited: %v", command.ExecuteContext(ctx)) logrus.Fatalf("scheduler exited: %v", command.ExecuteContext(ctx))
...@@ -147,7 +147,7 @@ func (*Embedded) ControllerManager(ctx context.Context, apiReady <-chan struct{} ...@@ -147,7 +147,7 @@ func (*Embedded) ControllerManager(ctx context.Context, apiReady <-chan struct{}
<-apiReady <-apiReady
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
logrus.WithField("stack", debug.Stack()).Fatalf("controller-manager panic: %v", err) logrus.WithField("stack", string(debug.Stack())).Fatalf("controller-manager panic: %v", err)
} }
}() }()
logrus.Fatalf("controller-manager exited: %v", command.ExecuteContext(ctx)) logrus.Fatalf("controller-manager exited: %v", command.ExecuteContext(ctx))
...@@ -180,7 +180,7 @@ func (*Embedded) CloudControllerManager(ctx context.Context, ccmRBACReady <-chan ...@@ -180,7 +180,7 @@ func (*Embedded) CloudControllerManager(ctx context.Context, ccmRBACReady <-chan
<-ccmRBACReady <-ccmRBACReady
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
logrus.WithField("stack", debug.Stack()).Fatalf("cloud-controller-manager panic: %v", err) logrus.WithField("stack", string(debug.Stack())).Fatalf("cloud-controller-manager panic: %v", err)
} }
}() }()
logrus.Errorf("cloud-controller-manager exited: %v", command.ExecuteContext(ctx)) logrus.Errorf("cloud-controller-manager exited: %v", command.ExecuteContext(ctx))
......
pkg/server/server.go
View file @ f1b6a354
...@@ -181,7 +181,7 @@ func apiserverControllers(ctx context.Context, sc *Context, config *Config) { ...@@ -181,7 +181,7 @@ func apiserverControllers(ctx context.Context, sc *Context, config *Config) {
func runOrDie(ctx context.Context, name string, cb leader.Callback) { func runOrDie(ctx context.Context, name string, cb leader.Callback) {
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
logrus.WithField("stack", debug.Stack()).Fatalf("%s controller panic: %v", name, err) logrus.WithField("stack", string(debug.Stack())).Fatalf("%s controller panic: %v", name, err)
} }
}() }()
cb(ctx) cb(ctx)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment