diff --git a/weed/filer2/filerstore.go b/weed/filer2/filerstore.go index bab4722db..231c7fc68 100644 --- a/weed/filer2/filerstore.go +++ b/weed/filer2/filerstore.go @@ -50,7 +50,9 @@ func (fsw *FilerStoreWrapper) Initialize(configuration util.Configuration) error func (fsw *FilerStoreWrapper) InsertEntry(ctx context.Context, entry *Entry) error { stats.FilerStoreCounter.WithLabelValues(fsw.actualStore.GetName(), "insert").Inc() start := time.Now() - defer func() { stats.FilerStoreHistogram.WithLabelValues(fsw.actualStore.GetName(), "insert").Observe(time.Since(start).Seconds()) }() + defer func() { + stats.FilerStoreHistogram.WithLabelValues(fsw.actualStore.GetName(), "insert").Observe(time.Since(start).Seconds()) + }() filer_pb.BeforeEntrySerialization(entry.Chunks) return fsw.actualStore.InsertEntry(ctx, entry) @@ -59,7 +61,9 @@ func (fsw *FilerStoreWrapper) InsertEntry(ctx context.Context, entry *Entry) err func (fsw *FilerStoreWrapper) UpdateEntry(ctx context.Context, entry *Entry) error { stats.FilerStoreCounter.WithLabelValues(fsw.actualStore.GetName(), "update").Inc() start := time.Now() - defer func() { stats.FilerStoreHistogram.WithLabelValues(fsw.actualStore.GetName(), "update").Observe(time.Since(start).Seconds()) }() + defer func() { + stats.FilerStoreHistogram.WithLabelValues(fsw.actualStore.GetName(), "update").Observe(time.Since(start).Seconds()) + }() filer_pb.BeforeEntrySerialization(entry.Chunks) return fsw.actualStore.UpdateEntry(ctx, entry) @@ -68,7 +72,9 @@ func (fsw *FilerStoreWrapper) UpdateEntry(ctx context.Context, entry *Entry) err func (fsw *FilerStoreWrapper) FindEntry(ctx context.Context, fp FullPath) (entry *Entry, err error) { stats.FilerStoreCounter.WithLabelValues(fsw.actualStore.GetName(), "find").Inc() start := time.Now() - defer func() { stats.FilerStoreHistogram.WithLabelValues(fsw.actualStore.GetName(), "find").Observe(time.Since(start).Seconds()) }() + defer func() { + stats.FilerStoreHistogram.WithLabelValues(fsw.actualStore.GetName(), "find").Observe(time.Since(start).Seconds()) + }() entry, err = fsw.actualStore.FindEntry(ctx, fp) if err != nil { @@ -81,7 +87,9 @@ func (fsw *FilerStoreWrapper) FindEntry(ctx context.Context, fp FullPath) (entry func (fsw *FilerStoreWrapper) DeleteEntry(ctx context.Context, fp FullPath) (err error) { stats.FilerStoreCounter.WithLabelValues(fsw.actualStore.GetName(), "delete").Inc() start := time.Now() - defer func() { stats.FilerStoreHistogram.WithLabelValues(fsw.actualStore.GetName(), "delete").Observe(time.Since(start).Seconds()) }() + defer func() { + stats.FilerStoreHistogram.WithLabelValues(fsw.actualStore.GetName(), "delete").Observe(time.Since(start).Seconds()) + }() return fsw.actualStore.DeleteEntry(ctx, fp) } @@ -89,7 +97,9 @@ func (fsw *FilerStoreWrapper) DeleteEntry(ctx context.Context, fp FullPath) (err func (fsw *FilerStoreWrapper) ListDirectoryEntries(ctx context.Context, dirPath FullPath, startFileName string, includeStartFile bool, limit int) ([]*Entry, error) { stats.FilerStoreCounter.WithLabelValues(fsw.actualStore.GetName(), "list").Inc() start := time.Now() - defer func() { stats.FilerStoreHistogram.WithLabelValues(fsw.actualStore.GetName(), "list").Observe(time.Since(start).Seconds()) }() + defer func() { + stats.FilerStoreHistogram.WithLabelValues(fsw.actualStore.GetName(), "list").Observe(time.Since(start).Seconds()) + }() entries, err := fsw.actualStore.ListDirectoryEntries(ctx, dirPath, startFileName, includeStartFile, limit) if err != nil { diff --git a/weed/filesys/filehandle.go b/weed/filesys/filehandle.go index 81e4d7da5..ceec50e13 100644 --- a/weed/filesys/filehandle.go +++ b/weed/filesys/filehandle.go @@ -178,4 +178,3 @@ func (fh *FileHandle) Flush(ctx context.Context, req *fuse.FlushRequest) error { return nil }) } - diff --git a/weed/storage/store_ec.go b/weed/storage/store_ec.go index b7c84764c..8271324cf 100644 --- a/weed/storage/store_ec.go +++ b/weed/storage/store_ec.go @@ -242,11 +242,11 @@ func (s *Store) cachedLookupEcShardLocations(ctx context.Context, ecVolume *eras shardCount := len(ecVolume.ShardLocations) if shardCount < erasure_coding.DataShardsCount && - ecVolume.ShardLocationsRefreshTime.Add(11 * time.Second).After(time.Now()) || + ecVolume.ShardLocationsRefreshTime.Add(11*time.Second).After(time.Now()) || shardCount == erasure_coding.TotalShardsCount && - ecVolume.ShardLocationsRefreshTime.Add(37 * time.Minute).After(time.Now()) || + ecVolume.ShardLocationsRefreshTime.Add(37*time.Minute).After(time.Now()) || shardCount >= erasure_coding.DataShardsCount && - ecVolume.ShardLocationsRefreshTime.Add(7 * time.Minute).After(time.Now()) { + ecVolume.ShardLocationsRefreshTime.Add(7*time.Minute).After(time.Now()) { // still fresh return nil }