Browse Source

fix

pull/7485/head
Roman Tamarov 2 weeks ago
parent
commit
6823802bc0
  1. 2
      weed/filer/elastic/v7/elastic_store.go
  2. 2
      weed/filer/filer.go
  3. 2
      weed/filer/foundationdb/foundationdb_store.go
  4. 2
      weed/filer/hbase/hbase_store.go
  5. 2
      weed/filer/ydb/ydb_store.go

2
weed/filer/elastic/v7/elastic_store.go

@ -262,7 +262,7 @@ func (store *ElasticStore) listDirectoryEntries(
resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(esEntry.Entry)
if resEachEntryFuncErr != nil {
glog.ErrorfCtx(ctx, "failed to process eachEntryFunc for entry %q: %v", fileName, resEachEntryFuncErr)
return lastFileName, fmt.Errorf("failed to process eachEntryFunc for entry %q: %w", fileName, resEachEntryFuncErr)
return lastFileName, fmt.Errorf("failed to process eachEntryFunc for entry %q: %w", fileName, resEachEntryFuncErr)
}
if !resEachEntryFunc {

2
weed/filer/filer.go

@ -373,7 +373,7 @@ func (f *Filer) doListDirectoryEntries(ctx context.Context, p util.FullPath, sta
select {
case <-ctx.Done():
glog.Errorf("Context is done.")
return false, fmt.Errorf("context canceled: %w", ctx.Err())
return false, fmt.Errorf("context canceled: %w", ctx.Err())
default:
if entry.TtlSec > 0 {
if entry.IsExpireS3Enabled() {

2
weed/filer/foundationdb/foundationdb_store.go

@ -477,7 +477,7 @@ func (store *FoundationDBStore) ListDirectoryPrefixedEntries(ctx context.Context
resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry)
if resEachEntryFuncErr != nil {
glog.ErrorfCtx(ctx, "failed to process eachEntryFunc for entry %q: %v", fileName, resEachEntryFuncErr)
return lastFileName, fmt.Errorf("failed to process eachEntryFunc for entry %q: %w", fileName, resEachEntryFuncErr)
return lastFileName, fmt.Errorf("failed to process eachEntryFunc for entry %q: %w", fileName, resEachEntryFuncErr)
}
if !resEachEntryFunc {
break

2
weed/filer/hbase/hbase_store.go

@ -211,7 +211,7 @@ func (store *HbaseStore) ListDirectoryPrefixedEntries(ctx context.Context, dirPa
resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry)
if resEachEntryFuncErr != nil {
return lastFileName, fmt.Errorf("failed to process eachEntryFunc for entry %q: %w", entry.FullPath, resEachEntryFuncErr)
return lastFileName, fmt.Errorf("failed to process eachEntryFunc for entry %q: %w", entry.FullPath, resEachEntryFuncErr)
}
if !resEachEntryFunc {

2
weed/filer/ydb/ydb_store.go

@ -315,7 +315,7 @@ func (store *YdbStore) ListDirectoryPrefixedEntries(ctx context.Context, dirPath
resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry)
if resEachEntryFuncErr != nil {
return fmt.Errorf("failed to process eachEntryFunc for entry %q: %w", entry.FullPath, resEachEntryFuncErr)
return fmt.Errorf("failed to process eachEntryFunc for entry %q: %w", entry.FullPath, resEachEntryFuncErr)
}
if !resEachEntryFunc {

Loading…
Cancel
Save