IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix backup s3: split stream

Browse Source
This commit is contained in:
Anton Suhorukov 2023-03-29 12:19:35 +03:00
parent f847ca6089
commit 08d4050143
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
common/ASC.Data.Storage/ZipOperators/S3ZipWriteOperator.cs
View File

@ -89,12 +89,47 @@ public class S3ZipWriteOperator : IDataWriteOperator
{
var fs = _fileStream;
_fileStream = null;
Computehash(fs, false);
Upload(fs);
SplitAndUpload(fs);
}
}
private void Computehash(Stream stream, bool last)
private void SplitAndUpload(Stream stream, bool last = false)
{
stream.Position = 0;
var buffer = new byte[_sessionHolder.MaxChunkUploadSize];
int bytesRead;
while ((bytesRead = stream.Read(buffer, 0, (int)_sessionHolder.MaxChunkUploadSize)) > 0)
{
var tempStream = _tempStream.Create();
tempStream.Write(buffer, 0, bytesRead);
if (tempStream.Length == _sessionHolder.MaxChunkUploadSize)
{
tempStream.Position = 0;
ComputeHash(tempStream, false);
Upload(tempStream);
}
else
{
if (last)
{
ComputeHash(tempStream, last);
Upload(tempStream);
}
else
{
tempStream.Position = tempStream.Length;
_fileStream = tempStream;
_gZipOutputStream.baseOutputStream_ = _fileStream;
}
}
}
stream.Dispose();
}
private void ComputeHash(Stream stream, bool last)
{
stream.Position = 0;
var buffer = new byte[_sessionHolder.MaxChunkUploadSize];
@ -134,8 +169,7 @@ public class S3ZipWriteOperator : IDataWriteOperator
_tarOutputStream.Close();
_tarOutputStream.Dispose();
Computehash(_fileStream, true);
Upload(_fileStream);
SplitAndUpload(_fileStream, true);
Task.WaitAll(_tasks.ToArray());