CORE-9295, TG-16, cyverse-archive/de-gxt-ui#339: Ensure that max cpu …

…cores are passed down in the docker-compose file

Gopkg.toml

@@ -38,12 +38,12 @@
   version = "1.0.0"
 
 [[constraint]]
-  name = "gopkg.in/cyverse-de/messaging.v4"
-  version = "4.0.0"
+  name = "gopkg.in/cyverse-de/messaging.v6"
+  version = "6.0.0"
 
 [[constraint]]
-  name = "gopkg.in/cyverse-de/model.v2"
-  version = "2.11.0"
+  name = "gopkg.in/cyverse-de/model.v4"
+  version = "4.1.0"
 
 [[constraint]]
   branch = "v2"

dcompose/dcompose.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
-	"gopkg.in/cyverse-de/model.v2"
+	"gopkg.in/cyverse-de/model.v4"
 )
 
 // WORKDIR is the path to the working directory inside all of the containers
@@ -83,6 +83,7 @@ type Service struct {
 	CapDrop       []string          `yaml:"cap_drop,flow"`
 	Command       []string          `yaml:",omitempty"`
 	ContainerName string            `yaml:"container_name,omitempty"`
+	CPUs          string            `yaml:"cpus,omitempty"`
 	CPUSet        string            `yaml:"cpuset,omitempty"`
 	CPUShares     int64             `yaml:"cpu_shares,omitempty"`
 	CPUQuota      string            `yaml:"cpu_quota,omitempty"`
@@ -132,7 +133,7 @@ func New(ld string, pathprefix string) (*JobCompose, error) {
 	}
 
 	return &JobCompose{
-		Version:  "2.1",
+		Version:  "2.2",
 		Volumes:  make(map[string]*Volume),
 		Networks: make(map[string]*Network),
 		Services: make(map[string]*Service),
@@ -200,7 +201,7 @@ func (j *JobCompose) InitFromJob(job *model.Job, cfg *viper.Viper, workingdir st
 		strings.Join([]string{excludesPath, excludesMount, "ro"}, ":"),
 	)
 
-	j.Services["upload_outputs"] = uploadOutputsSvc;
+	j.Services["upload_outputs"] = uploadOutputsSvc
 }
 
 func NewPorklockService(containertype int, invocationID, workingVolumeHostPath, porklockImageName string, porklockCommand []string) *Service {
@@ -311,7 +312,9 @@ func (j *JobCompose) ConvertStep(step *model.Step, index int, user, invID, worki
 		svc.MemLimit = strconv.FormatInt(stepContainer.MemoryLimit, 10)
 	}
 
-	if stepContainer.CPUShares > 0 {
+	if stepContainer.MaxCPUCores > 0.0 {
+		svc.CPUs = fmt.Sprintf("%f", stepContainer.MaxCPUCores)
+	} else if stepContainer.CPUShares > 0 {
 		svc.CPUShares = stepContainer.CPUShares
 	}
 

dcompose/dcompose_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"gopkg.in/cyverse-de/model.v2"
+	"gopkg.in/cyverse-de/model.v4"
 
 	yaml "gopkg.in/yaml.v2"
 )
@@ -62,10 +62,11 @@ var testJob = &model.Job{
 			},
 			Component: model.StepComponent{
 				Container: model.Container{
-					ID:        "container-id-1",
-					Name:      "container-name-1",
-					CPUShares: 0,
-					PIDsLimit: 64,
+					ID:          "container-id-1",
+					Name:        "container-name-1",
+					CPUShares:   0,
+					MaxCPUCores: 2,
+					PIDsLimit:   64,
 					Image: model.ContainerImage{
 						ID:   "container-image-1",
 						Name: "container-image-name-1",

exit.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/spf13/viper"
-	"gopkg.in/cyverse-de/messaging.v4"
+	"gopkg.in/cyverse-de/messaging.v6"
 )
 
 func cleanup(cfg *viper.Viper) {

fs/fs.go

@@ -9,7 +9,7 @@ import (
 	"path"
 
 	"github.com/pkg/errors"
-	"gopkg.in/cyverse-de/model.v2"
+	"gopkg.in/cyverse-de/model.v4"
 )
 
 // adapted from https://talks.golang.org/2012/10things.slide#8

fs/fs_test.go

@@ -10,7 +10,7 @@ import (
 	"reflect"
 	"testing"
 
-	"gopkg.in/cyverse-de/model.v2"
+	"gopkg.in/cyverse-de/model.v4"
 )
 
 type testFS struct {

main.go

@@ -27,8 +27,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"github.com/streadway/amqp"
-	"gopkg.in/cyverse-de/messaging.v4"
-	"gopkg.in/cyverse-de/model.v2"
+	"gopkg.in/cyverse-de/messaging.v6"
+	"gopkg.in/cyverse-de/model.v4"
 )
 
 var (

run.go

@@ -17,8 +17,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
-	"gopkg.in/cyverse-de/messaging.v4"
-	"gopkg.in/cyverse-de/model.v2"
+	"gopkg.in/cyverse-de/messaging.v6"
+	"gopkg.in/cyverse-de/model.v4"
 )
 
 // logrusProxyWriter will prevent

status.go

@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"gopkg.in/cyverse-de/messaging.v4"
-	"gopkg.in/cyverse-de/model.v2"
+	"gopkg.in/cyverse-de/messaging.v6"
+	"gopkg.in/cyverse-de/model.v4"
 )
 
 func hostname() string {

status_test.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"testing"
 
-	"gopkg.in/cyverse-de/messaging.v4"
-	"gopkg.in/cyverse-de/model.v2"
+	"gopkg.in/cyverse-de/messaging.v6"
+	"gopkg.in/cyverse-de/model.v4"
 )
 
 type TestJobUpdatePublisher struct {