Browse Source

fix return errClose

pull/7485/head
Roman Tamarov 3 weeks ago
parent
commit
73aa7fd88a
  1. 4
      weed/filer/cassandra/cassandra_store.go
  2. 4
      weed/filer/cassandra2/cassandra_store.go
  3. 4
      weed/filer/mongodb/mongodb_store.go

4
weed/filer/cassandra/cassandra_store.go

@ -220,7 +220,9 @@ func (store *CassandraStore) ListDirectoryEntries(ctx context.Context, dirPath u
} }
if errClose := iter.Close(); errClose != nil { if errClose := iter.Close(); errClose != nil {
glog.V(0).Infof("list iterator close: %v", errClose) glog.V(0).Infof("list iterator close: %v", errClose)
return lastFileName, errClose
if err == nil {
return lastFileName, errClose
}
} }
return lastFileName, err return lastFileName, err

4
weed/filer/cassandra2/cassandra_store.go

@ -221,7 +221,9 @@ func (store *Cassandra2Store) ListDirectoryEntries(ctx context.Context, dirPath
if errClose := iter.Close(); errClose != nil { if errClose := iter.Close(); errClose != nil {
glog.V(0).Infof("list iterator close: %v", errClose) glog.V(0).Infof("list iterator close: %v", errClose)
return lastFileName, errClose
if err == nil {
return lastFileName, errClose
}
} }
return lastFileName, err return lastFileName, err

4
weed/filer/mongodb/mongodb_store.go

@ -332,7 +332,9 @@ func (store *MongodbStore) ListDirectoryPrefixedEntries(ctx context.Context, dir
if errClose := cur.Close(ctx); errClose != nil { if errClose := cur.Close(ctx); errClose != nil {
glog.V(0).InfofCtx(ctx, "list iterator close: %v", err) glog.V(0).InfofCtx(ctx, "list iterator close: %v", err)
return lastFileName, errClose
if err == nil {
return lastFileName, errClose
}
} }
return lastFileName, err return lastFileName, err

Loading…
Cancel
Save