From c4957ddd8d0c7ed00cd3963e6f763a72ab09c212 Mon Sep 17 00:00:00 2001 From: fupan Date: Tue, 5 Mar 2019 11:40:55 +0800 Subject: [PATCH] virtcontainer: watch the qemu's console when proxy's debug enabled kata builtin proxy has always watched the qemu's console whether proxy's debug is set or not, this is not aligned with kata cli. This patch will change it and watch the qemu's console only when proxy's debug is set in kata config. Fixes: #1318 Signed-off-by: fupan --- virtcontainers/kata_builtin_proxy.go | 11 +++++++---- virtcontainers/kata_builtin_proxy_test.go | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/virtcontainers/kata_builtin_proxy.go b/virtcontainers/kata_builtin_proxy.go index 0185403717..8ac90d84de 100644 --- a/virtcontainers/kata_builtin_proxy.go +++ b/virtcontainers/kata_builtin_proxy.go @@ -55,10 +55,13 @@ func (p *kataBuiltInProxy) start(params proxyParams) (int, string, error) { params.logger.Debug("Starting builtin kata proxy") p.sandboxID = params.id - err := p.watchConsole(buildinProxyConsoleProto, params.consoleURL, params.logger) - if err != nil { - p.sandboxID = "" - return -1, "", err + + if params.debug { + err := p.watchConsole(buildinProxyConsoleProto, params.consoleURL, params.logger) + if err != nil { + p.sandboxID = "" + return -1, "", err + } } return -1, params.agentURL, nil diff --git a/virtcontainers/kata_builtin_proxy_test.go b/virtcontainers/kata_builtin_proxy_test.go index 32e9b95b1d..e682bd945e 100644 --- a/virtcontainers/kata_builtin_proxy_test.go +++ b/virtcontainers/kata_builtin_proxy_test.go @@ -17,7 +17,7 @@ func TestKataBuiltinProxy(t *testing.T) { p := kataBuiltInProxy{} - params := proxyParams{} + params := proxyParams{debug: true} err := p.validateParams(params) assert.NotNil(err)