lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-02-09 09:17:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Chris Lu
2020-04-17 00:00:48 -07:00
parent 508f3490a0
commit 7d3672c60a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
weed/filer2/filer_notify_append.go
View File

@@ -13,7 +13,7 @@ import (
func (f *Filer) appendToFile(targetFile string, data []byte) error { func (f *Filer) appendToFile(targetFile string, data []byte) error {
assignResult, err, uploadResult, err2 := f.assignAndUpload(data) assignResult, uploadResult, err2 := f.assignAndUpload(data)
if err2 != nil { if err2 != nil {
return err2 return err2
} }
@@ -54,7 +54,7 @@ func (f *Filer) appendToFile(targetFile string, data []byte) error {
return err return err
} }
func (f *Filer) assignAndUpload(data []byte) (*operation.AssignResult, error, *operation.UploadResult, error) { func (f *Filer) assignAndUpload(data []byte) (*operation.AssignResult, *operation.UploadResult, error) {
// assign a volume location // assign a volume location
assignRequest := &operation.VolumeAssignRequest{ assignRequest := &operation.VolumeAssignRequest{
Count: 1, Count: 1,
@@ -64,18 +64,18 @@ func (f *Filer) assignAndUpload(data []byte) (*operation.AssignResult, error, *o
} }
assignResult, err := operation.Assign(f.GetMaster(), f.GrpcDialOption, assignRequest) assignResult, err := operation.Assign(f.GetMaster(), f.GrpcDialOption, assignRequest)
if err != nil { if err != nil {
return nil, nil, nil, fmt.Errorf("AssignVolume: %v", err) return nil, nil, fmt.Errorf("AssignVolume: %v", err)
} }
if assignResult.Error != "" { if assignResult.Error != "" {
return nil, nil, nil, fmt.Errorf("AssignVolume error: %v", assignResult.Error) return nil, nil, fmt.Errorf("AssignVolume error: %v", assignResult.Error)
} }
// upload data // upload data
targetUrl := "http://" + assignResult.Url + "/" + assignResult.Fid targetUrl := "http://" + assignResult.Url + "/" + assignResult.Fid
uploadResult, err := operation.UploadData(targetUrl, "", false, data, false, "", nil, assignResult.Auth) uploadResult, err := operation.UploadData(targetUrl, "", false, data, false, "", nil, assignResult.Auth)
if err != nil { if err != nil {
return nil, nil, nil, fmt.Errorf("upload data %s: %v", targetUrl, err) return nil, nil, fmt.Errorf("upload data %s: %v", targetUrl, err)
} }
// println("uploaded to", targetUrl) // println("uploaded to", targetUrl)
return assignResult, err, uploadResult, nil return assignResult, uploadResult, nil
} }