This repository has been archived by the owner on Sep 11, 2020. It is now read-only.
filesystem: ObjectStorage, MaxOpenDescriptors option #1123
Merged
Conversation
This file contains 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
saracen
force-pushed
the
object-storage-open-packfile
branch
from
f3434ce
to
42bbcaf
Compare
This was referenced Apr 21, 2019
jfontan
approved these changes
Apr 22, 2019
|
LGTM. Thanks! |
mcuadros
reviewed
Apr 22, 2019
storage/filesystem/object.go
Outdated
| @@ -187,6 +191,57 @@ func (s *ObjectStorage) encodedObjectSizeFromUnpacked(h plumbing.Hash) ( | |||
| return size, err | |||
| } | |||
|
|
|||
| func (s *ObjectStorage) packfile(idx idxfile.Index, pack plumbing.Hash) (*packfile.Packfile, error) { | |||
| if s.packfiles == nil { | |||
| if s.options.MaxOpenDescriptors > 0 { | |||
There was a problem hiding this comment.
can you move this logic to a function? in general review this long function
There was a problem hiding this comment.
I've now split it up so the code that handles what is more clearly defined. At the start we check to see if the packfile is cached with packfileFromCache, at the end we do storePackfileInCache if a new packfile was opened.
storePackfileInCache is still fairly long, but I think it's easier to follow now. Early returns when it can and then handles the freelist behavior.
saracen
force-pushed
the
object-storage-open-packfile
branch
from
42bbcaf
to
f5c23da
Compare
The MaxOpenDescriptors option provides a middle ground solution between keeping all packfiles open (as offered by the KeepDescriptors option) and keeping none open. Signed-off-by: Arran Walker <arran.walker@fiveturns.org>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The
MaxOpenDescriptorsoption provides a middle ground solution between keeping all pack files open (as offered by theKeepDescriptorsoption) and keeping none open.This PR is a modification of #1109. This version moves to keeping packfile objects around, rather than just the open file. Whilst updating this, PR #1120 was opened that offers effectively the same solution to that problem. But there's a few other changes here in relation to that, too:
KeepDescriptorswhen callingNewStorageWithOptionsno longer passes the option to dotgit, as there's little point in keeping a map of open files in both locations.objectPackPath(using path.Join) isn't as fast as you'd imagine.