bugfix: dispense hard volume (#311)

projecteru2 · Jan 7, 2021 · 9a9165c · 9a9165c
1 parent c31e6ee
commit 9a9165c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/resources/volume/volume.go b/resources/volume/volume.go
@@ -157,11 +157,12 @@ func (rp ResourcePlans) RollbackChangesOnNode(node *types.Node, indices ...int)
 
 // Dispense .
 func (rp ResourcePlans) Dispense(opts resourcetypes.DispenseOptions, r *types.ResourceMeta) (*types.ResourceMeta, error) {
+	r.VolumeRequest = rp.request
+	r.VolumeLimit = rp.limit
 	if len(rp.plan) == 0 {
 		return r, nil
 	}
 
-	r.VolumeRequest = rp.request
 	r.VolumePlanRequest = rp.plan[opts.Node.Name][opts.Index]
 
 	// if there are existing ones, ensure new volumes are compatible
@@ -181,7 +182,6 @@ func (rp ResourcePlans) Dispense(opts resourcetypes.DispenseOptions, r *types.Re
 	}
 
 	// fix plans while limit > request
-	r.VolumeLimit = rp.limit
 	r.VolumePlanLimit = types.VolumePlan{}
 	for i := range rp.request {
 		request, limit := rp.request[i], rp.limit[i]