Unset change name of CPUset

rancher · Aug 19, 2017 · 2101ce5 · 2101ce5
1 parent b2b51c6
commit 2101ce5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/core/compute/compute_unix.go b/core/compute/compute_unix.go
@@ -337,7 +337,7 @@ func setupFieldsHostConfig(fields model.InstanceFields, hostConfig *container.Ho
 
 	hostConfig.RestartPolicy = fields.RestartPolicy
 
-	hostConfig.CpusetCpus = fields.CPUsetCpus
+	hostConfig.CpusetCpus = fields.CPUSet
 
 	hostConfig.BlkioWeight = fields.BlkioWeight
 

diff --git a/handlers/compute_unix_test.go b/handlers/compute_unix_test.go
@@ -79,7 +79,6 @@ func (s *ComputeTestSuite) TestNewFields(c *check.C) {
 	fields["cpuPeriod"] = 100000
 	fields["cpuQuota"] = 50000
 	fields["cpuSetMems"] = "0"
-	fields["cpuSetCpus"] = "0,1"
 	fields["kernelMemory"] = 10000000
 	fields["memory"] = 10000000
 	fields["memorySwappiness"] = 50
@@ -114,7 +113,6 @@ func (s *ComputeTestSuite) TestNewFields(c *check.C) {
 	c.Assert(inspect.HostConfig.CPUPeriod, check.Equals, int64(100000))
 	c.Assert(inspect.HostConfig.CPUQuota, check.Equals, int64(50000))
 	c.Assert(inspect.HostConfig.CpusetMems, check.Equals, "0")
-	c.Assert(inspect.HostConfig.CpusetCpus, check.Equals, "0,1")
 	c.Assert(inspect.HostConfig.KernelMemory, check.Equals, int64(10000000))
 	c.Assert(inspect.HostConfig.Memory, check.Equals, int64(10000000))
 	c.Assert(*(inspect.HostConfig.MemorySwappiness), check.Equals, int64(50))

diff --git a/model/instance.go b/model/instance.go
@@ -199,9 +199,9 @@ type InstanceFields struct {
 	CPUPeriod          int64  `json:"cpuPeriod"`
 	CPUQuota           int64  `json:"cpuQuota"`
 	CPUsetMems         string `json:"cpuSetMems"`
-	CPUsetCpus         string `json:"cpuSetCpus"`
-	CPURealtimePeriod  int64  `json:"cpuRealtimePeriod"`
-	CPURealtimeRuntime int64  `json:"cpuRealtimeRuntime"`
+	CPUSet             string
+	CPURealtimePeriod  int64 `json:"cpuRealtimePeriod"`
+	CPURealtimeRuntime int64 `json:"cpuRealtimeRuntime"`
 	DNSOpt             []string
 	GroupAdd           []string
 	Isolation          container.Isolation

diff --git a/tests/tests/test_docker.py b/tests/tests/test_docker.py
@@ -396,7 +396,7 @@ def test_instance_activate_cpu_set(agent):
     def pre(req):
         delete_container('/c861f990-4472-4fa1-960f-65171b544c28')
         instance = req['data']['instanceHostMap']['instance']
-        instance['data']['fields']['cpuSetCpus'] = '0,1'
+        instance['data']['fields']['cpuSet'] = '0,1'
 
     def preNull(req):
         delete_container('/c861f990-4472-4fa1-960f-65171b544c28')