fix

Author: umagnus

pkg/azurefile/azurefile.go

@@ -914,7 +914,7 @@ func (d *Driver) CopyFileShare(ctx context.Context, req *csi.CreateVolumeRequest
 			accountSasToken, err := getAccountSasToken(secrets, accountName)
 			if err != nil || accountSasToken == "" {
 				klog.V(2).Infof("get account sas token from secrets err: %s, generate sas token for account(%s)", err.Error(), accountName)
-				accountSasToken, err = GenerateSASToken(accountName, accountKey, storageEndpointSuffix)
+				accountSasToken, err = generateSASToken(accountName, accountKey, storageEndpointSuffix)
 				if err != nil {
 					return true, err
 				}
@@ -929,6 +929,7 @@ func (d *Driver) CopyFileShare(ctx context.Context, req *csi.CreateVolumeRequest
 			srcPath := fmt.Sprintf("https://%s.file.%s/%s%s", accountName, storageEndpointSuffix, srcFileShareName, accountSasToken)
 			dstPath := fmt.Sprintf("https://%s.file.%s/%s%s", accountName, storageEndpointSuffix, dstFileShareName, accountSasToken)
 
+			time.Sleep(1 * time.Second)
 			klog.V(2).Infof("copy fileshare %s to %s", srcFileShareName, dstFileShareName)
 			out, copyErr = exec.Command("azcopy", "copy", srcPath, dstPath, "--recursive", "--check-length=false").CombinedOutput()
 			if copyErr != nil {
@@ -942,7 +943,7 @@ func (d *Driver) CopyFileShare(ctx context.Context, req *csi.CreateVolumeRequest
 			klog.V(2).Infof("copied fileshare %s to %s successfully", srcFileShareName, dstFileShareName)
 		} else {
 			klog.V(2).Infof("generate sas token for account(%s)", accountName)
-			accountSasToken, genErr := GenerateSASToken(accountName, accountKey, storageEndpointSuffix)
+			accountSasToken, genErr := generateSASToken(accountName, accountKey, storageEndpointSuffix)
 			if genErr != nil {
 				return true, genErr
 			}
@@ -952,6 +953,7 @@ func (d *Driver) CopyFileShare(ctx context.Context, req *csi.CreateVolumeRequest
 			srcPath := fmt.Sprintf("https://%s.file.%s/%s%s", accountName, storageEndpointSuffix, srcFileShareName, accountSasToken)
 			dstPath := fmt.Sprintf("https://%s.file.%s/%s%s", accountName, storageEndpointSuffix, dstFileShareName, accountSasToken)
 
+			time.Sleep(1 * time.Second)
 			klog.V(2).Infof("copy fileshare %s to %s", srcFileShareName, dstFileShareName)
 			out, copyErr = exec.Command("azcopy", "copy", srcPath, dstPath, "--recursive", "--check-length=false").CombinedOutput()
 			if copyErr != nil {

pkg/azurefile/controllerserver.go

@@ -1221,7 +1221,7 @@ func isValidVolumeCapabilities(volCaps []*csi.VolumeCapability) error {
 	return nil
 }
 
-func GenerateSASToken(accountName, accountKey, storageEndpointSuffix string) (string, error) {
+func generateSASToken(accountName, accountKey, storageEndpointSuffix string) (string, error) {
 	credential, err := service.NewSharedKeyCredential(accountName, accountKey)
 	if err != nil {
 		return "", status.Errorf(codes.Internal, fmt.Sprintf("failed to generate sas token in creating new shared key credential, accountName: %s, accountKey: %s, err: %s", accountName, accountKey, err.Error()))