diff options
| author | Michael Pratt <mpratt@google.com> | 2019-01-02 15:46:40 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-01-02 15:48:00 -0800 |
| commit | 33191e1cc4010693c434b24baa4d830d082c8ce6 (patch) | |
| tree | eeb237162748470c7c9763ff0a14fef0ca4c1225 /runsc/boot | |
| parent | 8e586db16274c2563fb13c95bafa9e20ea3d73ce (diff) | |
Automated rollback of changelist 225089593
PiperOrigin-RevId: 227595007
Change-Id: If14cc5aab869c5fd7a4ebd95929c887ab690e94c
Diffstat (limited to 'runsc/boot')
| -rw-r--r-- | runsc/boot/config.go | 8 | ||||
| -rw-r--r-- | runsc/boot/loader.go | 6 |
2 files changed, 1 insertions, 13 deletions
diff --git a/runsc/boot/config.go b/runsc/boot/config.go index e00d44df9..400203c99 100644 --- a/runsc/boot/config.go +++ b/runsc/boot/config.go @@ -200,15 +200,8 @@ type Config struct { // PanicSignal registers signal handling that panics. Usually set to // SIGUSR2(12) to troubleshoot hangs. -1 disables it. - // - // PanicSignal takes precedence over TraceSignal. PanicSignal int - // TraceSignal registers signal handling that logs a traceback of all - // goroutines. Usually set to SIGUSR2(12) to troubleshoot hangs. -1 - // disables it. - TraceSignal int - // TestOnlyAllowRunAsCurrentUserWithoutChroot should only be used in // tests. It allows runsc to start the sandbox process as the current // user, and without chrooting the sandbox process. This can be @@ -235,7 +228,6 @@ func (c *Config) ToFlags() []string { "--strace-log-size=" + strconv.Itoa(int(c.StraceLogSize)), "--watchdog-action=" + c.WatchdogAction.String(), "--panic-signal=" + strconv.Itoa(c.PanicSignal), - "--trace-signal=" + strconv.Itoa(c.TraceSignal), } if c.TestOnlyAllowRunAsCurrentUserWithoutChroot { // Only include if set since it is never to be used by users. diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index 3c6892446..71a2ab962 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -309,14 +309,10 @@ func New(args Args) (*Loader, error) { // Handle signals by forwarding them to the root container process // (except for panic signal, which should cause a panic). l.startSignalForwarding = sighandling.PrepareHandler(func(sig linux.Signal) { - // Tracing signals should cause their respective actions. + // Panic signal should cause a panic. if args.Conf.PanicSignal != -1 && sig == linux.Signal(args.Conf.PanicSignal) { panic("Signal-induced panic") } - if args.Conf.TraceSignal != -1 && sig == linux.Signal(args.Conf.TraceSignal) { - log.TracebackAll("Signal-induced traceback") - return - } // Otherwise forward to root container. deliveryMode := DeliverToProcess |