diff --git a/weed/filer/abstract_sql/abstract_sql_store.go b/weed/filer/abstract_sql/abstract_sql_store.go index 0c1fc3913..bd4688408 100644 --- a/weed/filer/abstract_sql/abstract_sql_store.go +++ b/weed/filer/abstract_sql/abstract_sql_store.go @@ -328,7 +328,7 @@ func (store *AbstractSqlStore) ListDirectoryPrefixedEntries(ctx context.Context, resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry) if resEachEntryFuncErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resEachEntryFuncErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resEachEntryFuncErr) break } @@ -338,7 +338,7 @@ func (store *AbstractSqlStore) ListDirectoryPrefixedEntries(ctx context.Context, } - return lastFileName, nil + return lastFileName, err } func (store *AbstractSqlStore) ListDirectoryEntries(ctx context.Context, dirPath util.FullPath, startFileName string, includeStartFile bool, limit int64, eachEntryFunc filer.ListEachEntryFunc) (lastFileName string, err error) { diff --git a/weed/filer/arangodb/arangodb_store.go b/weed/filer/arangodb/arangodb_store.go index a3bf88195..7b2184c62 100644 --- a/weed/filer/arangodb/arangodb_store.go +++ b/weed/filer/arangodb/arangodb_store.go @@ -337,7 +337,7 @@ sort d.name asc resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry) if resEachEntryFuncErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resEachEntryFuncErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resEachEntryFuncErr) break } diff --git a/weed/filer/etcd/etcd_store.go b/weed/filer/etcd/etcd_store.go index 33a878383..0b83bacc8 100644 --- a/weed/filer/etcd/etcd_store.go +++ b/weed/filer/etcd/etcd_store.go @@ -215,7 +215,7 @@ func (store *EtcdStore) ListDirectoryPrefixedEntries(ctx context.Context, dirPat resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry) if resEachEntryFuncErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resEachEntryFuncErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resEachEntryFuncErr) break } diff --git a/weed/filer/filerstore_wrapper.go b/weed/filer/filerstore_wrapper.go index 51c0167e6..d2a3482c8 100644 --- a/weed/filer/filerstore_wrapper.go +++ b/weed/filer/filerstore_wrapper.go @@ -310,7 +310,7 @@ func (fsw *FilerStoreWrapper) prefixFilterEntries(ctx context.Context, dirPath u res, resErr := eachEntryFunc(entry) if resErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resErr) return } diff --git a/weed/filer/hbase/hbase_store.go b/weed/filer/hbase/hbase_store.go index ec9c68fc9..7755503c6 100644 --- a/weed/filer/hbase/hbase_store.go +++ b/weed/filer/hbase/hbase_store.go @@ -210,7 +210,7 @@ func (store *HbaseStore) ListDirectoryPrefixedEntries(ctx context.Context, dirPa resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry) if resEachEntryFuncErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resEachEntryFuncErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resEachEntryFuncErr) break } @@ -219,7 +219,7 @@ func (store *HbaseStore) ListDirectoryPrefixedEntries(ctx context.Context, dirPa } } - return lastFileName, nil + return lastFileName, err } func (store *HbaseStore) BeginTransaction(ctx context.Context) (context.Context, error) { diff --git a/weed/filer/leveldb/leveldb_store.go b/weed/filer/leveldb/leveldb_store.go index a07af7196..fea6e0a3d 100644 --- a/weed/filer/leveldb/leveldb_store.go +++ b/weed/filer/leveldb/leveldb_store.go @@ -212,7 +212,7 @@ func (store *LevelDBStore) ListDirectoryPrefixedEntries(ctx context.Context, dir resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry) if resEachEntryFuncErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resEachEntryFuncErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resEachEntryFuncErr) break } diff --git a/weed/filer/leveldb2/leveldb2_store.go b/weed/filer/leveldb2/leveldb2_store.go index d89df82f6..c3bb2ac55 100644 --- a/weed/filer/leveldb2/leveldb2_store.go +++ b/weed/filer/leveldb2/leveldb2_store.go @@ -219,7 +219,7 @@ func (store *LevelDB2Store) ListDirectoryPrefixedEntries(ctx context.Context, di resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry) if resEachEntryFuncErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resEachEntryFuncErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resEachEntryFuncErr) break } diff --git a/weed/filer/leveldb3/leveldb3_store.go b/weed/filer/leveldb3/leveldb3_store.go index 469839aa6..439143ceb 100644 --- a/weed/filer/leveldb3/leveldb3_store.go +++ b/weed/filer/leveldb3/leveldb3_store.go @@ -348,7 +348,7 @@ func (store *LevelDB3Store) ListDirectoryPrefixedEntries(ctx context.Context, di resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry) if resEachEntryFuncErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resEachEntryFuncErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resEachEntryFuncErr) break } diff --git a/weed/filer/mongodb/mongodb_store.go b/weed/filer/mongodb/mongodb_store.go index f577f41dc..2aa8bf91a 100644 --- a/weed/filer/mongodb/mongodb_store.go +++ b/weed/filer/mongodb/mongodb_store.go @@ -321,7 +321,7 @@ func (store *MongodbStore) ListDirectoryPrefixedEntries(ctx context.Context, dir resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry) if resEachEntryFuncErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resEachEntryFuncErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resEachEntryFuncErr) break } diff --git a/weed/filer/redis/universal_redis_store.go b/weed/filer/redis/universal_redis_store.go index ad2a3dac2..7c2a0e47b 100644 --- a/weed/filer/redis/universal_redis_store.go +++ b/weed/filer/redis/universal_redis_store.go @@ -194,7 +194,7 @@ func (store *UniversalRedisStore) ListDirectoryEntries(ctx context.Context, dirP resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry) if resEachEntryFuncErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resEachEntryFuncErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resEachEntryFuncErr) break } diff --git a/weed/filer/redis2/universal_redis_store.go b/weed/filer/redis2/universal_redis_store.go index 77ad1d4b2..0dbf7a72a 100644 --- a/weed/filer/redis2/universal_redis_store.go +++ b/weed/filer/redis2/universal_redis_store.go @@ -209,7 +209,7 @@ func (store *UniversalRedis2Store) ListDirectoryEntries(ctx context.Context, dir resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry) if resEachEntryFuncErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resEachEntryFuncErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resEachEntryFuncErr) break } diff --git a/weed/filer/redis3/universal_redis_store.go b/weed/filer/redis3/universal_redis_store.go index 428c0c387..e5b4c1da9 100644 --- a/weed/filer/redis3/universal_redis_store.go +++ b/weed/filer/redis3/universal_redis_store.go @@ -167,7 +167,7 @@ func (store *UniversalRedis3Store) ListDirectoryEntries(ctx context.Context, dir resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry) if resEachEntryFuncErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resEachEntryFuncErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resEachEntryFuncErr) } if !resEachEntryFunc { diff --git a/weed/filer/redis_lua/universal_redis_store.go b/weed/filer/redis_lua/universal_redis_store.go index bb3b32516..35f6d4991 100644 --- a/weed/filer/redis_lua/universal_redis_store.go +++ b/weed/filer/redis_lua/universal_redis_store.go @@ -176,7 +176,7 @@ func (store *UniversalRedisLuaStore) ListDirectoryEntries(ctx context.Context, d resEachEntryFunc, resEachEntryFuncErr := eachEntryFunc(entry) if resEachEntryFuncErr != nil { - err = fmt.Errorf("Failed in process eachEntryFnc: %v", resEachEntryFuncErr) + err = fmt.Errorf("failed to process eachEntryFunc: %w", resEachEntryFuncErr) break }