unixfs autosharding with config #8527
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,6 +19,8 @@ import ( | |
| offline "github.com/ipfs/go-ipfs-exchange-offline" | ||
| offroute "github.com/ipfs/go-ipfs-routing/offline" | ||
| uio "github.com/ipfs/go-unixfs/io" | ||
|
|
||
| "github.com/dustin/go-humanize" | ||
| "go.uber.org/fx" | ||
| ) | ||
|
|
||
|
|
@@ -316,8 +318,20 @@ func IPFS(ctx context.Context, bcfg *BuildCfg) fx.Option { | |
| return bcfgOpts // error | ||
| } | ||
|
|
||
| // Auto-sharding settings | ||
| shardSizeString := cfg.Internal.UnixFSShardingSizeThreshold.WithDefault("256kiB") | ||
| shardSizeInt, err := humanize.ParseBytes(shardSizeString) | ||
| if err != nil { | ||
| return fx.Error(err) | ||
| } | ||
| uio.HAMTShardingSize = int(shardSizeInt) | ||
|
|
||
| // Migrate users of deprecated Experimental.ShardingEnabled flag | ||
| if cfg.Experimental.ShardingEnabled { | ||
| logger.Fatal("The `Experimental.ShardingEnabled` field is no longer used, please remove it from the config.\n" + | ||
| "go-ipfs now automatically shards when directory block is bigger than `" + shardSizeString + "`.\n" + | ||
| "If you need to restore the old behavior (sharding everything) set `Internal.UnixFSShardingSizeThreshold` to `1B`.\n") | ||
| } | ||
|
Comment on lines
+329
to
+334
There was a problem hiding this comment. ℹ️ This provides a migration path for existing users that have experiment enabled. There was a problem hiding this comment. Thanks. This seems like the best we can get. There's no way to warn anybody who explicitly wanted sharding to stay off since that flag didn't have no way to denote "unset" which is what we're moving towards now. |
||
|
|
||
| return fx.Options( | ||
| bcfgOpts, | ||
|
|
||
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
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
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
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
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
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.
TODO: use a version of interop that's on master