simplify volume dispense: compatible computing

projecteru2 · Nov 10, 2020 · d2b9d33 · d2b9d33
1 parent ab7e2a8
commit d2b9d33
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 311 deletions.
diff --git a/cluster/calcium/create.go b/cluster/calcium/create.go
@@ -101,7 +101,7 @@ func (c *Calcium) doCreateWorkloads(ctx context.Context, opts *types.DeployOptio
 				for nodename, rollbackIndices := range rollbackMap {
 					if e := c.withNodeLocked(ctx, nodename, func(node *types.Node) error {
 						for _, plan := range plans {
-							plan.RollbackChangesOnNode(node, rollbackIndices...)
+							plan.RollbackChangesOnNode(node, rollbackIndices...) // nolint:scopelint
 						}
 						return errors.WithStack(c.store.UpdateNodes(ctx, node))
 					}); e != nil {

diff --git a/cluster/calcium/realloc.go b/cluster/calcium/realloc.go
@@ -41,7 +41,7 @@ func (c *Calcium) doReallocOnNode(ctx context.Context, nodename string, containe
 		if err != nil {
 			return errors.WithStack(err)
 		}
-		if total != 1 {
+		if total < 1 {
 			return errors.WithStack(types.ErrInsufficientRes)
 		}
 
@@ -80,12 +80,9 @@ func (c *Calcium) doReallocOnNode(ctx context.Context, nodename string, containe
 func (c *Calcium) doReallocContainersOnInstance(ctx context.Context, node *types.Node, plans []resourcetypes.ResourcePlans, container *types.Container) (err error) {
 	r := &types.ResourceMeta{}
 	for _, plan := range plans {
-		// TODO@zc: single existing instance
-		// TODO@zc: no HardVolumeBindings
 		if r, err = plan.Dispense(resourcetypes.DispenseOptions{
-			Node:              node,
-			Index:             1,
-			ExistingInstances: []*types.Container{container},
+			Node:             node,
+			ExistingInstance: container,
 		}, r); err != nil {
 			return
 		}
@@ -131,7 +128,17 @@ func (c *Calcium) doReallocContainersOnInstance(ctx context.Context, node *types
 			if failureByCond {
 				return nil
 			}
-			return errors.WithStack(c.store.UpdateContainer(ctx, &originalContainer))
+			r := &enginetypes.VirtualizationResource{
+				CPU:           originalContainer.CPU,
+				Quota:         originalContainer.CPUQuotaLimit,
+				NUMANode:      originalContainer.NUMANode,
+				Memory:        originalContainer.MemoryLimit,
+				Volumes:       originalContainer.VolumeLimit.ToStringSlice(false, false),
+				VolumePlan:    originalContainer.VolumePlanLimit.ToLiteral(),
+				VolumeChanged: r.VolumeChanged,
+				Storage:       originalContainer.StorageLimit,
+			}
+			return errors.WithStack(node.Engine.VirtualizationUpdateResource(ctx, container.ID, r))
 		},
 
 		c.config.GlobalTimeout,