From 3b0c09d3c37203d8fa731bad05ce0651d375aa06 Mon Sep 17 00:00:00 2001 From: Tim Pepper Date: Fri, 22 Apr 2016 16:53:34 -0700 Subject: [PATCH] controller: workload csv typo asks for 80vcpus for docker This is probably not a real issue today, but... Each of our sample workloads appears meant to request 80MB of persistent storage. Which is ignored anyway. There is a typo for two docker workload descriptions which sets the resource_id to #2 for the disk line instead of Resource #2 is cpu, so technically the template is saying those docker workloads should get 80 CPUs worth of resource allocation. That's not good. Now really we don't account CPUs or create cpusets (that I'm aware of anyway) yet for docker workloads. And it may be that having read the earlier line requesting 2 CPUs worth of resource, that the second request is ignored. So we're probably multiple times lucky. Either way, let's just make sure we don't rely on luck. --- ciao-controller/tables/workload_resources.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ciao-controller/tables/workload_resources.csv b/ciao-controller/tables/workload_resources.csv index b82099bf5..3eecf4bc7 100644 --- a/ciao-controller/tables/workload_resources.csv +++ b/ciao-controller/tables/workload_resources.csv @@ -10,7 +10,7 @@ eba04826-62a5-48bd-876f-9119667b1487, 4, 1024, 1024, 1 eba04826-62a5-48bd-876f-9119667b1487, 5, 1, 1, 1 ca957444-fa46-11e5-94f9-38607786d9ec, 2, 2, 2, 1 ca957444-fa46-11e5-94f9-38607786d9ec, 3, 128, 128, 1 -ca957444-fa46-11e5-94f9-38607786d9ec, 2, 80, 80, 1 +ca957444-fa46-11e5-94f9-38607786d9ec, 4, 80, 80, 1 ab68111c-03a6-11e6-87de-001320fb6e31, 2, 2, 2, 1 ab68111c-03a6-11e6-87de-001320fb6e31, 3, 128, 128, 1 -ab68111c-03a6-11e6-87de-001320fb6e31, 2, 80, 80, 1 +ab68111c-03a6-11e6-87de-001320fb6e31, 4, 80, 80, 1