add ERU_CPU env to containers for their perception

Author: jschwinger233

cluster/calcium/create.go

@@ -2,6 +2,7 @@ package calcium
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"sync"
 	"time"
@@ -202,8 +203,8 @@ func (c *Calcium) doDeployWorkloadsOnNode(ctx context.Context, ch chan *types.Cr
 	// remap 就不搞进事务了吧, 回滚代价太大了
 	// 放任 remap 失败的后果是, share pool 没有更新, 这个后果姑且认为是可以承受的
 	// 而且 remap 是一个幂等操作, 就算这次 remap 失败, 下次 remap 也能收敛到正确到状态
-	if err := c.withNodeLocked(ctx, nodename, func(ctx context.Context, node *types.Node) error {
-		c.doRemapResourceAndLog(ctx, logger, node)
+	if err := c.withNodeLocked(context.Background(), nodename, func(ctx context.Context, node *types.Node) error {
+		c.doRemapResourceAndLog(context.Background(), logger, node)
 		return nil
 	}); err != nil {
 		logger.Errorf("failed to lock node to remap: %v", err)
@@ -408,6 +409,10 @@ func (c *Calcium) doMakeWorkloadOptions(no int, msg *types.CreateWorkloadMessage
 	env = append(env, fmt.Sprintf("ERU_WORKLOAD_SEQ=%d", no))
 	env = append(env, fmt.Sprintf("ERU_MEMORY=%d", msg.MemoryLimit))
 	env = append(env, fmt.Sprintf("ERU_STORAGE=%d", msg.StorageLimit))
+	if msg.CPU != nil {
+		bs, _ := json.Marshal(msg.CPU)
+		env = append(env, fmt.Sprintf("ERU_CPU=%s", bs))
+	}
 	config.Env = env
 	// basic labels, bind to LabelMeta
 	config.Labels = map[string]string{

cluster/calcium/dissociate.go

@@ -57,7 +57,7 @@ func (c *Calcium) DissociateWorkload(ctx context.Context, ids []string) (chan *t
 					}
 					ch <- msg
 				}
-				c.doRemapResourceAndLog(ctx, logger, node)
+				c.doRemapResourceAndLog(context.Background(), logger, node)
 				return nil
 			}); err != nil {
 				logger.WithField("nodename", nodename).Errorf("failed to lock node: %+v", err)

cluster/calcium/realloc.go

@@ -101,7 +101,7 @@ func (c *Calcium) doReallocOnNode(ctx context.Context, nodename string, workload
 			return
 		}
 
-		c.doRemapResourceAndLog(ctx, log.WithField("Calcium", "doReallocOnNode"), node)
+		c.doRemapResourceAndLog(context.Background(), log.WithField("Calcium", "doReallocOnNode"), node)
 		return nil
 	})
 }

cluster/calcium/remove.go

@@ -66,7 +66,7 @@ func (c *Calcium) RemoveWorkload(ctx context.Context, ids []string, force bool,
 						}
 						ch <- ret
 					}
-					c.doRemapResourceAndLog(ctx, logger, node)
+					c.doRemapResourceAndLog(context.Background(), logger, node)
 					return nil
 				}); err != nil {
 					logger.WithField("nodename", nodename).Errorf("failed to lock node: %+v", err)

cluster/calcium/replace.go

@@ -199,7 +199,7 @@ func (c *Calcium) doReplaceWorkload(
 	}
 
 	if err := c.withNodeLocked(ctx, node.Name, func(ctx context.Context, node *types.Node) error {
-		c.doRemapResourceAndLog(ctx, log.WithField("Calcium", "doReplaceWorkload"), node)
+		c.doRemapResourceAndLog(context.Background(), log.WithField("Calcium", "doReplaceWorkload"), node)
 		return nil
 	}); err != nil {
 		log.Errorf("[replaceAndRemove] failed to lock node to remap: %v", err)