github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6761 from kzys/bbolt-freelist

Browse Source 
Disable writing freelist to make the file robust against data corruptions
This commit is contained in:
Derek McGowan
2022-04-05 21:36:49 -07:00
committed by GitHub
parent d351162178 6da3183105
commit ffddd4446c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/server/server.go
View File

@@ -450,8 +450,16 @@ func LoadPlugins(ctx context.Context, config *srvconfig.Config) ([]*plugin.Regis
path := filepath.Join(ic.Root, "meta.db") path := filepath.Join(ic.Root, "meta.db")
ic.Meta.Exports["path"] = path ic.Meta.Exports["path"] = path
options := *bolt.DefaultOptions options := *bolt.DefaultOptions
// Reading bbolt's freelist sometimes fails when the file has a data corruption.
// Disabling freelist sync reduces the chance of the breakage.
// https://github.com/etcd-io/bbolt/pull/1
// https://github.com/etcd-io/bbolt/pull/6
options.NoFreelistSync = true
// Without the timeout, bbolt.Open would block indefinitely due to flock(2).
options.Timeout = timeout.Get(boltOpenTimeout) options.Timeout = timeout.Get(boltOpenTimeout)
doneCh := make(chan struct{}) doneCh := make(chan struct{})
go func() { go func() {
t := time.NewTimer(10 * time.Second) t := time.NewTimer(10 * time.Second)