FIXME: no merge

Julio Montes · Julio Montes · commit 09b5bb94eed7 · 2019-04-26T12:40:31.000-05:00
Signed-off-by: Julio Montes &lt;julio.montes@intel.com&gt;
diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go
@@ -420,7 +420,7 @@ func (k *kataAgent) exec(sandbox *Sandbox, c Container, cmd types.Cmd) (*Process
 	}
 
 	return prepareAndStartShim(sandbox, k.shim, c.id, req.ExecId,
-		k.state.URL, cmd, []ns.NSType{}, enterNSList)
+		k.state.URL, "", cmd, []ns.NSType{}, enterNSList)
 }
 
 func (k *kataAgent) updateInterface(ifc *vcTypes.Interface) (*vcTypes.Interface, error) {
@@ -1119,8 +1119,17 @@ func (k *kataAgent) createContainer(sandbox *Sandbox, c *Container) (p *Process,
 		})
 	}
 
+	// Ask to the shim to print the agent logs, if it's the process who monitors the sandbox and use_vsock is true (no proxy)
+	var consoleURL string
+	if sandbox.config.HypervisorConfig.UseVSock && c.GetAnnotations()[vcAnnotations.ContainerTypeKey] == string(PodSandbox) {
+		consoleURL, err = sandbox.hypervisor.getSandboxConsole(sandbox.id)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	return prepareAndStartShim(sandbox, k.shim, c.id, req.ExecId,
-		k.state.URL, c.config.Cmd, createNSList, enterNSList)
+		k.state.URL, consoleURL, c.config.Cmd, createNSList, enterNSList)
 }
 
 // handleEphemeralStorage handles ephemeral storages by
diff --git a/virtcontainers/kata_shim.go b/virtcontainers/kata_shim.go
@@ -55,6 +55,9 @@ func (s *kataShim) start(sandbox *Sandbox, params ShimParams) (int, error) {
 
 	if config.Debug {
 		args = append(args, "-log", "debug")
+		if params.ConsoleURL != "" {
+			args = append(args, "-agent-logs-socket", params.ConsoleURL)
+		}
 	}
 
 	if config.Trace {
diff --git a/virtcontainers/shim.go b/virtcontainers/shim.go
@@ -38,15 +38,16 @@ var consoleFileMode = os.FileMode(0660)
 // ShimParams is the structure providing specific parameters needed
 // for the execution of the shim binary.
 type ShimParams struct {
-	Container string
-	Token     string
-	URL       string
-	Console   string
-	Terminal  bool
-	Detach    bool
-	PID       int
-	CreateNS  []ns.NSType
-	EnterNS   []ns.Namespace
+	Container  string
+	Token      string
+	URL        string
+	Console    string
+	ConsoleURL string
+	Terminal   bool
+	Detach     bool
+	PID        int
+	CreateNS   []ns.NSType
+	EnterNS    []ns.Namespace
 }
 
 // ShimConfig is the structure providing specific configuration
@@ -147,22 +148,23 @@ func stopShim(pid int) error {
 	return nil
 }
 
-func prepareAndStartShim(sandbox *Sandbox, shim shim, cid, token, url string, cmd types.Cmd,
+func prepareAndStartShim(sandbox *Sandbox, shim shim, cid, token, url, consoleURL string, cmd types.Cmd,
 	createNSList []ns.NSType, enterNSList []ns.Namespace) (*Process, error) {
 	process := &Process{
 		Token:     token,
 		StartTime: time.Now().UTC(),
 	}
 
 	shimParams := ShimParams{
-		Container: cid,
-		Token:     token,
-		URL:       url,
-		Console:   cmd.Console,
-		Terminal:  cmd.Interactive,
-		Detach:    cmd.Detach,
-		CreateNS:  createNSList,
-		EnterNS:   enterNSList,
+		Container:  cid,
+		Token:      token,
+		URL:        url,
+		Console:    cmd.Console,
+		Terminal:   cmd.Interactive,
+		Detach:     cmd.Detach,
+		CreateNS:   createNSList,
+		EnterNS:    enterNSList,
+		ConsoleURL: consoleURL,
 	}
 
 	pid, err := shim.start(sandbox, shimParams)

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ func (k kataAgent) exec(sandbox Sandbox, c Container, cmd types.Cmd) (*Process`
`420`	`420`	`}`
`421`	`421`
`422`	`422`	`return prepareAndStartShim(sandbox, k.shim, c.id, req.ExecId,`
`423`		`- k.state.URL, cmd, []ns.NSType{}, enterNSList)`
	`423`	`+ k.state.URL, "", cmd, []ns.NSType{}, enterNSList)`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`func (k kataAgent) updateInterface(ifc vcTypes.Interface) (*vcTypes.Interface, error) {`
`@@ -1119,8 +1119,17 @@ func (k kataAgent) createContainer(sandbox Sandbox, c Container) (p Process,`
`1119`	`1119`	`})`
`1120`	`1120`	`}`
`1121`	`1121`
	`1122`	`+ // Ask to the shim to print the agent logs, if it's the process who monitors the sandbox and use_vsock is true (no proxy)`
	`1123`	`+ var consoleURL string`
	`1124`	`+ if sandbox.config.HypervisorConfig.UseVSock && c.GetAnnotations()[vcAnnotations.ContainerTypeKey] == string(PodSandbox) {`
	`1125`	`+ consoleURL, err = sandbox.hypervisor.getSandboxConsole(sandbox.id)`
	`1126`	`+ if err != nil {`
	`1127`	`+ return nil, err`
	`1128`	`+ }`
	`1129`	`+ }`
	`1130`	`+`
`1122`	`1131`	`return prepareAndStartShim(sandbox, k.shim, c.id, req.ExecId,`
`1123`		`- k.state.URL, c.config.Cmd, createNSList, enterNSList)`
	`1132`	`+ k.state.URL, consoleURL, c.config.Cmd, createNSList, enterNSList)`
`1124`	`1133`	`}`
`1125`	`1134`
`1126`	`1135`	`// handleEphemeralStorage handles ephemeral storages by`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@ func (s kataShim) start(sandbox Sandbox, params ShimParams) (int, error) {`
`55`	`55`
`56`	`56`	`if config.Debug {`
`57`	`57`	`args = append(args, "-log", "debug")`
	`58`	`+ if params.ConsoleURL != "" {`
	`59`	`+ args = append(args, "-agent-logs-socket", params.ConsoleURL)`
	`60`	`+ }`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`if config.Trace {`