temp debug

Signed-off-by: Kir Kolyshkin <[email protected]>

libcontainer/nsenter/nsexec.c

@@ -53,15 +53,15 @@ enum sync_t {
 #define STAGE_INIT    2
 
 /* Stores the current stage of nsexec. */
-int current_stage = STAGE_SETUP;
+volatile int current_stage = STAGE_SETUP;
 
 /* Assume the stack grows down, so arguments should be above it. */
 struct clone_t {
 	/*
 	 * Reserve some space for clone() to locate arguments
 	 * and retcode in this place
 	 */
-	char stack[4096] __attribute__ ((aligned(16)));
+	char stack[4096*4] __attribute__ ((aligned(16)));
 	char stack_ptr[0];
 
 	/* There's two children. This is used to execute the different code. */
@@ -1030,6 +1030,8 @@ void nsexec(void)
 			 */
 			enum sync_t s;
 
+			write_log(DEBUG, "~> nsexec stage-2 0");
+
 			/* We're in a child and thus need to tell the parent if we die. */
 			syncfd = sync_grandchild_pipe[0];
 			close(sync_grandchild_pipe[1]);

signals.go

@@ -100,6 +100,8 @@ func (h *signalHandler) forward(process *libcontainer.Process, tty *tty, detach
 					return e.status, nil
 				}
 			}
+		case unix.SIGURG:
+			// ignore as it's used by golang runtime
 		default:
 			logrus.Debugf("sending signal to process %s", s)
 			if err := unix.Kill(pid1, s.(unix.Signal)); err != nil {

tests/integration/debug.bats

@@ -5,6 +5,7 @@ load helpers
 function setup() {
   teardown_hello
   setup_hello
+  export GODEBUG=asyncpreemptoff=1
 }
 
 function teardown() {
@@ -33,10 +34,12 @@ function teardown() {
 
   # check expected debug output was sent to log.out
   run cat log.out
+  echo "$output" >&2
   [ "$status" -eq 0 ]
   [[ "${output}" == *"level=debug"* ]]
   [[ "${output}" == *"nsexec container setup"* ]]
   [[ "${output}" == *"child process in init()"* ]]
+  #false
 }
 
 @test "global --debug to --log --log-format 'text'" {
@@ -54,6 +57,7 @@ function teardown() {
   [[ "${output}" == *"level=debug"* ]]
   [[ "${output}" == *"nsexec container setup"* ]]
   [[ "${output}" == *"child process in init()"* ]]
+  #false
 }
 
 @test "global --debug to --log --log-format 'json'" {