mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 17:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

allow sending parallel batch of files: curretly disabled

Browse source 
can allow to send a new batch before the reply to a previous one is
received

due to concerns with the reliability on the server side this is disabled

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2021-11-25 22:11:59 +01:00
parent a272b34809
commit 34c4c28879
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/libsync/bulkpropagatorjob.cpp
View file

@ -66,6 +66,7 @@ QByteArray getHeaderFromJsonReply(const QJsonObject &reply, const QByteArray &he
constexpr auto batchSize = 100;
constexpr auto parallelJobsMaximumCount = 1;
}
namespace OCC {
@ -107,7 +108,7 @@ bool BulkPropagatorJob::scheduleSelfOrChild()
PropagatorJob::JobParallelism BulkPropagatorJob::parallelism()
{
return PropagatorJob::JobParallelism::WaitForFinished;
return PropagatorJob::JobParallelism::FullParallelism;
}
void BulkPropagatorJob::startUploadFile(SyncFileItemPtr item, UploadFileInfo fileToUpload)
@ -225,6 +226,9 @@ void BulkPropagatorJob::triggerUpload()
adjustLastJobTimeout(job.get(), timeout);
_jobs.append(job.get());
job.release()->start();
if (parallelism() == PropagatorJob::JobParallelism::FullParallelism && _jobs.size() < parallelJobsMaximumCount) {
scheduleSelfOrChild();
}
}
void BulkPropagatorJob::slotComputeTransmissionChecksum(SyncFileItemPtr item,
@ -378,7 +382,7 @@ void BulkPropagatorJob::slotPutFinished()
slotPutFinishedOneFile(singleFile, job, singleReplyObject);
}
finalize();
finalize(fullReplyObject);
}
void BulkPropagatorJob::slotUploadProgress(SyncFileItemPtr item, qint64 sent, qint64 total)
@ -438,18 +442,23 @@ void BulkPropagatorJob::finalizeOneFile(const BulkUploadItem &oneFile)
propagator()->_journal->commit("upload file start");
}
void BulkPropagatorJob::finalize()
void BulkPropagatorJob::finalize(const QJsonObject &fullReply)
{
for(const auto &oneFile : _filesToUpload) {
if (!oneFile._item->hasErrorStatus()) {
finalizeOneFile(oneFile);
for(auto singleFileIt = std::begin(_filesToUpload); singleFileIt != std::end(_filesToUpload); ) {
const auto &singleFile = *singleFileIt;
if (!fullReply.contains(singleFile._remotePath)) {
++singleFileIt;
continue;
}
if (!singleFile._item->hasErrorStatus()) {
finalizeOneFile(singleFile);
}
done(oneFile._item, oneFile._item->_status, {});
}
done(singleFile._item, singleFile._item->_status, {});
Q_ASSERT(!_filesToUpload.empty());
_filesToUpload.clear();
singleFileIt = _filesToUpload.erase(singleFileIt);
}
if (_items.empty()) {
if (!_jobs.empty()) {

2
src/libsync/bulkpropagatorjob.h
View file

@ -98,7 +98,7 @@ private:
void adjustLastJobTimeout(AbstractNetworkJob *job,
qint64 fileSize) const;
void finalize();
void finalize(const QJsonObject &fullReply);
void finalizeOneFile(const BulkUploadItem &oneFile);