Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
f1b6a354
Commit
f1b6a354
authored
Apr 21, 2023
by
Brad Davidson
Committed by
Brad Davidson
Apr 28, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix stack log on panic
Signed-off-by:
Brad Davidson
<
brad.davidson@rancher.com
>
parent
c44d33d2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
cridockerd.go
pkg/agent/cridockerd/cridockerd.go
+1
-1
embed.go
pkg/daemons/executor/embed.go
+6
-6
server.go
pkg/server/server.go
+1
-1
No files found.
pkg/agent/cridockerd/cridockerd.go
View file @
f1b6a354
...
...
@@ -34,7 +34,7 @@ func Run(ctx context.Context, cfg *config.Node) error {
go
func
()
{
defer
func
()
{
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
))
...
...
pkg/daemons/executor/embed.go
View file @
f1b6a354
...
...
@@ -57,7 +57,7 @@ func (e *Embedded) Kubelet(ctx context.Context, args []string) error {
go
func
()
{
defer
func
()
{
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
...
...
@@ -79,7 +79,7 @@ func (*Embedded) KubeProxy(ctx context.Context, args []string) error {
go
func
()
{
defer
func
()
{
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
))
...
...
@@ -101,7 +101,7 @@ func (*Embedded) APIServer(ctx context.Context, etcdReady <-chan struct{}, args
<-
etcdReady
defer
func
()
{
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
))
...
...
@@ -130,7 +130,7 @@ func (e *Embedded) Scheduler(ctx context.Context, apiReady <-chan struct{}, args
}
defer
func
()
{
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
))
...
...
@@ -147,7 +147,7 @@ func (*Embedded) ControllerManager(ctx context.Context, apiReady <-chan struct{}
<-
apiReady
defer
func
()
{
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
))
...
...
@@ -180,7 +180,7 @@ func (*Embedded) CloudControllerManager(ctx context.Context, ccmRBACReady <-chan
<-
ccmRBACReady
defer
func
()
{
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
))
...
...
pkg/server/server.go
View file @
f1b6a354
...
...
@@ -181,7 +181,7 @@ func apiserverControllers(ctx context.Context, sc *Context, config *Config) {
func
runOrDie
(
ctx
context
.
Context
,
name
string
,
cb
leader
.
Callback
)
{
defer
func
()
{
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment