@@ -5,13 +5,15 @@ package mount
55import (
66 "container/heap"
77 "errors"
8+ "fmt"
89 "sort"
910 "strings"
1011 "sync"
1112
1213 ds "github.com/ipfs/go-datastore"
1314 "github.com/ipfs/go-datastore/query"
14- xerrors "golang.org/x/xerrors"
15+
16+ "go.uber.org/multierr"
1517)
1618
1719var (
@@ -240,16 +242,22 @@ func (d *Datastore) Put(key ds.Key, value []byte) error {
240242
241243// Sync implements Datastore.Sync
242244func (d * Datastore ) Sync (prefix ds.Key ) error {
245+ var merr error
246+
243247 // Sync all mount points below the prefix
244248 // Sync the mount point right at (or above) the prefix
245- dstores , _ , rest := d .lookupAll (prefix )
249+ dstores , prefixes , rest := d .lookupAll (prefix )
246250 for i , suffix := range rest {
247251 if err := dstores [i ].Sync (suffix ); err != nil {
248- return err
252+ merr = multierr .Append (merr , fmt .Errorf (
253+ "syncing datastore at %s: %w" ,
254+ prefixes [i ].String (),
255+ err ,
256+ ))
249257 }
250258 }
251259
252- return nil
260+ return merr
253261}
254262
255263// Get returns the value associated with the key from the appropriate datastore.
@@ -355,27 +363,39 @@ func (d *Datastore) Query(master query.Query) (query.Results, error) {
355363
356364// Close closes all mounted datastores.
357365func (d * Datastore ) Close () error {
366+ var merr error
358367 for _ , d := range d .mounts {
359368 err := d .Datastore .Close ()
360369 if err != nil {
361- return err
370+ merr = multierr .Append (merr , fmt .Errorf (
371+ "closing datastore at %s: %w" ,
372+ d .Prefix .String (),
373+ err ,
374+ ))
362375 }
363376 }
364- return nil
377+ return merr
365378}
366379
367380// DiskUsage returns the sum of DiskUsages for the mounted datastores.
368381// Non PersistentDatastores will not be accounted.
369382func (d * Datastore ) DiskUsage () (uint64 , error ) {
370- var duTotal uint64 = 0
383+ var (
384+ merr error
385+ duTotal uint64 = 0
386+ )
371387 for _ , d := range d .mounts {
372388 du , err := ds .DiskUsage (d .Datastore )
373389 duTotal += du
374390 if err != nil {
375- return duTotal , err
391+ merr = multierr .Append (merr , fmt .Errorf (
392+ "getting disk usage at %s: %w" ,
393+ d .Prefix .String (),
394+ err ,
395+ ))
376396 }
377397 }
378- return duTotal , nil
398+ return duTotal , merr
379399}
380400
381401type mountBatch struct {
@@ -436,44 +456,62 @@ func (mt *mountBatch) Commit() error {
436456 mt .lk .Lock ()
437457 defer mt .lk .Unlock ()
438458
439- for _ , t := range mt .mounts {
440- err := t .Commit ()
441- if err != nil {
442- return err
459+ var merr error
460+ for p , t := range mt .mounts {
461+ if err := t .Commit (); err != nil {
462+ merr = multierr .Append (merr , fmt .Errorf (
463+ "committing batch to datastore at %s: %w" ,
464+ p , err ,
465+ ))
443466 }
444467 }
445- return nil
468+ return merr
446469}
447470
448471func (d * Datastore ) Check () error {
472+ var merr error
449473 for _ , m := range d .mounts {
450474 if c , ok := m .Datastore .(ds.CheckedDatastore ); ok {
451475 if err := c .Check (); err != nil {
452- return xerrors .Errorf ("checking datastore at %s: %w" , m .Prefix .String (), err )
476+ merr = multierr .Append (merr , fmt .Errorf (
477+ "checking datastore at %s: %w" ,
478+ m .Prefix .String (),
479+ err ,
480+ ))
453481 }
454482 }
455483 }
456- return nil
484+ return merr
457485}
458486
459487func (d * Datastore ) Scrub () error {
488+ var merr error
460489 for _ , m := range d .mounts {
461490 if c , ok := m .Datastore .(ds.ScrubbedDatastore ); ok {
462491 if err := c .Scrub (); err != nil {
463- return xerrors .Errorf ("scrubbing datastore at %s: %w" , m .Prefix .String (), err )
492+ merr = multierr .Append (merr , fmt .Errorf (
493+ "scrubbing datastore at %s: %w" ,
494+ m .Prefix .String (),
495+ err ,
496+ ))
464497 }
465498 }
466499 }
467- return nil
500+ return merr
468501}
469502
470503func (d * Datastore ) CollectGarbage () error {
504+ var merr error
471505 for _ , m := range d .mounts {
472506 if c , ok := m .Datastore .(ds.GCDatastore ); ok {
473507 if err := c .CollectGarbage (); err != nil {
474- return xerrors .Errorf ("gc on datastore at %s: %w" , m .Prefix .String (), err )
508+ merr = multierr .Append (merr , fmt .Errorf (
509+ "gc on datastore at %s: %w" ,
510+ m .Prefix .String (),
511+ err ,
512+ ))
475513 }
476514 }
477515 }
478- return nil
516+ return merr
479517}
0 commit comments