Merge pull request #255 from smothiki/cpu

feat(workflow): add support for floating point cpus and milli cpu units

Author: Sivaram Mothiki

client/cmd/limits.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"fmt"
 	"regexp"
-	"strconv"
 
 	"github.com/deis/pkg/prettyprint"
 
@@ -43,7 +42,7 @@ func LimitsList(appID string) error {
 		cpuMap := make(map[string]string)
 
 		for key, value := range config.CPU {
-			cpuMap[key] = strconv.Itoa(int(value.(float64)))
+			cpuMap[key] = value.(string)
 		}
 
 		fmt.Print(prettyprint.PrettyTabs(cpuMap, 5))
@@ -145,7 +144,7 @@ func parseLimits(limits []string) map[string]interface{} {
 }
 
 func parseLimit(limit string) (string, string, error) {
-	regex := regexp.MustCompile("^([A-z]+)=([0-9]+[bkmgBKMG]{1,2}|[0-9]{1,4})$")
+	regex := regexp.MustCompile("^([A-z]+)=([0-9]+[bkmgBKMG]{1,2}|[0-9.]{1,5}|[0-9.]{1,5}[m]{0,1})$")
 
 	if !regex.MatchString(limit) {
 		return "", "", fmt.Errorf(`%s doesn't fit format type=#unit or type=#

rootfs/api/serializers.py

@@ -13,7 +13,7 @@
 
 PROCTYPE_MATCH = re.compile(r'^(?P<type>[a-z]+)')
 MEMLIMIT_MATCH = re.compile(r'^(?P<mem>[0-9]+(MB|KB|GB|[BKMG]))$', re.IGNORECASE)
-CPUSHARE_MATCH = re.compile(r'^(?P<cpu>[0-9]+)$')
+CPUSHARE_MATCH = re.compile(r'^(?P<cpu>[0-9.]+[m]{0,1})$')
 TAGKEY_MATCH = re.compile(r'^[a-z]+$')
 TAGVAL_MATCH = re.compile(r'^\w+$')
 CONFIGKEY_MATCH = re.compile(r'^[a-z_]+[a-z0-9_]*$', re.IGNORECASE)
@@ -133,7 +133,7 @@ class ConfigSerializer(serializers.ModelSerializer):
     owner = serializers.ReadOnlyField(source='owner.username')
     values = JSONFieldSerializer(required=False, binary=True)
     memory = JSONFieldSerializer(required=False, binary=True)
-    cpu = JSONFieldSerializer(required=False, binary=True, type='int')
+    cpu = JSONFieldSerializer(required=False, binary=True)
     tags = JSONFieldSerializer(required=False, binary=True)
     created = serializers.DateTimeField(read_only=True)
     updated = serializers.DateTimeField(read_only=True)
@@ -175,16 +175,16 @@ def validate_cpu(self, data):
 
             shares = re.match(CPUSHARE_MATCH, str(value))
             if not shares:
-                raise serializers.ValidationError("CPU shares must be an integer")
+                raise serializers.ValidationError("CPU shares must be a numeric value")
 
             for share in shares.groupdict().values():
                 try:
-                    i = int(share)
+                    if share[-1] == "m":
+                        float(share[:-1])
+                    else:
+                        float(share)
                 except ValueError:
-                    raise serializers.ValidationError("CPU shares must be an integer")
-
-                if i > 1024 or i < 0:
-                    raise serializers.ValidationError("CPU shares must be between 0 and 1024")
+                    raise serializers.ValidationError("CPU units must be a numeric value")
 
         return data
 

rootfs/api/tests/test_config.py

@@ -162,7 +162,7 @@ def test_response_data_types_converted(self):
             'app': 'test',
             'values': {'PORT': '5000'},
             'memory': {},
-            'cpu': {'web': 1024},
+            'cpu': {'web': "1024"},
             'tags': {}
         }
         self.assertDictContainsSubset(expected, response.data)
@@ -171,7 +171,7 @@ def test_response_data_types_converted(self):
         response = self.client.post(url, json.dumps(body), content_type='application/json',
                                     HTTP_AUTHORIZATION='token {}'.format(self.token))
         self.assertEqual(response.status_code, 400)
-        self.assertIn('CPU shares must be an integer', response.data['cpu'])
+        self.assertIn('CPU shares must be a numeric value', response.data['cpu'])
 
     @mock.patch('requests.post', mock_status_ok)
     def test_config_set_same_key(self):
@@ -409,7 +409,7 @@ def test_limit_cpu(self):
         self.assertIn('cpu', response.data)
         cpu = response.data['cpu']
         self.assertIn('web', cpu)
-        self.assertEqual(cpu['web'], 1024)
+        self.assertEqual(cpu['web'], '1024')
         # set an additional value
         body = {'cpu': json.dumps({'worker': '512'})}
         response = self.client.post(url, json.dumps(body), content_type='application/json',
@@ -419,19 +419,19 @@ def test_limit_cpu(self):
         self.assertNotEqual(limit1['uuid'], limit2['uuid'])
         cpu = response.data['cpu']
         self.assertIn('worker', cpu)
-        self.assertEqual(cpu['worker'], 512)
+        self.assertEqual(cpu['worker'], '512')
         self.assertIn('web', cpu)
-        self.assertEqual(cpu['web'], 1024)
+        self.assertEqual(cpu['web'], '1024')
         # read the limit again
         response = self.client.get(url, HTTP_AUTHORIZATION='token {}'.format(self.token))
         self.assertEqual(response.status_code, 200)
         limit3 = response.data
         self.assertEqual(limit2, limit3)
         cpu = response.data['cpu']
         self.assertIn('worker', cpu)
-        self.assertEqual(cpu['worker'], 512)
+        self.assertEqual(cpu['worker'], '512')
         self.assertIn('web', cpu)
-        self.assertEqual(cpu['web'], 1024)
+        self.assertEqual(cpu['web'], '1024')
         # unset a value
         body = {'memory': json.dumps({'worker': None})}
         response = self.client.post(url, json.dumps(body), content_type='application/json',

rootfs/scheduler/__init__.py

@@ -639,7 +639,6 @@ def _create_rc(self, name, image, command, **kwargs):
             containers[0]["resources"]["limits"]["memory"] = mem
 
         if cpu:
-            cpu = float(cpu)/1024
             containers[0]["resources"]["limits"]["cpu"] = cpu
 
         # add in healtchecks