Merge pull request #1380 from k8s-infra-cherrypick-robot/cherry-pick-1255-to-release-1.8

mattcary · web-flow · commit 5af16b9c3e4d · 2023-09-27T12:07:10.000-07:00
[release-1.8] Filter out user errors from GetDisk error returned from ControllerPublishVolume
diff --git a/pkg/gce-pd-csi-driver/controller.go b/pkg/gce-pd-csi-driver/controller.go
@@ -570,7 +570,7 @@ func (gceCS *GCEControllerServer) executeControllerPublishVolume(ctx context.Con
 		if gce.IsGCENotFoundError(err) {
 			return nil, status.Errorf(codes.NotFound, "Could not find disk %v: %v", volKey.String(), err.Error()), diskType
 		}
-		return nil, status.Errorf(codes.Internal, "Failed to getDisk: %v", err.Error()), diskType
+		return nil, common.LoggedError("Failed to getDisk: ", err), diskType
 	}
 	instanceZone, instanceName, err := common.NodeIDToZoneAndName(nodeID)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,7 @@ func (gceCS *GCEControllerServer) executeControllerPublishVolume(ctx context.Con`
`570`	`570`	`if gce.IsGCENotFoundError(err) {`
`571`	`571`	`return nil, status.Errorf(codes.NotFound, "Could not find disk %v: %v", volKey.String(), err.Error()), diskType`
`572`	`572`	`}`
`573`		`- return nil, status.Errorf(codes.Internal, "Failed to getDisk: %v", err.Error()), diskType`
	`573`	`+ return nil, common.LoggedError("Failed to getDisk: ", err), diskType`
`574`	`574`	`}`
`575`	`575`	`instanceZone, instanceName, err := common.NodeIDToZoneAndName(nodeID)`
`576`	`576`	`if err != nil {`