From d314e2d0b7c47d342a41ce231b34d476e4988278 Mon Sep 17 00:00:00 2001
From: Peng Tao <bergwolf@gmail.com>
Date: Thu, 17 Jan 2019 17:09:48 +0800
Subject: [PATCH] agent: clean up share path created by the agent

The agent code creates a directory at
`/run/kata-containers/shared/sandboxes/sbid/` to hold shared data
between host and guest. We need to clean it up when removing a sandbox.

Fixes: #1138

Signed-off-by: Peng Tao <bergwolf@gmail.com>
---
 virtcontainers/agent.go            | 3 +++
 virtcontainers/hyperstart_agent.go | 7 +++++++
 virtcontainers/kata_agent.go       | 8 ++++++++
 virtcontainers/noop_agent.go       | 3 +++
 virtcontainers/sandbox.go          | 2 ++
 5 files changed, 23 insertions(+)

diff --git a/virtcontainers/agent.go b/virtcontainers/agent.go
index cf0c71c50..9cfce0f34 100644
--- a/virtcontainers/agent.go
+++ b/virtcontainers/agent.go
@@ -254,4 +254,7 @@ type agent interface {
 
 	// copyFile copies file from host to container's rootfs
 	copyFile(src, dst string) error
+
+	// cleanup removes all on disk information generated by the agent
+	cleanup(id string)
 }
diff --git a/virtcontainers/hyperstart_agent.go b/virtcontainers/hyperstart_agent.go
index feabc1f5a..8a0693a65 100644
--- a/virtcontainers/hyperstart_agent.go
+++ b/virtcontainers/hyperstart_agent.go
@@ -1012,3 +1012,10 @@ func (h *hyper) copyFile(src, dst string) error {
 	// hyperstart-agent does not support copyFile
 	return nil
 }
+
+func (h *hyper) cleanup(id string) {
+	path := h.getSharePath(id)
+	if err := os.RemoveAll(path); err != nil {
+		h.Logger().WithError(err).Errorf("failed to cleanup vm share path %s", path)
+	}
+}
diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go
index 3f0abc423..3f725ac87 100644
--- a/virtcontainers/kata_agent.go
+++ b/virtcontainers/kata_agent.go
@@ -1835,3 +1835,11 @@ func (k *kataAgent) copyFile(src, dst string) error {
 
 	return nil
 }
+
+func (k *kataAgent) cleanup(id string) {
+	path := k.getSharePath(id)
+	k.Logger().WithField("path", path).Infof("cleanup agent")
+	if err := os.RemoveAll(path); err != nil {
+		k.Logger().WithError(err).Errorf("failed to cleanup vm share path %s", path)
+	}
+}
diff --git a/virtcontainers/noop_agent.go b/virtcontainers/noop_agent.go
index 1783454b9..6ba15d4b3 100644
--- a/virtcontainers/noop_agent.go
+++ b/virtcontainers/noop_agent.go
@@ -215,3 +215,6 @@ func (n *noopAgent) setGuestDateTime(time.Time) error {
 func (n *noopAgent) copyFile(src, dst string) error {
 	return nil
 }
+
+func (n *noopAgent) cleanup(id string) {
+}
diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go
index a3794ab90..004ad3dc0 100644
--- a/virtcontainers/sandbox.go
+++ b/virtcontainers/sandbox.go
@@ -744,6 +744,8 @@ func (s *Sandbox) Delete() error {
 		s.Logger().WithError(err).Error("failed to cleanup hypervisor")
 	}
 
+	s.agent.cleanup(s.id)
+
 	return s.storage.deleteSandboxResources(s.id, nil)
 }