Elara6331/itd
4
6
Fork 12
Code Issues 8 Pull Requests 1 Projects Releases 11 Wiki Activity

Added FUSE support #55

Merged
Elara6331 merged 65 commits from yannickulrich/itd:fuse into master 2023-03-25 22:23:52 +00:00
Conversation 4 Commits 65 Files Changed 8 +29 -29
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b5328ece92 - Show all commits

58
internal/fusefs/fuse.go
View File

@ -44,7 +44,7 @@ func BuildRootNode(dev *infinitime.Device) (*ITNode, error) {
inodemap = make(map[string]uint64) inodemap = make(map[string]uint64)
myfs, err = dev.FS() myfs, err = dev.FS()
if err != nil { if err != nil {
log.Error("FUSE failed to get filesystem").Err(err).Send() log.Error("FUSE Failed to get filesystem").Err(err).Send()
return nil, err return nil, err
} }
@ -125,17 +125,17 @@ func (n *ITNode) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno) {
// on device // on device
files, err := myfs.ReadDir(n.path) files, err := myfs.ReadDir(n.path)
if err != nil { if err != nil {
log.Error("ReadDir failed").Str("path", n.path).Err(err).Send() log.Error("FUSE ReadDir failed").Str("path", n.path).Err(err).Send()
return nil, syscall.ENOENT return nil, syscall.ENOENT
} }
log.Info("readdir").Str("path", n.path).Int("objects", len(files)).Send() log.Debug("FUSE ReadDir succeeded").Str("path", n.path).Int("objects", len(files)).Send()
r := make([]fuse.DirEntry, len(files)) r := make([]fuse.DirEntry, len(files))
n.lst = make([]DirEntry, len(files)) n.lst = make([]DirEntry, len(files))
for ind, entry := range files { for ind, entry := range files {
info, err := entry.Info() info, err := entry.Info()
if err != nil { if err != nil {
log.Error("Info failed").Str("path", n.path).Err(err).Send() log.Error("FUSE Info failed").Str("path", n.path).Err(err).Send()
return nil, syscall.ENOENT return nil, syscall.ENOENT
} }
name := info.Name() name := info.Name()
@ -221,7 +221,7 @@ func (n *ITNode) Lookup(ctx context.Context, name string, out *fuse.EntryOut) (*
if file.path != n.path + "/" + name { if file.path != n.path + "/" + name {
continue continue
} }
log.Info("LookUp successful").Str("path", file.path).Send() log.Debug("FUSE Lookup successful").Str("path", file.path).Send()
if file.isDir { if file.isDir {
stable := fs.StableAttr{ stable := fs.StableAttr{
@ -245,7 +245,7 @@ func (n *ITNode) Lookup(ctx context.Context, name string, out *fuse.EntryOut) (*
} }
break break
} }
log.Warn("LookUp failed").Str("path", n.path + "/" + name).Send() log.Warn("FUSE Lookup failed").Str("path", n.path + "/" + name).Send()
} }
return nil, syscall.ENOENT return nil, syscall.ENOENT
} }
@ -256,7 +256,7 @@ type bytesFileReadHandle struct {
var _ fs.FileReader = (*bytesFileReadHandle)(nil) var _ fs.FileReader = (*bytesFileReadHandle)(nil)
func (fh *bytesFileReadHandle) Read(ctx context.Context, dest []byte, off int64) (fuse.ReadResult, syscall.Errno) { func (fh *bytesFileReadHandle) Read(ctx context.Context, dest []byte, off int64) (fuse.ReadResult, syscall.Errno) {
log.Info("Executing Read").Int("size", len(fh.content)).Send() log.Debug("FUSE Executing Read").Int("size", len(fh.content)).Send()
end := off + int64(len(dest)) end := off + int64(len(dest))
if end > int64(len(fh.content)) { if end > int64(len(fh.content)) {
end = int64(len(fh.content)) end = int64(len(fh.content))
@ -301,38 +301,38 @@ func (fh *bytesFileWriteHandle) Flush(ctx context.Context) (errno syscall.Errno)
return 0 return 0
} }
log.Info("Attempting flush").Str("path", fh.path).Send() log.Debug("FUSE Attempting flush").Str("path", fh.path).Send()
fp, err := myfs.Create(fh.path, uint32(len(fh.content))) fp, err := myfs.Create(fh.path, uint32(len(fh.content)))
if err != nil { if err != nil {
log.Error("Flush failed: create").Str("path", fh.path).Err(err).Send() log.Error("FUSE Flush failed: create").Str("path", fh.path).Err(err).Send()
return syscall.EROFS return syscall.EROFS
} }
go func() { go func() {
// For every progress event // For every progress event
for sent := range fp.Progress() { for sent := range fp.Progress() {
log.Info("Progress").Int("bytes", int(sent)).Int("of", len(fh.content)).Send() log.Debug("FUSE Flush progress").Int("bytes", int(sent)).Int("total", len(fh.content)).Send()
} }
}() }()
r := bytes.NewReader(fh.content) r := bytes.NewReader(fh.content)
nread, err := io.Copy(fp, r) nread, err := io.Copy(fp, r)
if err != nil { if err != nil {
log.Error("Flush failed: write").Str("path", fh.path).Err(err).Send() log.Error("FUSE Flush failed during write").Str("path", fh.path).Err(err).Send()
fp.Close() fp.Close()
return syscall.EROFS return syscall.EROFS
} }
if int(nread) != len(fh.content) { if int(nread) != len(fh.content) {
log.Error("Flush failed: write").Str("path", fh.path).Int("expect", len(fh.content)).Int("got", int(nread)).Send() log.Error("FUSE Flush failed during write").Str("path", fh.path).Int("expect", len(fh.content)).Int("got", int(nread)).Send()
fp.Close() fp.Close()
return syscall.EROFS return syscall.EROFS
} }
err = fp.Close() err = fp.Close()
if err != nil { if err != nil {
log.Error("Flush failed: close").Str("path", fh.path).Err(err).Send() log.Error("FUSE Flush failed during close").Str("path", fh.path).Err(err).Send()
return syscall.EROFS return syscall.EROFS
yannickulrich marked this conversation as resolved
Elara6331 commented 2023-03-01 17:24:20 +00:00
Review
Copy Link

These should be debug logs rather than info logs. Also, the message should be a bit more specific, something like "FUSE getattr". Same for all the similar logs.

These should be debug logs rather than info logs. Also, the message should be a bit more specific, something like "FUSE getattr". Same for all the similar logs.
yannickulrich commented 2023-03-01 19:09:58 +00:00
Review
Copy Link

Done in b5328ec

Done in b5328ec
} }
log.Info("Flush done").Str("path", fh.path).Int("size", len(fh.content)).Send() log.Debug("FUSE Flush done").Str("path", fh.path).Int("size", len(fh.content)).Send()
return 0 return 0
} }
@ -343,7 +343,7 @@ func (fh *bytesFileWriteHandle) Fsync(ctx context.Context, flags uint32) (errno
var _ fs.NodeGetattrer = (*ITNode)(nil) var _ fs.NodeGetattrer = (*ITNode)(nil)
func (bn *ITNode) Getattr(ctx context.Context, f fs.FileHandle, out *fuse.AttrOut) syscall.Errno { func (bn *ITNode) Getattr(ctx context.Context, f fs.FileHandle, out *fuse.AttrOut) syscall.Errno {
log.Info("getattr").Str("path", bn.path).Send() log.Debug("FUSE getattr").Str("path", bn.path).Send()
out.Ino = bn.Ino out.Ino = bn.Ino
out.Mtime = bn.self.modtime out.Mtime = bn.self.modtime
out.Ctime = bn.self.modtime out.Ctime = bn.self.modtime
@ -354,7 +354,7 @@ func (bn *ITNode) Getattr(ctx context.Context, f fs.FileHandle, out *fuse.AttrOu
var _ fs.NodeSetattrer = (*ITNode)(nil) var _ fs.NodeSetattrer = (*ITNode)(nil)
func (bn *ITNode) Setattr(ctx context.Context, fh fs.FileHandle, in *fuse.SetAttrIn, out *fuse.AttrOut) syscall.Errno { func (bn *ITNode) Setattr(ctx context.Context, fh fs.FileHandle, in *fuse.SetAttrIn, out *fuse.AttrOut) syscall.Errno {
log.Info("setattr").Str("path", bn.path).Send() log.Debug("FUSE setattr").Str("path", bn.path).Send()
out.Size = 0 out.Size = 0
out.Mtime = 0 out.Mtime = 0
return 0 return 0
@ -366,22 +366,22 @@ func (f *ITNode) Open(ctx context.Context, openFlags uint32) (fh fs.FileHandle,
case 2: case 2:
// FS file // FS file
if openFlags&syscall.O_RDWR != 0 { if openFlags&syscall.O_RDWR != 0 {
log.Warn("open: failed RDWR").Str("path", f.path).Send() log.Error("FUSE Open failed: RDWR").Str("path", f.path).Send()
return nil, 0, syscall.EROFS return nil, 0, syscall.EROFS
} }
if openFlags & syscall.O_WRONLY != 0 { if openFlags & syscall.O_WRONLY != 0 {
log.Info("Opening file: write").Str("path", f.path).Send() log.Debug("FUSE Opening for write").Str("path", f.path).Send()
fh = &bytesFileWriteHandle{ fh = &bytesFileWriteHandle{
path : f.path, path : f.path,
content : make([]byte, 0), content : make([]byte, 0),
} }
return fh, fuse.FOPEN_DIRECT_IO, 0 return fh, fuse.FOPEN_DIRECT_IO, 0
} else { } else {
log.Info("Opening file: read").Str("path", f.path).Send() log.Debug("FUSE Opening for read").Str("path", f.path).Send()
fp, err := myfs.Open(f.path) fp, err := myfs.Open(f.path)
if err != nil { if err != nil {
log.Error("Opening file failed").Str("path", f.path).Err(err).Send() log.Error("FUSE: Opening failed").Str("path", f.path).Err(err).Send()
return nil, 0, syscall.EROFS return nil, 0, syscall.EROFS
} }
@ -392,13 +392,13 @@ func (f *ITNode) Open(ctx context.Context, openFlags uint32) (fh fs.FileHandle,
go func() { go func() {
// For every progress event // For every progress event
for sent := range fp.Progress() { for sent := range fp.Progress() {
log.Info("Progress").Int("bytes", int(sent)).Int("of", int(f.self.size)).Send() log.Debug("FUSE Read progress").Int("bytes", int(sent)).Int("total", int(f.self.size)).Send()
} }
}() }()
_, err = io.Copy(b, fp) _, err = io.Copy(b, fp)
if err != nil { if err != nil {
log.Error("Read failed").Str("path", f.path).Err(err).Send() log.Error("FUSE Read failed").Str("path", f.path).Err(err).Send()
fp.Close() fp.Close()
return nil, 0, syscall.EROFS return nil, 0, syscall.EROFS
} }
@ -461,7 +461,7 @@ func (f *ITNode) Create(ctx context.Context, name string, flags uint32, mode uin
content : make([]byte, 0), content : make([]byte, 0),
} }
log.Info("Creating file").Str("path", path).Send() log.Debug("FUSE Creating file").Str("path", path).Send()
errno = 0 errno = 0
return node, fh, fuseFlags, 0 return node, fh, fuseFlags, 0
@ -476,7 +476,7 @@ func (f *ITNode) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.
path := f.path + "/" + name path := f.path + "/" + name
err := myfs.Mkdir(path) err := myfs.Mkdir(path)
if err != nil { if err != nil {
log.Info("Mkdir failed"). log.Error("FUSE Mkdir failed").
Str("path", path). Str("path", path).
Err(err). Err(err).
Send() Send()
@ -496,7 +496,7 @@ func (f *ITNode) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.
} }
node := f.NewInode(ctx, operations, stable) node := f.NewInode(ctx, operations, stable)
log.Info("Mkdir sucess"). log.Debug("FUSE Mkdir success").
Str("path", path). Str("path", path).
Int("ino", int(ino)). Int("ino", int(ino)).
Send() Send()
@ -510,7 +510,7 @@ func (f *ITNode) Rename(ctx context.Context, name string, newParent fs.InodeEmbe
err := myfs.Rename(p1, p2) err := myfs.Rename(p1, p2)
if err != nil { if err != nil {
log.Error("Rename failed"). log.Error("FUSE Rename failed").
Str("src", p1). Str("src", p1).
Str("dest", p2). Str("dest", p2).
Err(err). Err(err).
@ -518,7 +518,7 @@ func (f *ITNode) Rename(ctx context.Context, name string, newParent fs.InodeEmbe
return syscall.EROFS return syscall.EROFS
} }
log.Info("Rename sucess"). log.Debug("FUSE Rename sucess").
Str("src", p1). Str("src", p1).
Str("dest", p2). Str("dest", p2).
Send() Send()
@ -535,7 +535,7 @@ func (f *ITNode) Unlink(ctx context.Context, name string) syscall.Errno {
delete(inodemap, f.path + "/" + name) delete(inodemap, f.path + "/" + name)
err := myfs.Remove(f.path + "/" + name) err := myfs.Remove(f.path + "/" + name)
if err != nil { if err != nil {
log.Error("Unlink failed"). log.Error("FUSE Unlink failed").
Str("file", f.path + "/" + name). Str("file", f.path + "/" + name).
Err(err). Err(err).
Send() Send()
@ -543,7 +543,7 @@ func (f *ITNode) Unlink(ctx context.Context, name string) syscall.Errno {
return syscall.EROFS return syscall.EROFS
} }
log.Info("Unlink success"). log.Debug("FUSE Unlink success").
Str("file", f.path + "/" + name). Str("file", f.path + "/" + name).
Send() Send()
return 0 return 0