ston1th/cachefs
0
0
Fork 0
Code Issues Releases Activity

implemented os file interface acstraction

Browse source
This commit is contained in:
ston1th 2022-04-02 14:08:59 +02:00
commit ad41ddbe54
11 changed files with 223 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

54
pkg/fs/metadata.go
View file

@ -3,10 +3,12 @@
package fs
import (
"cachefs/pkg/provider"
"context"
"encoding/json"
"errors"
"io"
"io/fs"
stdfs "io/fs"
"math"
"os"
@ -18,7 +20,6 @@ import (
"github.com/go-logr/logr"
"golang.org/x/exp/maps"
"golang.org/x/sys/unix"
)
func now() int64 {
@ -35,13 +36,10 @@ type MetadataHandler struct {
enc *json.Encoder
}
func MetadataGenerator(file, dst string) error {
func MetadataGenerator(file string, dst provider.FS) error {
if !filepath.IsAbs(file) {
return errors.New("metadata path is not absolute")
}
if !filepath.IsAbs(dst) {
return errors.New("dst path is not absolute")
}
f, err := os.OpenFile(file, os.O_RDWR|os.O_CREATE, 0o640)
if err != nil {
return err
@ -53,16 +51,15 @@ func MetadataGenerator(file, dst string) error {
}
enc := json.NewEncoder(f)
md := make(map[string]*Metadata)
filepath.WalkDir(dst, func(path string, d stdfs.DirEntry, err error) error {
fs.WalkDir(provider.WalkFS(dst), ".", func(path string, d stdfs.DirEntry, err error) error {
if err != nil {
return nil
}
if d.IsDir() {
return nil
}
var stat unix.Stat_t
f, err := os.Open(path)
f, err := dst.Open(path)
if err != nil {
return nil
}
@ -72,12 +69,12 @@ func MetadataGenerator(file, dst string) error {
return nil
}
size := fi.Size()
err = unix.Fstat(int(f.Fd()), &stat)
blocks, err := dst.Fstat(f.Fd())
if err != nil {
return nil
}
if size <= stat.Blocks*512 {
md[strings.TrimPrefix(path, dst)] = &Metadata{
if size <= blocks*512 {
md[strings.TrimPrefix(path, dst.Root())] = &Metadata{
Size: size,
Chunks: Chunks{{0, size}},
}
@ -188,7 +185,7 @@ func (mh *MetadataHandler) Metadata(name string, size int64) (md *Metadata) {
func (mh *MetadataHandler) init() {
log := mh.log
maps.DeleteFunc(mh.md, func(k string, v *Metadata) bool {
_, err := mh.fs.statDst(k)
_, err := mh.fs.dst.Stat(k)
if errors.Is(err, os.ErrNotExist) {
log.V(2).Info("removing not existing file from metadata", "file", k)
return true
@ -222,18 +219,18 @@ func (mh *MetadataHandler) flusher(ctx context.Context) {
}
func (mh *MetadataHandler) cleanupEmptyDirs() {
filepath.WalkDir(mh.dst, func(path string, d stdfs.DirEntry, err error) error {
fs.WalkDir(provider.WalkFS(mh.fs.dst), ".", func(path string, d stdfs.DirEntry, err error) error {
if err == nil && d.IsDir() {
if path == mh.dst {
return nil
}
empty, err := dirEmpty(path)
empty, err := mh.dirEmpty(path)
if err != nil || !empty {
return nil
}
log := mh.log.WithValues("dir", path)
log.V(2).Info("removing empty dir")
err = os.Remove(path)
err = mh.fs.dst.Remove(path)
if err != nil {
log.Error(err, "failed to remove empty dir")
}
@ -242,6 +239,19 @@ func (mh *MetadataHandler) cleanupEmptyDirs() {
})
}
func (mh *MetadataHandler) dirEmpty(name string) (bool, error) {
f, err := mh.fs.dst.Open(name)
if err != nil {
return false, err
}
defer f.Close()
_, err = f.ReadDir(1)
if err == io.EOF {
return true, nil
}
return false, err
}
func (mh *MetadataHandler) flush() {
log := mh.log
mh.mu.Lock()
@ -306,13 +316,13 @@ func IsIOErr(err error) bool {
}
type Metadata struct {
mu sync.RWMutex `json:"-"`
fs *FS `json:"-"`
f *os.File `json:"-"`
name string `json:"-"`
Size int64 `json:"s"`
Atime int64 `json:"a"`
Chunks Chunks `json:"c"`
mu sync.RWMutex `json:"-"`
fs *FS `json:"-"`
f provider.File `json:"-"`
name string `json:"-"`
Size int64 `json:"s"`
Atime int64 `json:"a"`
Chunks Chunks `json:"c"`
}
func (md *Metadata) Delete() error {