fix reschedule issue

projecteru2 · Feb 1, 2023 · 2de4977 · 2de4977
1 parent 16f8ff4
commit 2de4977
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmd/calculate/realloc.go b/cmd/calculate/realloc.go
@@ -24,7 +24,7 @@ func calculateRealloc(c *cli.Context) error {
 			return nil, types.ErrEmptyNodeName
 		}
 
-		workloadResource := in.RawParams("workload_request")
+		workloadResource := in.RawParams("workload_resource")
 		workloadResourceRequest := in.RawParams("workload_resource_request")
 
 		return s.CalculateRealloc(c.Context, nodename, workloadResource, workloadResourceRequest)

diff --git a/storage/calculate.go b/storage/calculate.go
@@ -53,14 +53,16 @@ func (p Plugin) CalculateRealloc(ctx context.Context, nodename string, resource
 	if err := originResource.Parse(resource); err != nil {
 		return nil, err
 	}
-
 	resourceInfo, err := p.doGetNodeResourceInfo(ctx, nodename)
 	if err != nil {
 		logger.Error(ctx, err, "failed to get resource info of node")
 		return nil, err
 	}
 
 	// check if volume rescheduling is needed
+	if req.VolumesRequest == nil {
+		req.VolumesRequest = req.VolumesLimit
+	}
 	needVolumeReschedule := utils.Any(req.VolumesRequest, func(volume *storagetypes.VolumeBinding) bool { return volume.RequireSchedule() || volume.RequireIOPS() })
 
 	req = &storagetypes.WorkloadResourceRequest{