-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add basic support for multiple blockstores as outlined in #3119.
Each datastore is mounted under a different mount point and a multi-blockstore is used to check each mount point for the block. The first mount checked of the multi-blockstore is considered the "cache", all others are considered read-only. This implies that the garbage collector only removes block from the first mount. This change also factors out the pinlock from the blockstore into its own structure. Only the multi-datastore now implements the GCBlockstore interface. In the future this could be separated out from the blockstore completely. For now caching is only done on the first mount, in the future this could be reworked. The bloom filter is the most problematic as the read-only mounts are not necessary immutable and can be changed by methods outside of the blockstore. Right now there is only one mount, but that will soon change once support for the filestore is added. License: MIT Signed-off-by: Kevin Atkinson <[email protected]>
- Loading branch information
Showing
10 changed files
with
231 additions
and
43 deletions.
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
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 |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| package blockstore | ||
|
|
||
| // A very simple multi-blockstore that analogous to a unionfs Put and | ||
| // DeleteBlock only go to the first blockstore all others are | ||
| // considered readonly. | ||
|
|
||
| import ( | ||
| //"errors" | ||
| "context" | ||
|
|
||
| blocks "github.com/ipfs/go-ipfs/blocks" | ||
| cid "gx/ipfs/QmXfiyr2RWEXpVDdaYnD2HNiBk6UBddsvEP4RPfXb6nGqY/go-cid" | ||
| ) | ||
|
|
||
| type MultiBlockstore interface { | ||
| Blockstore | ||
| GCLocker | ||
| FirstMount() Blockstore | ||
| Mounts() []string | ||
| Mount(prefix string) Blockstore | ||
| } | ||
|
|
||
| type Mount struct { | ||
| Prefix string | ||
| Blocks Blockstore | ||
| } | ||
|
|
||
| func NewMultiBlockstore(mounts ...Mount) *multiblockstore { | ||
| return &multiblockstore{ | ||
| mounts: mounts, | ||
| } | ||
| } | ||
|
|
||
| type multiblockstore struct { | ||
| mounts []Mount | ||
| gclocker | ||
| } | ||
|
|
||
| func (bs *multiblockstore) FirstMount() Blockstore { | ||
| return bs.mounts[0].Blocks | ||
| } | ||
|
|
||
| func (bs *multiblockstore) Mounts() []string { | ||
| mounts := make([]string, 0, len(bs.mounts)) | ||
| for _, mnt := range bs.mounts { | ||
| mounts = append(mounts, mnt.Prefix) | ||
| } | ||
| return mounts | ||
| } | ||
|
|
||
| func (bs *multiblockstore) Mount(prefix string) Blockstore { | ||
| for _, m := range bs.mounts { | ||
| if m.Prefix == prefix { | ||
| return m.Blocks | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (bs *multiblockstore) DeleteBlock(key *cid.Cid) error { | ||
| return bs.mounts[0].Blocks.DeleteBlock(key) | ||
| } | ||
|
|
||
| func (bs *multiblockstore) Has(c *cid.Cid) (bool, error) { | ||
| var firstErr error | ||
| for _, m := range bs.mounts { | ||
| have, err := m.Blocks.Has(c) | ||
| if have && err == nil { | ||
| return have, nil | ||
| } | ||
| if err != nil && firstErr == nil { | ||
| firstErr = err | ||
| } | ||
| } | ||
| return false, firstErr | ||
| } | ||
|
|
||
| func (bs *multiblockstore) Get(c *cid.Cid) (blocks.Block, error) { | ||
| var firstErr error | ||
| for _, m := range bs.mounts { | ||
| blk, err := m.Blocks.Get(c) | ||
| if err == nil { | ||
| return blk, nil | ||
| } | ||
| if firstErr == nil || firstErr == ErrNotFound { | ||
| firstErr = err | ||
| } | ||
| } | ||
| return nil, firstErr | ||
| } | ||
|
|
||
| func (bs *multiblockstore) Put(blk blocks.Block) error { | ||
| // First call Has() to make sure the block doesn't exist in any of | ||
| // the sub-blockstores, otherwise we could end with data being | ||
| // duplicated in two blockstores. | ||
| exists, err := bs.Has(blk.Cid()) | ||
| if err == nil && exists { | ||
| return nil // already stored | ||
| } | ||
| return bs.mounts[0].Blocks.Put(blk) | ||
| } | ||
|
|
||
| func (bs *multiblockstore) PutMany(blks []blocks.Block) error { | ||
| stilladd := make([]blocks.Block, 0, len(blks)) | ||
| // Has is cheaper than Put, so if we already have it then skip | ||
| for _, blk := range blks { | ||
| exists, err := bs.Has(blk.Cid()) | ||
| if err == nil && exists { | ||
| continue // already stored | ||
| } | ||
| stilladd = append(stilladd, blk) | ||
| } | ||
| if len(stilladd) == 0 { | ||
| return nil | ||
| } | ||
| return bs.mounts[0].Blocks.PutMany(stilladd) | ||
| } | ||
|
|
||
| func (bs *multiblockstore) AllKeysChan(ctx context.Context) (<-chan *cid.Cid, error) { | ||
| return bs.mounts[0].Blocks.AllKeysChan(ctx) | ||
| //return nil, errors.New("Unimplemented") | ||
| } |
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
Oops, something went wrong.