Merge pull request #331 from pohly/resource-exhausted-fix

resource exhausted fix

Author: k8s-ci-robot

pkg/hostpath/controllerserver.go

@@ -139,7 +139,7 @@ func (hp *hostPath) CreateVolume(ctx context.Context, req *csi.CreateVolumeReque
 	kind := req.GetParameters()[storageKind]
 	vol, err := hp.createVolume(volumeID, req.GetName(), capacity, requestedAccessType, false /* ephemeral */, kind)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create volume %v: %w", volumeID, err)
+		return nil, err
 	}
 	glog.V(4).Infof("created volume %s at path %s", vol.VolID, vol.VolPath)
 

pkg/hostpath/hostpath.go

@@ -157,13 +157,12 @@ func (hp *hostPath) createVolume(volID, name string, cap int64, volAccessType st
 		}
 		if kind == "" {
 			// Still nothing?!
-			return nil, status.Errorf(codes.OutOfRange, "requested capacity %d of arbitrary storage exceeds all remaining capacity", cap)
+			return nil, status.Errorf(codes.ResourceExhausted, "requested capacity %d of arbitrary storage exceeds all remaining capacity", cap)
 		}
 		used := hp.sumVolumeSizes(kind)
 		available := hp.config.Capacity[kind]
 		if used+cap > available.Value() {
-
-			return nil, status.Errorf(codes.OutOfRange, "requested capacity %d exceeds remaining capacity for %q, %s out of %s already used",
+			return nil, status.Errorf(codes.ResourceExhausted, "requested capacity %d exceeds remaining capacity for %q, %s out of %s already used",
 				cap, kind, resource.NewQuantity(used, resource.BinarySI).String(), available.String())
 		}
 	} else if kind != "" {