Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP1:GA
docker.2576
bnc964673-boltdb-metadata-recovery.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File bnc964673-boltdb-metadata-recovery.patch of Package docker.2576
From 8f0e47cee034cdc08ca515d98a6733130908fc26 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asarai@suse.de> Date: Mon, 16 May 2016 23:53:46 +1000 Subject: [PATCH] db: fix recovery from unsynced metadata Bolt stores the two latest transactions' metadata, but previously did not recover from validation failures in the latest by using the second latest. Fix this by correctly handling validation failures in db.go, as well as returning the metadata with highest txid which is also valid in DB.meta(). Signed-off-by: Aleksa Sarai <asarai@suse.de> --- vendor/src/github.com/boltdb/bolt/db.go | 49 +++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 11 deletions(-) Index: docker-1.10.3/vendor/src/github.com/boltdb/bolt/db.go =================================================================== --- docker-1.10.3.orig/vendor/src/github.com/boltdb/bolt/db.go +++ docker-1.10.3/vendor/src/github.com/boltdb/bolt/db.go @@ -184,9 +184,15 @@ func Open(path string, mode os.FileMode, if _, err := db.file.ReadAt(buf[:], 0); err == nil { m := db.pageInBuffer(buf[:], 0).meta() if err := m.validate(); err != nil { - return nil, fmt.Errorf("meta0 error: %s", err) + // If we can't read the page size, we can assume it's the same + // as the OS -- since that's how the page size was chosen in the + // first place. + // XXX: Does this cause issues with opening a database on a + // different OS than the one it was created on? + db.pageSize = os.Getpagesize() + } else { + db.pageSize = int(m.pageSize) } - db.pageSize = int(m.pageSize) } } @@ -246,12 +252,13 @@ func (db *DB) mmap(minsz int) error { db.meta0 = db.page(0).meta() db.meta1 = db.page(1).meta() - // Validate the meta pages. - if err := db.meta0.validate(); err != nil { - return fmt.Errorf("meta0 error: %s", err) - } - if err := db.meta1.validate(); err != nil { - return fmt.Errorf("meta1 error: %s", err) + // Validate the meta pages. We only return an error if both meta pages fail + // validation, since meta0 failing validation means that it wasn't saved + // properly -- but we can recover using meta1. And vice-versa. + err0 := db.meta0.validate() + err1 := db.meta1.validate() + if err0 != nil && err1 != nil { + return fmt.Errorf("meta0(%v) meta1(%v)", err0, err1) } return nil @@ -622,10 +629,30 @@ func (db *DB) pageInBuffer(b []byte, id // meta retrieves the current meta page reference. func (db *DB) meta() *meta { - if db.meta0.txid > db.meta1.txid { - return db.meta0 + // We have to return the meta with the highest txid which doesn't fail + // validation. Otherwise, we can cause errors when in fact the database is + // in a consistent state. metaA is the one with the higher txid. + metaA := db.meta0 + metaB := db.meta1 + if db.meta1.txid > db.meta0.txid { + metaA = db.meta1 + metaB = db.meta0 + } + + errA := metaA.validate() + errB := metaB.validate() + + if errA == nil { + return metaA } - return db.meta1 + + if errB == nil { + return metaB + } + + // This should never be reached, because both meta1 and meta0 were validated + // on mmap() and we do fsync() on every write. + panic("both meta0 and meta1 could not be validated in DB.meta()!") } // allocate returns a contiguous block of memory starting at a given page.
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor