-
Notifications
You must be signed in to change notification settings - Fork 251
Avoid re-creating pre-existing folders. #3295
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
adreed-msft
wants to merge
2
commits into
main
Choose a base branch
from
adreed/folder-overcreation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -1,6 +1,7 @@ | ||||||||
| package ste | ||||||||
|
|
||||||||
| import ( | ||||||||
| "errors" | ||||||||
| "fmt" | ||||||||
| "net/url" | ||||||||
| "strings" | ||||||||
|
|
@@ -31,17 +32,21 @@ func NewTransferFetcher(jobMgr IJobMgr) TransferFetcher { | |||||||
|
|
||||||||
| // NewFolderCreationTracker creates a folder creation tracker taking in a TransferFetcher (typically created by NewTransferFetcher) | ||||||||
| // A TransferFetcher is used in place of an IJobMgr to make testing easier to implement. | ||||||||
| func NewFolderCreationTracker(fpo common.FolderPropertyOption, fetcher TransferFetcher) FolderCreationTracker { | ||||||||
| switch fpo { | ||||||||
| case common.EFolderPropertiesOption.AllFolders(), | ||||||||
| common.EFolderPropertiesOption.AllFoldersExceptRoot(): | ||||||||
| func NewFolderCreationTracker(fpo common.FolderPropertyOption, fetcher TransferFetcher, fromTo common.FromTo) FolderCreationTracker { | ||||||||
| switch { | ||||||||
| // create a folder tracker when we're persisting properties | ||||||||
| case fpo == common.EFolderPropertiesOption.AllFolders(), | ||||||||
| fpo == common.EFolderPropertiesOption.AllFoldersExceptRoot(), | ||||||||
| // create a folder tracker for destinations where we don't want to spam the service with create requests | ||||||||
| // on folders that already exist | ||||||||
| fromTo.To().IsFile(), | ||||||||
| fromTo.To() == common.ELocation.BlobFS(): | ||||||||
| return &jpptFolderTracker{ // This prevents a dependency cycle. Reviewers: Are we OK with this? Can you think of a better way to do it? | ||||||||
| fetchTransfer: fetcher, | ||||||||
| mu: &sync.Mutex{}, | ||||||||
| contents: make(map[string]JpptFolderIndex), | ||||||||
| unregisteredButCreated: make(map[string]struct{}), | ||||||||
| fetchTransfer: fetcher, | ||||||||
| mu: &sync.Mutex{}, | ||||||||
| contents: make(map[string]*JpptFolderTrackerState), | ||||||||
| } | ||||||||
| case common.EFolderPropertiesOption.NoFolders(): | ||||||||
| case fpo == common.EFolderPropertiesOption.NoFolders(): | ||||||||
| // can't use simpleFolderTracker here, because when no folders are processed, | ||||||||
| // then StopTracking will never be called, so we'll just use more and more memory for the map | ||||||||
| return &nullFolderTracker{} | ||||||||
|
|
@@ -69,15 +74,10 @@ func (f *nullFolderTracker) StopTracking(folder string) { | |||||||
|
|
||||||||
| type jpptFolderTracker struct { | ||||||||
| // fetchTransfer is used instead of a IJobMgr reference to support testing | ||||||||
| fetchTransfer func(index JpptFolderIndex) *JobPartPlanTransfer | ||||||||
| mu *sync.Mutex | ||||||||
| contents map[string]JpptFolderIndex | ||||||||
| unregisteredButCreated map[string]struct{} | ||||||||
| } | ||||||||
| fetchTransfer func(index JpptFolderIndex) *JobPartPlanTransfer | ||||||||
| mu *sync.Mutex | ||||||||
|
|
||||||||
| type JpptFolderIndex struct { | ||||||||
| PartNum PartNumber | ||||||||
| TransferIndex uint32 | ||||||||
| contents map[string]*JpptFolderTrackerState | ||||||||
| } | ||||||||
|
|
||||||||
| func (f *jpptFolderTracker) RegisterPropertiesTransfer(folder string, partNum PartNumber, transferIndex uint32) { | ||||||||
|
|
@@ -88,16 +88,34 @@ func (f *jpptFolderTracker) RegisterPropertiesTransfer(folder string, partNum Pa | |||||||
| return // Never persist to dev-null | ||||||||
| } | ||||||||
|
|
||||||||
| f.contents[folder] = JpptFolderIndex{ | ||||||||
| state, present := f.contents[folder] | ||||||||
|
|
||||||||
| if !present { | ||||||||
| state = &JpptFolderTrackerState{} | ||||||||
| } | ||||||||
|
|
||||||||
| state.Index = &JpptFolderIndex{ | ||||||||
| PartNum: partNum, | ||||||||
| TransferIndex: transferIndex, | ||||||||
| } | ||||||||
|
|
||||||||
| // We created it before it was enumerated-- Let's register that now. | ||||||||
| if _, ok := f.unregisteredButCreated[folder]; ok { | ||||||||
| f.fetchTransfer(JpptFolderIndex{PartNum: partNum, TransferIndex: transferIndex}).SetTransferStatus(common.ETransferStatus.FolderCreated(), false) | ||||||||
| // if our transfer already has a created status, we should adopt that. | ||||||||
| if ts := f.fetchTransfer(*state.Index).TransferStatus(); ts == ts.FolderCreated() { | ||||||||
|
||||||||
| if ts := f.fetchTransfer(*state.Index).TransferStatus(); ts == ts.FolderCreated() { | |
| if ts := f.fetchTransfer(*state.Index).TransferStatus(); ts == common.ETransferStatus.FolderCreated() { |
Copilot
AI
Nov 17, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When a new state is created (line 153) for a folder that isn't already in f.contents, it needs to be stored in the map. After updating the state's Status field (lines 156-160), add f.contents[folder] = state before line 174 to persist the state. Without this, the state is lost and subsequent calls to CreateFolder for the same folder won't see the previous status, defeating the purpose of tracking folder creation.
Suggested change
| f.contents[folder] = state |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment is misleading. The error is returned after doCreation has already been called and attempted to create the folder. It signals that the folder already existed, not that creation should be skipped. Consider rewording to: "FolderCreationErrorAlreadyExists is a signalling error that should be returned by doCreation when the folder already exists, allowing the tracker to mark it as FolderExisted rather than FolderCreated."