From ae325472890bcdc1bb8232029cab7e89d7f8b452 Mon Sep 17 00:00:00 2001 From: Narasimha Kulkarni Date: Tue, 8 Mar 2022 19:52:55 -0800 Subject: [PATCH 1/4] Disable CLFS test (#1699) --- testSuite/scripts/run.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/testSuite/scripts/run.py b/testSuite/scripts/run.py index 2ead2bd4f..899b8e37e 100644 --- a/testSuite/scripts/run.py +++ b/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, From 4734bb52383bb16c4847232c2ef0e1f5dbc59bd8 Mon Sep 17 00:00:00 2001 From: Mohit Sharma <65536214+mohsha-msft@users.noreply.github.com> Date: Thu, 10 Mar 2022 09:56:29 +0530 Subject: [PATCH 2/4] Fix #Issue 1625 (#1662) --- cmd/zc_traverser_local.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/zc_traverser_local.go b/cmd/zc_traverser_local.go index 0123ff2ce..543125539 100644 --- a/cmd/zc_traverser_local.go +++ b/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() From 2e777ba34003d3eb02ecdf711c66b26632e8b651 Mon Sep 17 00:00:00 2001 From: siminsavani-msft <77068571+siminsavani-msft@users.noreply.github.com> Date: Fri, 11 Mar 2022 16:37:49 -0500 Subject: [PATCH 3/4] Fix for Perm Delete (#1700) * Including vid and sid only if needed * Resolving comment * Minor modification --- cmd/zc_traverser_blob.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/zc_traverser_blob.go b/cmd/zc_traverser_blob.go index 147360002..0e6cf11b9 100644 --- a/cmd/zc_traverser_blob.go +++ b/cmd/zc_traverser_blob.go @@ -377,9 +377,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 From 1087e51f933add63aa994d26655d807ebc5289ee Mon Sep 17 00:00:00 2001 From: Ze Qian Zhang Date: Fri, 11 Mar 2022 13:43:05 -0800 Subject: [PATCH 4/4] Updated changelog for 10.14.1 --- ChangeLog.md | 6 ++++++ common/version.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 8bef5187c..0804d2239 100644 --- a/ChangeLog.md +++ b/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 diff --git a/common/version.go b/common/version.go index d86334f6d..f505d2334 100644 --- a/common/version.go +++ b/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