aboutsummaryrefslogtreecommitdiff
path: root/db.go
diff options
context:
space:
mode:
authorBen Johnson <benbjohnson@yahoo.com>2016-03-10 12:43:05 -0700
committerBen Johnson <benbjohnson@yahoo.com>2016-03-10 12:43:05 -0700
commit0fd4c0547d204c7b1cad6db6f3adad5f2cf453e5 (patch)
tree892937cdc21a4a82d17da5961eab1afc5263b695 /db.go
parentMerge pull request #515 from benbjohnson/meta-write-to (diff)
parentmove to separate lock file on windows (diff)
downloaddedo-0fd4c0547d204c7b1cad6db6f3adad5f2cf453e5.tar.gz
dedo-0fd4c0547d204c7b1cad6db6f3adad5f2cf453e5.tar.xz
Merge pull request #528 from boltdb/windows
Move to separate lock file on windows
Diffstat (limited to 'db.go')
-rw-r--r--db.go15
1 files changed, 11 insertions, 4 deletions
diff --git a/db.go b/db.go
index 0f1e1bc..501d36a 100644
--- a/db.go
+++ b/db.go
@@ -93,6 +93,7 @@ type DB struct {
path string
file *os.File
+ lockfile *os.File // windows only
dataref []byte // mmap'ed readonly, write throws SEGV
data *[maxMapSize]byte
datasz int
@@ -177,7 +178,7 @@ func Open(path string, mode os.FileMode, options *Options) (*DB, error) {
// if !options.ReadOnly.
// The database file is locked using the shared lock (more than one process may
// hold a lock at the same time) otherwise (options.ReadOnly is set).
- if err := flock(db.file, !db.readOnly, options.Timeout); err != nil {
+ if err := flock(db, mode, !db.readOnly, options.Timeout); err != nil {
_ = db.close()
return nil, err
}
@@ -379,6 +380,10 @@ func (db *DB) Close() error {
}
func (db *DB) close() error {
+ if !db.opened {
+ return nil
+ }
+
db.opened = false
db.freelist = nil
@@ -397,7 +402,7 @@ func (db *DB) close() error {
// No need to unlock read-only file.
if !db.readOnly {
// Unlock the file.
- if err := funlock(db.file); err != nil {
+ if err := funlock(db); err != nil {
log.Printf("bolt.Close(): funlock error: %s", err)
}
}
@@ -824,8 +829,10 @@ func (db *DB) grow(sz int) error {
// Truncate and fsync to ensure file size metadata is flushed.
// https://github.com/boltdb/bolt/issues/284
if !db.NoGrowSync && !db.readOnly {
- if err := db.file.Truncate(int64(sz)); err != nil {
- return fmt.Errorf("file resize error: %s", err)
+ if runtime.GOOS != "windows" {
+ if err := db.file.Truncate(int64(sz)); err != nil {
+ return fmt.Errorf("file resize error: %s", err)
+ }
}
if err := db.file.Sync(); err != nil {
return fmt.Errorf("file sync error: %s", err)