From c51d49277e2adaac4150091463171e5ec8a9886c Mon Sep 17 00:00:00 2001
From: lifupan <lifupan@gmail.com>
Date: Fri, 27 Sep 2019 17:11:50 +0800
Subject: [PATCH] virtcontainers: fix the issue of missing watchConsole

When do the reloading sandbox in shimv2, it's needed to
rewatch the hypervisor's console when debug enabled.

Fixes:#2091

Signed-off-by: lifupan <lifupan@gmail.com>
---
 virtcontainers/agent.go      |  3 +++
 virtcontainers/api.go        |  6 +++---
 virtcontainers/kata_agent.go | 36 ++++++++++++++++++++++++------------
 virtcontainers/noop_agent.go |  4 ++++
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/virtcontainers/agent.go b/virtcontainers/agent.go
index 3b162ec591..77e5c683c9 100644
--- a/virtcontainers/agent.go
+++ b/virtcontainers/agent.go
@@ -126,6 +126,9 @@ type agent interface {
 	// check will check the agent liveness
 	check() error
 
+	// tell whether the agent is long  live connected or not
+	longLiveConn() bool
+
 	// disconnect will disconnect the connection to the agent
 	disconnect() error
 
diff --git a/virtcontainers/api.go b/virtcontainers/api.go
index 7541823ad7..3c526008a0 100644
--- a/virtcontainers/api.go
+++ b/virtcontainers/api.go
@@ -187,9 +187,9 @@ func FetchSandbox(ctx context.Context, sandboxID string) (VCSandbox, error) {
 		return nil, err
 	}
 
-	// If the proxy is KataBuiltInProxyType type, it needs to restart the proxy to watch the
-	// guest console if it hadn't been watched.
-	if isProxyBuiltIn(s.config.ProxyType) {
+	// If the agent is long live connection, it needs to restart the proxy to
+	// watch the guest console if it hadn't been watched.
+	if s.agent.longLiveConn() {
 		err = s.startProxy()
 		if err != nil {
 			s.Release()
diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go
index 6981f44c79..781e0c6d6e 100644
--- a/virtcontainers/kata_agent.go
+++ b/virtcontainers/kata_agent.go
@@ -224,6 +224,10 @@ func (k *kataAgent) getSharePath(id string) string {
 	return filepath.Join(kataHostSharedDir(), id)
 }
 
+func (k *kataAgent) longLiveConn() bool {
+	return k.keepConn
+}
+
 // KataAgentSetDefaultTraceConfigOptions validates agent trace options and
 // sets defaults.
 func KataAgentSetDefaultTraceConfigOptions(config *KataAgentConfig) error {
@@ -617,6 +621,7 @@ func (k *kataAgent) startProxy(sandbox *Sandbox) error {
 	defer span.Finish()
 
 	var err error
+	var agentURL string
 
 	if k.proxy == nil {
 		return errorMissingProxy
@@ -627,18 +632,25 @@ func (k *kataAgent) startProxy(sandbox *Sandbox) error {
 	}
 
 	if k.state.URL != "" {
-		k.Logger().WithFields(logrus.Fields{
-			"sandbox":   sandbox.id,
-			"proxy-pid": k.state.ProxyPid,
-			"proxy-url": k.state.URL,
-		}).Infof("proxy already started")
-		return nil
-	}
-
-	// Get agent socket path to provide it to the proxy.
-	agentURL, err := k.agentURL()
-	if err != nil {
-		return err
+		// For keepConn case, when k.state.URL isn't nil, it means shimv2 had disconnected from
+		// sandbox and try to relaunch sandbox again. Here it needs to start proxy again to watch
+		// the hypervisor console.
+		if k.keepConn {
+			agentURL = k.state.URL
+		} else {
+			k.Logger().WithFields(logrus.Fields{
+				"sandbox":   sandbox.id,
+				"proxy-pid": k.state.ProxyPid,
+				"proxy-url": k.state.URL,
+			}).Infof("proxy already started")
+			return nil
+		}
+	} else {
+		// Get agent socket path to provide it to the proxy.
+		agentURL, err = k.agentURL()
+		if err != nil {
+			return err
+		}
 	}
 
 	consoleURL, err := sandbox.hypervisor.getSandboxConsole(sandbox.id)
diff --git a/virtcontainers/noop_agent.go b/virtcontainers/noop_agent.go
index 4c1eec3fc2..6d926f4067 100644
--- a/virtcontainers/noop_agent.go
+++ b/virtcontainers/noop_agent.go
@@ -32,6 +32,10 @@ func (n *noopAgent) init(ctx context.Context, sandbox *Sandbox, config interface
 	return false, nil
 }
 
+func (n *noopAgent) longLiveConn() bool {
+	return false
+}
+
 // createSandbox is the Noop agent sandbox creation implementation. It does nothing.
 func (n *noopAgent) createSandbox(sandbox *Sandbox) error {
 	return nil