Merge pull request #1561 from k8s-infra-cherrypick-robot/cherry-pick-1550-to-release-1.24

k8s-ci-robot · web-flow · commit c15ec89fbb6f · 2024-08-30T04:17:31.000+01:00
[release-1.24] fix: volume cloning sas token logged
diff --git a/pkg/blob/controllerserver.go b/pkg/blob/controllerserver.go
@@ -794,7 +794,7 @@ func (d *Driver) copyBlobContainer(ctx context.Context, req *csi.CreateVolumeReq
 		}
 		timeoutFunc := func() error {
 			_, percent, _ := d.azcopy.GetAzcopyJob(dstContainerName, authAzcopyEnv)
-			return fmt.Errorf("timeout waiting for copy blob container %s to %s complete, current copy percent: %s%%", srcPath, dstContainerName, percent)
+			return fmt.Errorf("timeout waiting for copy blob container %s to %s complete, current copy percent: %s%%", srcContainerName, dstContainerName, percent)
 		}
 		copyErr := util.WaitUntilTimeout(time.Duration(d.waitForAzCopyTimeoutMinutes)*time.Minute, execFunc, timeoutFunc)
 		if copyErr != nil {

Original file line number	Diff line number	Diff line change
`@@ -794,7 +794,7 @@ func (d Driver) copyBlobContainer(ctx context.Context, req csi.CreateVolumeReq`
`794`	`794`	`}`
`795`	`795`	`timeoutFunc := func() error {`
`796`	`796`	`_, percent, _ := d.azcopy.GetAzcopyJob(dstContainerName, authAzcopyEnv)`
`797`		`- return fmt.Errorf("timeout waiting for copy blob container %s to %s complete, current copy percent: %s%%", srcPath, dstContainerName, percent)`
	`797`	`+ return fmt.Errorf("timeout waiting for copy blob container %s to %s complete, current copy percent: %s%%", srcContainerName, dstContainerName, percent)`
`798`	`798`	`}`
`799`	`799`	`copyErr := util.WaitUntilTimeout(time.Duration(d.waitForAzCopyTimeoutMinutes)*time.Minute, execFunc, timeoutFunc)`
`800`	`800`	`if copyErr != nil {`