store create time in workload meta

Author: CMGS

cluster/calcium/calcium_test.go

@@ -38,6 +38,10 @@ func NewTestCluster() *Calcium {
 		Git: types.GitConfig{
 			CloneTimeout: 300 * time.Second,
 		},
+		Scheduler: types.SchedConfig{
+			MaxShare:  -1,
+			ShareBase: 100,
+		},
 	}
 	c.store = &storemocks.Store{}
 	c.scheduler = &schedulermocks.Scheduler{}

cluster/calcium/create.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"sync"
+	"time"
 
 	"github.com/pkg/errors"
 	"github.com/projecteru2/core/cluster"
@@ -229,6 +230,7 @@ func (c *Calcium) doDeployOneWorkload(
 		Image:      opts.Image,
 		Env:        opts.Env,
 		User:       opts.User,
+		CreateTime: time.Now().Unix(),
 	}
 	return utils.Txn(
 		ctx,

cluster/calcium/realloc_test.go

@@ -269,7 +269,6 @@ func TestRealloc(t *testing.T) {
 
 func TestReallocBindCpu(t *testing.T) {
 	c := NewTestCluster()
-	c.config.Scheduler.ShareBase = 100
 	ctx := context.Background()
 	store := &storemocks.Store{}
 	c.store = store

cluster/calcium/container.go cluster/calcium/workload.go

@@ -183,6 +183,7 @@ message Workload {
     string image = 8;
     WorkloadStatus status = 9;
     Resource resource = 10;
+    int64 create_time = 11;
 }
 
 message WorkloadStatus {

cluster/calcium/container_test.go cluster/calcium/workload_test.go

@@ -479,6 +479,7 @@ func toRPCWorkload(_ context.Context, c *types.Workload) (*pb.Workload, error) {
 		Image:      c.Image,
 		Labels:     c.Labels,
 		Status:     toRPCWorkloadStatus(c.StatusMeta),
+		CreateTime: c.CreateTime,
 		Resource: &pb.Resource{
 			CpuQuotaLimit:     c.CPUQuotaLimit,
 			CpuQuotaRequest:   c.CPUQuotaRequest,

rpc/gen/core.pb.go

@@ -158,7 +158,7 @@ func (m *Mercury) ListNodeWorkloads(ctx context.Context, nodename string, labels
 	for _, ev := range resp.Kvs {
 		workload := &types.Workload{}
 		if err := json.Unmarshal(ev.Value, workload); err != nil {
-			return []*types.Workload{}, err
+			return nil, err
 		}
 		if utils.FilterWorkload(workload.Labels, labels) {
 			workloads = append(workloads, workload)

rpc/gen/core.proto

@@ -34,11 +34,11 @@ type Workload struct {
 	Nodename   string            `json:"nodename"`
 	Hook       *Hook             `json:"hook"`
 	Privileged bool              `json:"privileged"`
-	SoftLimit  bool              `json:"softlimit"`
 	User       string            `json:"user"`
 	Env        []string          `json:"env"`
 	Image      string            `json:"image"`
 	Labels     map[string]string `json:"labels"`
+	CreateTime int64             `json:"create_time"`
 	StatusMeta *StatusMeta       `json:"-"`
 	Engine     engine.API        `json:"-"`
 }