From 7c84d810d33a6bb9f542e4f49f8c0ebc46ce7a8f Mon Sep 17 00:00:00 2001 From: Klaus Post Date: Fri, 14 Aug 2015 15:30:36 +0200 Subject: [PATCH] Make sure we can delete files on Windows. Files must be closed on Windows before they can be deleted. Therefore we keep track of all open files, and closes them before we delete them. Also we don't set finished blobs to read-only on Windows, since that prevents us from deleting them. --- backend/local/local.go | 72 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 8 deletions(-) diff --git a/backend/local/local.go b/backend/local/local.go index cc95bb5b4..f63a71743 100644 --- a/backend/local/local.go +++ b/backend/local/local.go @@ -7,7 +7,9 @@ import ( "io/ioutil" "os" "path/filepath" + "runtime" "sort" + "sync" "github.com/restic/restic/backend" ) @@ -15,7 +17,9 @@ import ( var ErrWrongData = errors.New("wrong data returned by backend, checksum does not match") type Local struct { - p string + p string + mu sync.Mutex + open map[string][]*os.File // Contains open files. Guarded by 'mu'. } // Open opens the local backend at dir. @@ -37,7 +41,7 @@ func Open(dir string) (*Local, error) { } } - return &Local{p: dir}, nil + return &Local{p: dir, open: make(map[string][]*os.File)}, nil } // Create creates all the necessary files and directories for a new local @@ -143,7 +147,16 @@ func (lb *localBlob) Finalize(t backend.Type, name string) error { return err } - return os.Chmod(f, fi.Mode()&os.FileMode(^uint32(0222))) + // set file to readonly, except on Windows, + // otherwise deletion will fail. + if runtime.GOOS != "windows" { + err = os.Chmod(f, fi.Mode()&os.FileMode(^uint32(0222))) + if err != nil { + return err + } + } + + return nil } // Create creates a new Blob. The data is available only after Finalize() @@ -162,6 +175,11 @@ func (b *Local) Create() (backend.Blob, error) { basedir: b.p, } + b.mu.Lock() + open, _ := b.open["blobs"] + b.open["blobs"] = append(open, file) + b.mu.Unlock() + return &blob, nil } @@ -198,7 +216,15 @@ func dirname(base string, t backend.Type, name string) string { // Get returns a reader that yields the content stored under the given // name. The reader should be closed after draining it. func (b *Local) Get(t backend.Type, name string) (io.ReadCloser, error) { - return os.Open(filename(b.p, t, name)) + file, err := os.Open(filename(b.p, t, name)) + if err != nil { + return nil, err + } + b.mu.Lock() + open, _ := b.open[filename(b.p, t, name)] + b.open[filename(b.p, t, name)] = append(open, file) + b.mu.Unlock() + return file, nil } // GetReader returns an io.ReadCloser for the Blob with the given name of @@ -209,6 +235,11 @@ func (b *Local) GetReader(t backend.Type, name string, offset, length uint) (io. return nil, err } + b.mu.Lock() + open, _ := b.open[filename(b.p, t, name)] + b.open[filename(b.p, t, name)] = append(open, f) + b.mu.Unlock() + _, err = f.Seek(int64(offset), 0) if err != nil { return nil, err @@ -236,7 +267,17 @@ func (b *Local) Test(t backend.Type, name string) (bool, error) { // Remove removes the blob with the given name and type. func (b *Local) Remove(t backend.Type, name string) error { - return os.Remove(filename(b.p, t, name)) + // close all open files we may have. + fn := filename(b.p, t, name) + b.mu.Lock() + open, _ := b.open[fn] + for _, file := range open { + file.Close() + } + b.open[fn] = nil + b.mu.Unlock() + + return os.Remove(fn) } // List returns a channel that yields all names of blobs of type t. A @@ -283,7 +324,22 @@ func (b *Local) List(t backend.Type, done <-chan struct{}) <-chan string { } // Delete removes the repository and all files. -func (b *Local) Delete() error { return os.RemoveAll(b.p) } +func (b *Local) Delete() error { + b.Close() + return os.RemoveAll(b.p) +} -// Close does nothing -func (b *Local) Close() error { return nil } +// Close closes all open files. +// They may have been closed already, +// so we ignore all errors. +func (b *Local) Close() error { + b.mu.Lock() + for _, open := range b.open { + for _, file := range open { + file.Close() + } + } + b.open = make(map[string][]*os.File) + b.mu.Unlock() + return nil +}