lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-19 22:19:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

go fmt

Browse Source
This commit is contained in:
Chris Lu
2021-03-14 13:21:02 -07:00
parent 2d4c2db81d
commit 35d939a1d2
10 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/command/mount_std.go
View File

@@ -75,7 +75,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {
if err != nil { if err != nil {
glog.V(0).Infof("failed to talk to filer %s: %v", filerGrpcAddress, err) glog.V(0).Infof("failed to talk to filer %s: %v", filerGrpcAddress, err)
glog.V(0).Infof("wait for %d seconds ...", i+1) glog.V(0).Infof("wait for %d seconds ...", i+1)
time.Sleep(time.Duration(i+1)*time.Second) time.Sleep(time.Duration(i+1) * time.Second)
} }
} }
if err != nil { if err != nil {

1
weed/filer/filerstore.go
View File

@@ -44,4 +44,3 @@ type BucketAware interface {
OnBucketCreation(bucket string) OnBucketCreation(bucket string)
OnBucketDeletion(bucket string) OnBucketDeletion(bucket string)
} }

2
weed/filesys/wfs.go
View File

@@ -131,7 +131,7 @@ func NewSeaweedFileSystem(option *Option) *WFS {
}) })
entry, _ := filer_pb.GetEntry(wfs, util.FullPath(wfs.option.FilerMountRootPath)) entry, _ := filer_pb.GetEntry(wfs, util.FullPath(wfs.option.FilerMountRootPath))
wfs.root = &Dir{name: wfs.option.FilerMountRootPath, wfs: wfs, entry: filer.FromPbEntry(wfs.option.FilerMountRootPath,entry)} wfs.root = &Dir{name: wfs.option.FilerMountRootPath, wfs: wfs, entry: filer.FromPbEntry(wfs.option.FilerMountRootPath, entry)}
wfs.fsNodeCache = newFsCache(wfs.root) wfs.fsNodeCache = newFsCache(wfs.root)
if wfs.option.ConcurrentWriters > 0 { if wfs.option.ConcurrentWriters > 0 {

2
weed/pb/filer_pb/filer_client.go
View File

@@ -104,7 +104,7 @@ func SeaweedList(client SeaweedFilerClient, parentDirectoryPath, prefix string,
func doSeaweedList(client SeaweedFilerClient, fullDirPath util.FullPath, prefix string, fn EachEntryFunciton, startFrom string, inclusive bool, limit uint32) (err error) { func doSeaweedList(client SeaweedFilerClient, fullDirPath util.FullPath, prefix string, fn EachEntryFunciton, startFrom string, inclusive bool, limit uint32) (err error) {
// Redundancy limit to make it correctly judge whether it is the last file. // Redundancy limit to make it correctly judge whether it is the last file.
redLimit := limit redLimit := limit
if limit != math.MaxInt32 && limit != 0{ if limit != math.MaxInt32 && limit != 0 {
redLimit = limit + 1 redLimit = limit + 1
} }
request := &ListEntriesRequest{ request := &ListEntriesRequest{

10
weed/shell/command_s3_clean_uploads.go
View File

@@ -54,7 +54,7 @@ func (c *commandS3CleanUploads) Do(args []string, commandEnv *CommandEnv, writer
return fmt.Errorf("list buckets under %v: %v", filerBucketsPath, err) return fmt.Errorf("list buckets under %v: %v", filerBucketsPath, err)
} }
for _, bucket:= range buckets { for _, bucket := range buckets {
c.cleanupUploads(commandEnv, writer, filerBucketsPath, bucket, *uploadedTimeAgo) c.cleanupUploads(commandEnv, writer, filerBucketsPath, bucket, *uploadedTimeAgo)
} }
@@ -63,7 +63,7 @@ func (c *commandS3CleanUploads) Do(args []string, commandEnv *CommandEnv, writer
} }
func (c *commandS3CleanUploads) cleanupUploads(commandEnv *CommandEnv, writer io.Writer, filerBucketsPath string, bucket string, timeAgo time.Duration) error { func (c *commandS3CleanUploads) cleanupUploads(commandEnv *CommandEnv, writer io.Writer, filerBucketsPath string, bucket string, timeAgo time.Duration) error {
uploadsDir := filerBucketsPath+"/"+bucket+"/.uploads" uploadsDir := filerBucketsPath + "/" + bucket + "/.uploads"
var staleUploads []string var staleUploads []string
now := time.Now() now := time.Now()
err := filer_pb.List(commandEnv, uploadsDir, "", func(entry *filer_pb.Entry, isLast bool) error { err := filer_pb.List(commandEnv, uploadsDir, "", func(entry *filer_pb.Entry, isLast bool) error {
@@ -77,8 +77,8 @@ func (c *commandS3CleanUploads) cleanupUploads(commandEnv *CommandEnv, writer io
return fmt.Errorf("list uploads under %v: %v", uploadsDir, err) return fmt.Errorf("list uploads under %v: %v", uploadsDir, err)
} }
for _, staleUpload:= range staleUploads { for _, staleUpload := range staleUploads {
deleteUrl := fmt.Sprintf("http://%s:%d%s/%s?recursive=true&ignoreRecursiveError=true",commandEnv.option.FilerHost, commandEnv.option.FilerPort,uploadsDir, staleUpload) deleteUrl := fmt.Sprintf("http://%s:%d%s/%s?recursive=true&ignoreRecursiveError=true", commandEnv.option.FilerHost, commandEnv.option.FilerPort, uploadsDir, staleUpload)
fmt.Fprintf(writer, "purge %s\n", deleteUrl) fmt.Fprintf(writer, "purge %s\n", deleteUrl)
err = util.Delete(deleteUrl, "") err = util.Delete(deleteUrl, "")
@@ -89,4 +89,4 @@ func (c *commandS3CleanUploads) cleanupUploads(commandEnv *CommandEnv, writer io
return nil return nil
} }

2
weed/storage/needle/crc.go
View File

@@ -35,7 +35,7 @@ func NewCRCwriter(w io.Writer) *CRCwriter {
return &CRCwriter{ return &CRCwriter{
crc: CRC(0), crc: CRC(0),
w: w, w: w,
} }
} }

2
weed/storage/volume_stream_write.go
View File

@@ -73,7 +73,7 @@ func (v *Volume) StreamRead(n *needle.Needle, writer io.Writer) (err error) {
sr := &StreamReader{ sr := &StreamReader{
readerAt: v.DataBackend, readerAt: v.DataBackend,
offset: nv.Offset.ToActualOffset(), offset: nv.Offset.ToActualOffset(),
} }
bufReader := bufio.NewReader(sr) bufReader := bufio.NewReader(sr)
bufReader.Discard(NeedleHeaderSize) bufReader.Discard(NeedleHeaderSize)

2
weed/wdclient/net2/doc.go
View File

@@ -3,4 +3,4 @@
package net2 package net2
// copied from https://github.com/dropbox/godropbox/tree/master/net2 // copied from https://github.com/dropbox/godropbox/tree/master/net2
// removed other dependencies // removed other dependencies

2
weed/wdclient/net2/ip.go
View File

@@ -80,7 +80,7 @@ func GetLocalIPs() ([]*net.IP, error) {
// TODO(zviad): Is rest of the code really necessary? // TODO(zviad): Is rest of the code really necessary?
addrs, err := net.InterfaceAddrs() addrs, err := net.InterfaceAddrs()
if err != nil { if err != nil {
return nil, fmt.Errorf( "Failed to get interface addresses: %v", err) return nil, fmt.Errorf("Failed to get interface addresses: %v", err)
} }
for _, addr := range addrs { for _, addr := range addrs {
ipnet, ok := addr.(*net.IPNet) ipnet, ok := addr.(*net.IPNet)

2
weed/wdclient/resource_pool/doc.go
View File

@@ -2,4 +2,4 @@
package resource_pool package resource_pool
// copied from https://github.com/dropbox/godropbox/tree/master/resource_pool // copied from https://github.com/dropbox/godropbox/tree/master/resource_pool
// removed other dependencies // removed other dependencies