add todo to protect storage cap data

projecteru2 · Feb 3, 2023 · ba89945 · ba89945
1 parent 2de4977
commit ba89945
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/storage/node.go b/storage/node.go
@@ -105,6 +105,7 @@ func (p Plugin) GetNodesDeployCapacity(ctx context.Context, nodenames []string,
 }
 
 func (p Plugin) SetNodeResourceCapacity(ctx context.Context, nodename string, resource plugintypes.NodeResource, resourceRequest plugintypes.NodeResourceRequest, delta bool, incr bool) (resourcetypes.RawParams, error) {
+	// TODO both nil should do nothing
 	logger := log.WithFunc("resource.storage.SetNodeResourceCapacity").WithField("node", "nodename")
 	req, nodeResource, _, nodeResourceInfo, err := p.parseNodeResourceInfos(ctx, nodename, resource, resourceRequest, nil)
 	if err != nil {

diff --git a/storage/types/node.go b/storage/types/node.go
@@ -91,13 +91,11 @@ func (n *NodeResourceInfo) Validate() error {
 		return n.Capacity.Disks[i].Device < n.Capacity.Disks[j].Device
 	})
 
-	if err := n.validateVolume(); err != nil {
-		return err
-	}
-	if err := n.validateStorage(); err != nil {
-		return err
-	}
-	return n.validateDisks()
+	return errors.CombineErrors(
+		errors.CombineErrors(
+			n.validateVolume(),
+			n.validateStorage()),
+		n.validateDisks())
 }
 
 // GetAvailableResource .