Merge branch 'volume-cloning-feature' of https://github.com/amacaskill/gcp-compute-persistent-disk-csi-driver into volume-cloning-feature

amacaskill · amacaskill · commit fd61efd78670 · 2021-10-26T18:12:44.000Z
diff --git a/pkg/gce-pd-csi-driver/controller.go b/pkg/gce-pd-csi-driver/controller.go
@@ -181,7 +181,7 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 		}
 
 		if !ready {
-			return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume disk %v is not ready", volKey))
+			return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume existing disk %v is not ready", volKey))
 		}
 
 		// If there is no validation error, immediately return success
@@ -266,7 +266,7 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 		return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume disk %v had error checking ready status: %v", volKey, err))
 	}
 	if !ready {
-		return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume disk %v is not ready", volKey))
+		return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume new disk %v is not ready", volKey))
 	}
 
 	klog.V(4).Infof("CreateVolume succeeded for disk %v", volKey)

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ func (gceCS GCEControllerServer) CreateVolume(ctx context.Context, req csi.Cre`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`if !ready {`
`184`		`- return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume disk %v is not ready", volKey))`
	`184`	`+ return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume existing disk %v is not ready", volKey))`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`// If there is no validation error, immediately return success`
`@@ -266,7 +266,7 @@ func (gceCS GCEControllerServer) CreateVolume(ctx context.Context, req csi.Cre`
`266`	`266`	`return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume disk %v had error checking ready status: %v", volKey, err))`
`267`	`267`	`}`
`268`	`268`	`if !ready {`
`269`		`- return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume disk %v is not ready", volKey))`
	`269`	`+ return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume new disk %v is not ready", volKey))`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`klog.V(4).Infof("CreateVolume succeeded for disk %v", volKey)`