Merge pull request #1550 from umagnus/fix_clone_sas

andyzhangx · web-flow · commit b471b1a01a78 · 2024-08-16T20:03:30.000+08:00
fix: volume cloning sas token logged
diff --git a/pkg/blob/controllerserver.go b/pkg/blob/controllerserver.go
@@ -799,7 +799,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
`@@ -799,7 +799,7 @@ func (d Driver) copyBlobContainer(ctx context.Context, req csi.CreateVolumeReq`
`799`	`799`	`}`
`800`	`800`	`timeoutFunc := func() error {`
`801`	`801`	`_, percent, _ := d.azcopy.GetAzcopyJob(dstContainerName, authAzcopyEnv)`
`802`		`- return fmt.Errorf("timeout waiting for copy blob container %s to %s complete, current copy percent: %s%%", srcPath, dstContainerName, percent)`
	`802`	`+ return fmt.Errorf("timeout waiting for copy blob container %s to %s complete, current copy percent: %s%%", srcContainerName, dstContainerName, percent)`
`803`	`803`	`}`
`804`	`804`	`copyErr := util.WaitUntilTimeout(time.Duration(d.waitForAzCopyTimeoutMinutes)*time.Minute, execFunc, timeoutFunc)`
`805`	`805`	`if copyErr != nil {`