Merge pull request #1703 from Azure/dev

Patch 10.14.1

ChangeLog.md

@@ -1,6 +1,12 @@
 
 # Change Log
 
+## Version 10.14.1
+
+### Bug fixes
+1. Fixed issue #1625 where a panic occurs during sync scanning. 
+2. Fixed remove issue when account has versioning enabled. 
+
 ## Version 10.14.0
 
 ### New features

cmd/zc_traverser_blob.go

@@ -376,9 +376,10 @@ func (t *blobTraverser) createStoredObjectForBlob(preprocessor objectMorpher, bl
 		containerName,
 	)
 
-	object.blobSnapshotID = blobInfo.Snapshot
 	object.blobDeleted = blobInfo.Deleted
-	if blobInfo.VersionID != nil {
+	if t.includeDeleted && t.includeSnapshot {
+		object.blobSnapshotID = blobInfo.Snapshot
+	} else if t.includeDeleted && t.includeVersion && blobInfo.VersionID != nil {
 		object.blobVersionID = *blobInfo.VersionID
 	}
 	return object

cmd/zc_traverser_local.go

@@ -341,9 +341,12 @@ func (t *localTraverser) Traverse(preprocessor objectMorpher, processor objectPr
 
 				var entityType common.EntityType
 				if fileInfo.IsDir() {
-					fileInfo, err = WrapFolder(filePath, fileInfo)
+					newFileInfo, err := WrapFolder(filePath, fileInfo)
 					if err != nil {
 						WarnStdoutAndScanningLog(fmt.Sprintf("Failed to get last change of target at %s: %s", filePath, err))
+					} else {
+						// fileInfo becomes nil in case we fail to wrap folder.
+						fileInfo = newFileInfo
 					}
 
 					entityType = common.EEntityType.Folder()

common/version.go

@@ -1,6 +1,6 @@
 package common
 
-const AzcopyVersion = "10.14.0"
+const AzcopyVersion = "10.14.1"
 const UserAgent = "AzCopy/" + AzcopyVersion
 const S3ImportUserAgent = "S3Import " + UserAgent
 const GCPImportUserAgent = "GCPImport " + UserAgent

testSuite/scripts/run.py

@@ -17,7 +17,6 @@
 from test_autodetect_blob_type import *
 from test_file_sync import *
 from test_file_copy import *
-from test_clfsload import *
 from test_google_cloud_storage_copy import *
 import glob, os
 import configparser
@@ -212,8 +211,7 @@ def main():
     print("Smoke tests starting...")
     init()
 
-    test_class_to_run = [LoadUserScenario,
-                         BlobPipingTests,
+    test_class_to_run = [BlobPipingTests,
                          File_Service_2_Service_Copy_User_Scenario,
                          Blob_Sync_User_Scenario,
                          File_Sync_User_Scenario,