mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-11 10:33:08 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

Avoid having the blockstore swap out from under us with a callback

Browse Source
This commit is contained in:
Neil Macneale IV
2025-05-23 13:23:38 -07:00
parent d290a9f462
commit b1e2b92776
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
go/store/nbs/archive_build.go
View File

@@ -118,12 +118,12 @@ func UnArchive(ctx context.Context, cs chunks.ChunkStore, smd StorageMetadata, p
func BuildArchive(ctx context.Context, cs chunks.ChunkStore, dagGroups *ChunkRelations, purge bool, progress chan interface{}) (err error) {
if gs, ok := cs.(*GenerationalNBS); ok {
err = archiveSingleBlockStore(ctx, gs.newGen, dagGroups, purge, progress)
err = archiveSingleBlockStore(ctx, func() *NomsBlockStore { return gs.newGen }, dagGroups, purge, progress)
if err != nil {
return err
}
err = archiveSingleBlockStore(ctx, gs.oldGen, dagGroups, purge, progress)
err = archiveSingleBlockStore(ctx, func() *NomsBlockStore { return gs.oldGen }, dagGroups, purge, progress)
if err != nil {
return err
}
@@ -133,10 +133,11 @@ func BuildArchive(ctx context.Context, cs chunks.ChunkStore, dagGroups *ChunkRel
return nil
}
func archiveSingleBlockStore(ctx context.Context, blockStore *NomsBlockStore, dagGroups *ChunkRelations, purge bool, progress chan interface{}) error {
func archiveSingleBlockStore(ctx context.Context, bscb func() *NomsBlockStore, dagGroups *ChunkRelations, purge bool, progress chan interface{}) error {
// Currently, we don't have any stats to report. Required for calls to the lower layers tho.
var stats Stats
blockStore := bscb()
path, _ := blockStore.Path()
sourceSet := blockStore.tables.upstream
@@ -208,6 +209,10 @@ func archiveSingleBlockStore(ctx context.Context, blockStore *NomsBlockStore, da
progress <- fmt.Sprintf("Failed to purge. %s", purgeFile)
}
}
blockStore = bscb()
path, _ = blockStore.Path()
sourceSet = blockStore.tables.upstream
}
return nil
}