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

k8s-ci-robot · web-flow · commit 719626bff535 · 2023-08-03T13:06:21.000-07:00
[release-1.9] 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
@@ -584,7 +584,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
`@@ -584,7 +584,7 @@ func (gceCS *GCEControllerServer) executeControllerPublishVolume(ctx context.Con`
`584`	`584`	`if gce.IsGCENotFoundError(err) {`
`585`	`585`	`return nil, status.Errorf(codes.NotFound, "Could not find disk %v: %v", volKey.String(), err.Error()), diskType`
`586`	`586`	`}`
`587`		`- return nil, status.Errorf(codes.Internal, "Failed to getDisk: %v", err.Error()), diskType`
	`587`	`+ return nil, common.LoggedError("Failed to getDisk: ", err), diskType`
`588`	`588`	`}`
`589`	`589`	`instanceZone, instanceName, err := common.NodeIDToZoneAndName(nodeID)`
`590`	`590`	`if err != nil {`