Bump reva

This commit is contained in:
André Duffeck
2024-01-24 10:49:45 +01:00
parent 9b87682f4e
commit b5ed06dad6
9 changed files with 24 additions and 11 deletions
@@ -321,7 +321,7 @@ func (s *service) GetPath(ctx context.Context, req *provider.GetPathRequest) (*p
return &provider.GetPathResponse{
Status: status.NewOK(ctx),
Path: receivedShare.MountPoint.Path,
Path: filepath.Clean("/" + receivedShare.MountPoint.Path),
}, nil
}
@@ -303,6 +303,7 @@ func (s *svc) executePathCopy(ctx context.Context, selector pool.Selectable[gate
return err
}
httpUploadReq.Header.Set(datagateway.TokenTransportHeader, uploadToken)
httpUploadReq.ContentLength = int64(cp.sourceInfo.GetSize())
httpUploadRes, err := s.client.Do(httpUploadReq)
if err != nil {
@@ -521,6 +522,7 @@ func (s *svc) executeSpacesCopy(ctx context.Context, w http.ResponseWriter, sele
return err
}
httpUploadReq.Header.Set(datagateway.TokenTransportHeader, uploadToken)
httpUploadReq.ContentLength = int64(cp.sourceInfo.GetSize())
httpUploadRes, err := s.client.Do(httpUploadReq)
if err != nil {
@@ -307,6 +307,7 @@ func (s *svc) handlePut(ctx context.Context, w http.ResponseWriter, r *http.Requ
}
Propagator.Inject(ctx, propagation.HeaderCarrier(httpReq.Header))
httpReq.Header.Set(datagateway.TokenTransportHeader, token)
httpReq.ContentLength = length
httpRes, err := s.client.Do(httpReq)
if err != nil {
+13 -5
View File
@@ -72,13 +72,21 @@ func (fs *Decomposedfs) Upload(ctx context.Context, req storage.UploadRequest, u
defer fd.Close()
defer os.RemoveAll(assembledFile)
req.Body = fd
}
size, err := session.WriteChunk(ctx, 0, req.Body)
if err != nil {
return provider.ResourceInfo{}, errors.Wrap(err, "Decomposedfs: error writing to binary file")
size, err := session.WriteChunk(ctx, 0, req.Body)
if err != nil {
return provider.ResourceInfo{}, errors.Wrap(err, "Decomposedfs: error writing to binary file")
}
session.SetSize(size)
} else {
size, err := session.WriteChunk(ctx, 0, req.Body)
if err != nil {
return provider.ResourceInfo{}, errors.Wrap(err, "Decomposedfs: error writing to binary file")
}
if size != req.Length {
return provider.ResourceInfo{}, errtypes.PartialContent("Decomposedfs: unexpected end of stream")
}
}
session.SetSize(size)
if err := session.FinishUpload(ctx); err != nil {
return provider.ResourceInfo{}, err
@@ -96,7 +96,8 @@ func (store OcisStore) List(ctx context.Context) ([]*OcisSession, error) {
}
for _, info := range infoFiles {
progress, err := store.Get(ctx, info)
id := strings.TrimSuffix(filepath.Base(info), filepath.Ext(info))
progress, err := store.Get(ctx, id)
if err != nil {
appctx.GetLogger(ctx).Error().Interface("path", info).Msg("Decomposedfs: could not getUploadSession")
continue