improve logs

Author: umagnus

pkg/azurefile/azurefile.go

@@ -931,21 +931,18 @@ func (d *Driver) copyFileShare(ctx context.Context, req *csi.CreateVolumeRequest
 	dstPath := fmt.Sprintf("https://%s.file.%s/%s%s", accountName, storageEndpointSuffix, dstFileShareName, accountSasToken)
 
 	jobState, percent, err := getAzcopyJob(dstFileShareName)
-	switch jobState {
-	case AzcopyJobError, AzcopyJobCompleted:
+	klog.V(2).Infof("azcopy job status: %s, copy percent: %s%, error: %v", jobState, percent, err)
+	if jobState == AzcopyJobError || jobState == AzcopyJobCompleted {
 		return err
-	case AzcopyJobRunning:
-		klog.V(2).Infof("azcopy job is in progress, copy percent: %s%", percent)
 	}
 	for {
 		select {
 		case <-timeTick:
 			jobState, percent, err := getAzcopyJob(dstFileShareName)
+			klog.V(2).Infof("azcopy job status: %s, copy percent: %s%, error: %v", jobState, percent, err)
 			switch jobState {
 			case AzcopyJobError, AzcopyJobCompleted:
 				return err
-			case AzcopyJobRunning:
-				klog.V(2).Infof("azcopy job is in progress, copy percent: %s%", percent)
 			case AzcopyJobNotFound:
 				klog.V(2).Infof("copy fileshare %s to %s", srcFileShareName, dstFileShareName)
 				out, copyErr := exec.Command("azcopy", "copy", srcPath, dstPath, "--recursive", "--check-length=false").CombinedOutput()

pkg/azurefile/utils.go

@@ -319,7 +319,6 @@ func getAzcopyJob(dstFileshare string) (AzcopyJobState, string, error) {
 		klog.Warningf("failed to get azcopy job with error: %v, jobState: %v", err, jobState)
 		return AzcopyJobError, "", fmt.Errorf("couldn't parse azcopy job show in azcopy %v", err)
 	}
-	klog.V(2).Infof("azcopy job is in progress, copy percent: %s%", percent)
 	return jobState, percent, nil
 }
 
@@ -344,7 +343,6 @@ func parseAzcopyJobList(joblist string, dstFileShareName string) (string, Azcopy
 		case "InProgress":
 			jobid = segments[0]
 		case "Completed":
-			klog.V(2).Infof("azcopy job is completed, copied fileshare to %s successfully", dstFileShareName)
 			return jobid, AzcopyJobCompleted, nil
 		}
 	}