Merge pull request #2994 from aduffeck/fix-loading-shares

Fix loading shares

changelog/unreleased/fix-loading-shares.md

@@ -0,0 +1,5 @@
+Bugfix: Fix errors when loading shares
+
+We fixed a bug where loading shares and associated received shares ran into issues when handling them simultaneously.
+
+https://github.com/cs3org/reva/pull/2994

pkg/share/manager/cs3/cs3.go

@@ -172,25 +172,30 @@ func (m *Manager) Load(ctx context.Context, shareChan <-chan *collaboration.Shar
  return err
  }
 
+ var mu sync.Mutex
  var wg sync.WaitGroup
  wg.Add(2)
  go func() {
  for s := range shareChan {
  if s == nil {
  continue
  }
+ mu.Lock()
  if err := m.persistShare(context.Background(), s); err != nil {
  log.Error().Err(err).Interface("share", s).Msg("error persisting share")
  }
+ mu.Unlock()
  }
  wg.Done()
  }()
  go func() {
  for s := range receivedShareChan {
  if s.ReceivedShare != nil && s.UserID != nil {
+ mu.Lock()
  if err := m.persistReceivedShare(context.Background(), s.UserID, s.ReceivedShare); err != nil {
  log.Error().Err(err).Interface("received share", s).Msg("error persisting received share")
  }
+ mu.Unlock()
  }
  }
  wg.Done()

pkg/storage/utils/decomposedfs/decomposedfs.go

@@ -315,7 +315,7 @@ func (fs *Decomposedfs) CreateDir(ctx context.Context, ref *provider.Reference)
  return
  }
  if n.Exists {
- return errtypes.AlreadyExists(parentRef.Path)
+ return errtypes.AlreadyExists(ref.Path)
  }
 
  if err = fs.tp.CreateDir(ctx, n); err != nil {