diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-05-16 00:08:44 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-05-16 00:08:44 -0700 |
| commit | b303a02461a009298e27f7b9b4f8ae68c8f44f21 (patch) | |
| tree | bc6a6e6415311c0fd31626fc7abe64d807c15f00 /weed/filesys/file.go | |
| parent | c7a71d35b0f4c94361f227396e12412e4333a2ba (diff) | |
| download | seaweedfs-b303a02461a009298e27f7b9b4f8ae68c8f44f21.tar.xz seaweedfs-b303a02461a009298e27f7b9b4f8ae68c8f44f21.zip | |
cp file can work
1. consolidate to filer_pb.FileChunk
2. dir add file, mkdir
3. file flush, write
updates having issue
Diffstat (limited to 'weed/filesys/file.go')
| -rw-r--r-- | weed/filesys/file.go | 81 |
1 files changed, 78 insertions, 3 deletions
diff --git a/weed/filesys/file.go b/weed/filesys/file.go index b4a447fa6..160693c54 100644 --- a/weed/filesys/file.go +++ b/weed/filesys/file.go @@ -5,13 +5,14 @@ import ( "fmt" "bazil.org/fuse" - "github.com/chrislusf/seaweedfs/weed/filer" "bazil.org/fuse/fs" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "path/filepath" "os" "time" + "bytes" + "github.com/chrislusf/seaweedfs/weed/operation" ) var _ = fs.Node(&File{}) @@ -20,10 +21,11 @@ var _ = fs.Node(&File{}) var _ = fs.Handle(&File{}) var _ = fs.HandleReadAller(&File{}) // var _ = fs.HandleReader(&File{}) +var _ = fs.HandleFlusher(&File{}) var _ = fs.HandleWriter(&File{}) type File struct { - FileId filer.FileId + Chunks []*filer_pb.FileChunk Name string dir *Dir wfs *WFS @@ -71,10 +73,15 @@ func (file *File) Attr(context context.Context, attr *fuse.Attr) error { func (file *File) ReadAll(ctx context.Context) (content []byte, err error) { + if len(file.Chunks) == 0 { + return + } + err = file.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error { + // FIXME: need to either use Read() or implement differently request := &filer_pb.GetFileContentRequest{ - FileId: string(file.FileId), + FileId: file.Chunks[0].FileId, } glog.V(1).Infof("read file content: %v", request) @@ -91,7 +98,75 @@ func (file *File) ReadAll(ctx context.Context) (content []byte, err error) { return content, err } +func (file *File) Flush(ctx context.Context, req *fuse.FlushRequest) error { + // write the file chunks to the filer + fmt.Printf("flush file %+v\n", req) + + err := file.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error { + + request := &filer_pb.AppendFileChunksRequest{ + Directory: file.dir.Path, + Entry: &filer_pb.Entry{ + Name: file.Name, + Chunks: file.Chunks, + }, + } + + glog.V(1).Infof("append chunks: %v", request) + if _, err := client.AppendFileChunks(ctx, request); err != nil { + return fmt.Errorf("create file: %v", err) + } + + return nil + }) + + return err +} + func (file *File) Write(ctx context.Context, req *fuse.WriteRequest, resp *fuse.WriteResponse) error { + // write the request to volume servers fmt.Printf("write file %+v\n", req) + + var fileId, host string + + if err := file.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error { + + request := &filer_pb.AssignVolumeRequest{ + Count: 1, + Replication: "000", + Collection: "", + } + + glog.V(1).Infof("assign volume: %v", request) + resp, err := client.AssignVolume(ctx, request) + if err != nil { + return err + } + + fileId, host = resp.FileId, resp.Url + + return nil + }); err != nil { + return fmt.Errorf("filer assign volume: %v", err) + } + + fileUrl := fmt.Sprintf("http://%s/%s", host, fileId) + bufReader := bytes.NewReader(req.Data) + uploadResult, err := operation.Upload(fileUrl, file.Name, bufReader, false, "application/octet-stream", nil, "") + if err != nil { + return fmt.Errorf("upload data: %v", err) + } + if uploadResult.Error != "" { + return fmt.Errorf("upload result: %v", uploadResult.Error) + } + + glog.V(1).Infof("uploaded %s/%s to: %v", file.dir.Path, file.Name, fileUrl) + + file.Chunks = append(file.Chunks, &filer_pb.FileChunk{ + FileId: fileId, + Offset: req.Offset, + Size: uint64(uploadResult.Size), + }) + return nil } |
