CEF/grumble
1
0
Fork 0
forked from External/grumble
Code Pull requests Activity

Add missing blobstore update.

Browse source
This commit is contained in:
Mikkel Krautz 2011-05-17 01:41:03 +02:00
parent 9ec8c1f46a
commit 4894d3343d
1 changed files with 3 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

63
pkg/blobstore/blobstore.go
View file

@ -10,11 +10,9 @@ import (
"crypto/sha1" "crypto/sha1"
"encoding/hex" "encoding/hex"
"io/ioutil" "io/ioutil"
"path/filepath"
"os" "os"
"strconv" "path/filepath"
"sync" "sync"
"syscall"
) )
type BlobStore struct { type BlobStore struct {
@ -100,7 +98,7 @@ func NewBlobStore(path string, makeall bool) (bs *BlobStore, err os.Error) {
// Try to acquire an exclusive lock on the blobstore. // Try to acquire an exclusive lock on the blobstore.
lockfn := filepath.Join(path, "lock") lockfn := filepath.Join(path, "lock")
err = acquireLockfile(lockfn) err = AcquireLockFile(lockfn)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -109,7 +107,7 @@ func NewBlobStore(path string, makeall bool) (bs *BlobStore, err os.Error) {
// know the filename.) // know the filename.)
defer func() { defer func() {
if err != nil { if err != nil {
os.Remove(lockfn) ReleaseLockFile(lockfn)
} }
}() }()
@ -174,61 +172,6 @@ func (bs *BlobStore) Close() (err os.Error) {
return os.Remove(bs.lockfn) return os.Remove(bs.lockfn)
} }
// Acquire an exclusive lock for the BlobStore in directory dir.
func acquireLockfile(path string) os.Error {
dir, fn := filepath.Split(path)
lockfn := filepath.Join(dir, fn)
lockfile, err := os.OpenFile(lockfn, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
if e, ok := err.(*os.PathError); ok && e.Error == os.EEXIST {
content, err := ioutil.ReadFile(lockfn)
if err != nil {
return err
}
pid, err := strconv.Atoui64(string(content))
if err == nil {
if pidRunning(pid) {
return ErrLocked
}
}
lockfile, err = ioutil.TempFile(dir, "lock")
if err != nil {
return err
}
_, err = lockfile.WriteString(strconv.Itoa(syscall.Getpid()))
if err != nil {
lockfile.Close()
return ErrLockAcquirement
}
curfn := lockfile.Name()
err = lockfile.Close()
if err != nil {
return err
}
err = os.Rename(curfn, lockfn)
if err != nil {
os.Remove(curfn)
return ErrLockAcquirement
}
} else if err != nil {
return err
} else {
_, err = lockfile.WriteString(strconv.Uitoa64(getPid()))
if err != nil {
return err
}
lockfile.Close()
}
return nil
}
// Checks that a given key is a valid key for the BlobStore. // Checks that a given key is a valid key for the BlobStore.
// If it is, it returns the three components that make up the on-disk path // If it is, it returns the three components that make up the on-disk path
// the given key can be found or should be stored at. // the given key can be found or should be stored at.