diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-11-15 16:59:28 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-11-15 16:59:28 -0800 |
| commit | 0ea5c087ce8414e2fc6a0d470d316bac7fd1167b (patch) | |
| tree | 5c6f0e56759c80a3b446ab29b84d46660e49276f | |
| parent | 95c0de285d907cbd826ba6ce97f7c4994c16ffd5 (diff) | |
| download | seaweedfs-0ea5c087ce8414e2fc6a0d470d316bac7fd1167b.tar.xz seaweedfs-0ea5c087ce8414e2fc6a0d470d316bac7fd1167b.zip | |
go fmt
| -rw-r--r-- | weed/filer/filer_conf.go | 7 | ||||
| -rw-r--r-- | weed/filesys/file.go | 2 | ||||
| -rw-r--r-- | weed/operation/assign_file_id.go | 1 | ||||
| -rw-r--r-- | weed/pb/filer_pb/filer_pb_helper.go | 1 | ||||
| -rw-r--r-- | weed/s3api/http/header.go | 2 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers.go | 4 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_write.go | 6 |
7 files changed, 11 insertions, 12 deletions
diff --git a/weed/filer/filer_conf.go b/weed/filer/filer_conf.go index 0a86192ec..b75fb5084 100644 --- a/weed/filer/filer_conf.go +++ b/weed/filer/filer_conf.go @@ -10,9 +10,8 @@ import ( "github.com/viant/ptrie" ) - const ( - DirectoryEtc = "/etc" + DirectoryEtc = "/etc" FilerConfName = "filer.conf" ) @@ -27,7 +26,7 @@ func NewFilerConf() (fc *FilerConf) { return fc } -func (fc *FilerConf) loadFromFiler(filer *Filer) (err error){ +func (fc *FilerConf) loadFromFiler(filer *Filer) (err error) { filerConfPath := util.NewFullPath(DirectoryEtc, FilerConfName) entry, err := filer.FindEntry(context.Background(), filerConfPath) if err != nil { @@ -79,7 +78,7 @@ var ( EmptyFilerConfPathConf = &filer_pb.FilerConf_PathConf{} ) -func (fc *FilerConf) MatchStorageRule(path string) (pathConf *filer_pb.FilerConf_PathConf){ +func (fc *FilerConf) MatchStorageRule(path string) (pathConf *filer_pb.FilerConf_PathConf) { fc.rules.MatchPrefix([]byte(path), func(key []byte, value interface{}) bool { pathConf = value.(*filer_pb.FilerConf_PathConf) return true diff --git a/weed/filesys/file.go b/weed/filesys/file.go index 9e1342370..3bffa156e 100644 --- a/weed/filesys/file.go +++ b/weed/filesys/file.go @@ -294,7 +294,7 @@ func (file *File) addChunks(chunks []*filer_pb.FileChunk) { // find the earliest incoming chunk newChunks := chunks earliestChunk := newChunks[0] - for i:=1;i<len(newChunks);i++{ + for i := 1; i < len(newChunks); i++ { if lessThan(earliestChunk, newChunks[i]) { earliestChunk = newChunks[i] } diff --git a/weed/operation/assign_file_id.go b/weed/operation/assign_file_id.go index c58d3a84d..16ad04476 100644 --- a/weed/operation/assign_file_id.go +++ b/weed/operation/assign_file_id.go @@ -137,4 +137,3 @@ func (so *StorageOption) ToAssignRequests(count int) (ar *VolumeAssignRequest, a } return } - diff --git a/weed/pb/filer_pb/filer_pb_helper.go b/weed/pb/filer_pb/filer_pb_helper.go index fb989a02e..8dde9c80c 100644 --- a/weed/pb/filer_pb/filer_pb_helper.go +++ b/weed/pb/filer_pb/filer_pb_helper.go @@ -141,6 +141,7 @@ func IsRename(event *SubscribeMetadataResponse) bool { } var _ = ptrie.KeyProvider(&FilerConf_PathConf{}) + func (fp *FilerConf_PathConf) Key() interface{} { return fp.LocationPrefix } diff --git a/weed/s3api/http/header.go b/weed/s3api/http/header.go index f496429fc..a960d2370 100644 --- a/weed/s3api/http/header.go +++ b/weed/s3api/http/header.go @@ -32,5 +32,5 @@ const ( // Non-Standard S3 HTTP request constants const ( AmzIdentityId = "x-amz-identity-id" - AmzIsAdmin = "x-amz-is-admin" // only set to http request header as a context + AmzIsAdmin = "x-amz-is-admin" // only set to http request header as a context ) diff --git a/weed/server/filer_server_handlers.go b/weed/server/filer_server_handlers.go index a64b23927..451e2a2de 100644 --- a/weed/server/filer_server_handlers.go +++ b/weed/server/filer_server_handlers.go @@ -27,7 +27,7 @@ func (fs *FilerServer) filerHandler(w http.ResponseWriter, r *http.Request) { case "DELETE": stats.FilerRequestCounter.WithLabelValues("delete").Inc() if _, ok := r.URL.Query()["tagging"]; ok { - fs.DeleteTaggingHandler(w,r) + fs.DeleteTaggingHandler(w, r) } else { fs.DeleteHandler(w, r) } @@ -35,7 +35,7 @@ func (fs *FilerServer) filerHandler(w http.ResponseWriter, r *http.Request) { case "PUT": stats.FilerRequestCounter.WithLabelValues("put").Inc() if _, ok := r.URL.Query()["tagging"]; ok { - fs.PutTaggingHandler(w,r) + fs.PutTaggingHandler(w, r) } else { fs.PostHandler(w, r) } diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index 0344d84dc..5806b0c1f 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -103,7 +103,7 @@ func (fs *FilerServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusNoContent) } -func (fs *FilerServer) detectStorageOption(requestURI, qCollection, qReplication string, ttlSeconds int32, dataCenter, rack string) (*operation.StorageOption) { +func (fs *FilerServer) detectStorageOption(requestURI, qCollection, qReplication string, ttlSeconds int32, dataCenter, rack string) *operation.StorageOption { collection := util.Nvl(qCollection, fs.option.Collection) replication := util.Nvl(qReplication, fs.option.DefaultReplication) @@ -131,7 +131,7 @@ func (fs *FilerServer) detectStorageOption(requestURI, qCollection, qReplication if err != nil { glog.Errorf("fail to parse %s ttl setting %s: %v", rule.LocationPrefix, rule.Ttl, err) } - ttlSeconds = int32(ttl.Minutes())*60 + ttlSeconds = int32(ttl.Minutes()) * 60 } return &operation.StorageOption{ @@ -144,7 +144,7 @@ func (fs *FilerServer) detectStorageOption(requestURI, qCollection, qReplication } } -func (fs *FilerServer) detectStorageOption0(requestURI, qCollection, qReplication string, qTtl string, dataCenter, rack string) (*operation.StorageOption) { +func (fs *FilerServer) detectStorageOption0(requestURI, qCollection, qReplication string, qTtl string, dataCenter, rack string) *operation.StorageOption { ttl, err := needle.ReadTTL(qTtl) if err != nil { |
