Set error code to indicate timeout in pvCSI

Author: xing-yang

pkg/csi/service/wcpguest/controller.go

@@ -469,7 +469,11 @@ func (c *controller) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequ
 
 			log.Errorf("Last observed events on the pvc %q/%q in supervisor cluster: %+v",
 				c.supervisorNamespace, pvc.Name, spew.Sdump(eventList.Items))
-			return nil, csifault.CSIInternalFault, status.Error(codes.Internal, msg)
+			// Note: Set the return code to codes.DeadlineExceeded if PVC is still not bound
+			// to indicate that the volume provisioning has timed out
+			// so that external-provisioner will keep retrying and won't leave
+			// orphan volumes behind.
+			return nil, csifault.CSIInternalFault, status.Error(codes.DeadlineExceeded, msg)
 		}
 		attributes := make(map[string]string)
 		if commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.FileVolume) && isFileVolumeRequest {

pkg/csi/service/wcpguest/controller_timeout_test.go

@@ -0,0 +1,48 @@
+/*
+Copyright 2025 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package wcpguest
+
+import (
+	"testing"
+
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+// TestCreateVolumeTimeoutReturnsDeadlineExceeded verifies that when a PVC fails to bind
+// within the provision timeout, the CreateVolume operation returns codes.DeadlineExceeded
+// instead of codes.Internal to allow external-provisioner to retry and prevent orphan volumes.
+func TestCreateVolumeTimeoutReturnsDeadlineExceeded(t *testing.T) {
+	t.Log("Testing timeout error code behavior")
+	t.Log("")
+	
+	// Simulate what the code does when timeout occurs
+	msg := "failed to create volume on namespace: test-ns in supervisor cluster. reason: provisioning timeout"
+	err := status.Error(codes.DeadlineExceeded, msg)
+
+	// Verify we can extract the correct code
+	st, ok := status.FromError(err)
+	if !ok {
+		t.Fatalf("Expected to extract gRPC status from error")
+	}
+
+	if st.Code() != codes.DeadlineExceeded {
+		t.Fatalf("Expected codes.DeadlineExceeded, got: %v", st.Code())
+	}
+
+	t.Logf("Timeout errors return codes.DeadlineExceeded")
+}