Merge pull request #91 from devimc/cpu/fixRaceCondition

virtcontainers: agent: fix CPU hot plug race condition
kata-containers · Apr 13, 2018 · 0f9defd · 0f9defd
2 parents f88086f + da6d284
commit 0f9defd
Show file tree

Hide file tree

Showing 8 changed files with 171 additions and 85 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -60,7 +60,7 @@
 
 [[constraint]]
   name = "github.com/kata-containers/agent"
-  revision = "c8199f60759a1d52932df37a1af710cdeada8c81"
+  revision = "a6166b794d3c5747cd8da1f943aec64c70f08afe"
 
 [[constraint]]
   name = "github.com/containerd/cri-containerd"

diff --git a/vendor/github.com/kata-containers/agent/protocols/grpc/agent.pb.go b/vendor/github.com/kata-containers/agent/protocols/grpc/agent.pb.go
diff --git a/virtcontainers/agent.go b/virtcontainers/agent.go
@@ -175,5 +175,6 @@ type agent interface {
 
 	// onlineCPUMem will online CPUs and Memory inside the Sandbox.
 	// This function should be called after hot adding vCPUs or Memory.
-	onlineCPUMem() error
+	// cpus specifies the number of CPUs that were added and the agent should online
+	onlineCPUMem(cpus uint32) error
 }
diff --git a/virtcontainers/container.go b/virtcontainers/container.go
@@ -856,7 +856,7 @@ func (c *Container) addResources() error {
 			return err
 		}
 
-		return c.sandbox.agent.onlineCPUMem()
+		return c.sandbox.agent.onlineCPUMem(uint32(vCPUs))
 	}
 
 	return nil

diff --git a/virtcontainers/hyperstart_agent.go b/virtcontainers/hyperstart_agent.go
@@ -808,7 +808,7 @@ func (h *hyper) sendCmd(proxyCmd hyperstartProxyCmd) (interface{}, error) {
 	return h.client.HyperWithTokens(proxyCmd.cmd, tokens, proxyCmd.message)
 }
 
-func (h *hyper) onlineCPUMem() error {
+func (h *hyper) onlineCPUMem(cpus uint32) error {
 	// cc-agent uses udev to online CPUs automatically
 	return nil
 }
diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go
@@ -877,8 +877,11 @@ func (k *kataAgent) processListContainer(sandbox Sandbox, c Container, options P
 	return nil, nil
 }
 
-func (k *kataAgent) onlineCPUMem() error {
-	req := &grpc.OnlineCPUMemRequest{}
+func (k *kataAgent) onlineCPUMem(cpus uint32) error {
+	req := &grpc.OnlineCPUMemRequest{
+		Wait:   false,
+		NbCpus: cpus,
+	}
 
 	_, err := k.sendReq(req)
 	return err

diff --git a/virtcontainers/noop_agent.go b/virtcontainers/noop_agent.go
@@ -81,6 +81,6 @@ func (n *noopAgent) processListContainer(sandbox Sandbox, c Container, options P
 }
 
 // onlineCPUMem is the Noop agent Container online CPU and Memory implementation. It does nothing.
-func (n *noopAgent) onlineCPUMem() error {
+func (n *noopAgent) onlineCPUMem(cpus uint32) error {
 	return nil
 }