mirror of
https://github.com/nextcloud/desktop.git
synced 2024-12-22 21:50:30 +03:00
a7847a4e82
This is about the conflicts that happens when the file has been uploaded correctly to the server, but the etag was not recieved because the connection was closed before we got the reply. We used to compare only the mtime when comparing the uploaded file and the existing file. However, to be perfectly correct, we also should check the size. This was found because TestChunkingNG::connectionDroppedBeforeEtagRecieved is flaky. Example of faillure found in https://drone.owncloud.com/owncloud/client/481/5 while testing PR #6626 (very trimmed log:) 06-29 07:58:02:015 [ info sync.csync.csync ]: ## Starting local discovery ## 06-29 07:58:02:016 [ info sync.csync.updater ]: Database entry found, compare: 1530259082 <-> 1530259051, etag: <-> 1644a8c8750, inode: 1935629 <-> 1935629, size: 301 <-> 300, perms: 0 <-> ff, type: 0 <-> 0, checksum: <-> SHA1:cc9adedebe27a6259efb8d6ed09f4f2eff559ad1, ignore: 0 06-29 07:58:02:016 [ info sync.csync.updater ]: file: A/a0, instruction: INSTRUCTION_EVAL <<= 06-29 07:58:02:972 [ warning sync.networkjob ]: QNetworkReply::NetworkError(OperationCanceledError) "Connection timed out" QVariant(Invalid) .. next sync... 06-29 07:58:02:980 [ info sync.engine ]: #### Discovery start #################################################### 06-29 07:58:02:981 [ info sync.csync.csync ]: ## Starting local discovery ## 06-29 07:58:02:983 [ info sync.csync.updater ]: Database entry found, compare: 1530259082 <-> 1530259051, etag: <-> 1644a8c8750, inode: 1935629 <-> 1935629, size: 302 <-> 300, perms: 0 <-> ff, type: 0 <-> 0, checksum: <-> SHA1:cc9adedebe27a6259efb8d6ed09f4f2eff559ad1, ignore: 0 06-29 07:58:02:983 [ info sync.csync.updater ]: file: A/a0, instruction: INSTRUCTION_EVAL <<= 06-29 07:58:02:985 [ info sync.csync.csync ]: ## Starting remote discovery ## 06-29 07:58:02:985 [ info sync.networkjob ]: OCC::LsColJob created for "http://localhost/owncloud" + "" "OCC::DiscoverySingleDirectoryJob" 06-29 07:58:02:987 [ info sync.csync.updater ]: Database entry found, compare: 1530259082 <-> 1530259051, etag: 1644a8c8b26 <-> 1644a8c8750, inode: 0 <-> 1935629, size: 301 <-> 300, perms: ff <-> ff, type: 0 <-> 0, checksum: SHA1:5adcdac9608ae0811247f07f4cf1ab0a2ef99154 <-> SHA1:cc9adedebe27a6259efb8d6ed09f4f2eff559ad1, ignore: 0 06-29 07:58:02:987 [ info sync.csync.updater ]: file: A/a0, instruction: INSTRUCTION_EVAL <<= 06-29 07:58:02:989 [ info sync.csync.csync ]: Update detection for remote replica took 0.004 seconds walking 13 files 06-29 07:58:02:990 [ info sync.engine ]: #### Discovery end #################################################### 9 ms 06-29 07:58:02:990 [ info sync.database ]: Updating file record for path: "A/a0" inode: 1935629 modtime: 1530259082 type: 0 etag: "1644a8c8b26" fileId: "16383ea4" remotePerm: "WDNVCKR" fileSize: 301 checksum: "SHA1:cc9adedebe27a6259efb8d6ed09f4f2eff559ad1" 06-29 07:58:02:990 [ info sync.csync.reconciler ]: INSTRUCTION_UPDATE_METADATA client file: A/a0 06-29 07:58:02:990 [ info sync.csync.csync ]: Reconciliation for local replica took 0 seconds visiting 13 files. 06-29 07:58:02:990 [ info sync.csync.reconciler ]: INSTRUCTION_UPDATE_METADATA server dir: A 06-29 07:58:02:990 [ info sync.csync.csync ]: Reconciliation for remote replica took 0 seconds visiting 13 files. 06-29 07:58:02:990 [ info sync.engine ]: #### Reconcile end #################################################### 9 ms 06-29 07:58:02:990 [ info sync.database ]: Updating local metadata for: "A/a0" 1530259082 302 1935629 FAIL! : TestChunkingNG::connectionDroppedBeforeEtagRecieved(small file) '!fakeFolder.syncOnce()' returned FALSE. ()
506 lines
20 KiB
C++
506 lines
20 KiB
C++
/*
|
|
* Copyright (C) by Olivier Goffart <ogoffart@owncloud.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* for more details.
|
|
*/
|
|
|
|
#include "config.h"
|
|
#include "propagateupload.h"
|
|
#include "owncloudpropagator_p.h"
|
|
#include "networkjobs.h"
|
|
#include "account.h"
|
|
#include "common/syncjournaldb.h"
|
|
#include "common/syncjournalfilerecord.h"
|
|
#include "common/utility.h"
|
|
#include "filesystem.h"
|
|
#include "propagatorjobs.h"
|
|
#include "syncengine.h"
|
|
#include "propagateremotemove.h"
|
|
#include "propagateremotedelete.h"
|
|
#include "common/asserts.h"
|
|
|
|
#include <QNetworkAccessManager>
|
|
#include <QFileInfo>
|
|
#include <QDir>
|
|
#include <cmath>
|
|
#include <cstring>
|
|
|
|
namespace OCC {
|
|
|
|
QUrl PropagateUploadFileNG::chunkUrl(int chunk)
|
|
{
|
|
QString path = QLatin1String("remote.php/dav/uploads/")
|
|
+ propagator()->account()->davUser()
|
|
+ QLatin1Char('/') + QString::number(_transferId);
|
|
if (chunk >= 0) {
|
|
// We need to do add leading 0 because the server orders the chunk alphabetically
|
|
path += QLatin1Char('/') + QString::number(chunk).rightJustified(8, '0');
|
|
}
|
|
return Utility::concatUrlPath(propagator()->account()->url(), path);
|
|
}
|
|
|
|
/*
|
|
State machine:
|
|
|
|
*----> doStartUpload()
|
|
Check the db: is there an entry?
|
|
/ \
|
|
no yes
|
|
/ \
|
|
/ PROPFIND
|
|
startNewUpload() <-+ +----------------------------\
|
|
| | | \
|
|
MKCOL + slotPropfindFinishedWithError() slotPropfindFinished()
|
|
| Is there stale files to remove?
|
|
slotMkColFinished() | |
|
|
| no yes
|
|
| | |
|
|
| | DeleteJob
|
|
| | |
|
|
+-----+<------------------------------------------------------+<--- slotDeleteJobFinished()
|
|
|
|
|
+----> startNextChunk() ---finished? --+
|
|
^ | |
|
|
+---------------+ |
|
|
|
|
|
+----------------------------------------+
|
|
|
|
|
+-> MOVE ------> moveJobFinished() ---> finalize()
|
|
|
|
|
|
*/
|
|
|
|
void PropagateUploadFileNG::doStartUpload()
|
|
{
|
|
propagator()->_activeJobList.append(this);
|
|
|
|
const SyncJournalDb::UploadInfo progressInfo = propagator()->_journal->getUploadInfo(_item->_file);
|
|
if (progressInfo._valid && progressInfo.isChunked() && progressInfo._modtime == _item->_modtime
|
|
&& progressInfo._size == qint64(_item->_size)) {
|
|
_transferId = progressInfo._transferid;
|
|
auto url = chunkUrl();
|
|
auto job = new LsColJob(propagator()->account(), url, this);
|
|
_jobs.append(job);
|
|
job->setProperties(QList<QByteArray>() << "resourcetype"
|
|
<< "getcontentlength");
|
|
connect(job, &LsColJob::finishedWithoutError, this, &PropagateUploadFileNG::slotPropfindFinished);
|
|
connect(job, &LsColJob::finishedWithError,
|
|
this, &PropagateUploadFileNG::slotPropfindFinishedWithError);
|
|
connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed);
|
|
connect(job, &LsColJob::directoryListingIterated,
|
|
this, &PropagateUploadFileNG::slotPropfindIterate);
|
|
job->start();
|
|
return;
|
|
} else if (progressInfo._valid && progressInfo.isChunked()) {
|
|
// The upload info is stale. remove the stale chunks on the server
|
|
_transferId = progressInfo._transferid;
|
|
// Fire and forget. Any error will be ignored.
|
|
(new DeleteJob(propagator()->account(), chunkUrl(), this))->start();
|
|
// startNewUpload will reset the _transferId and the UploadInfo in the db.
|
|
}
|
|
|
|
startNewUpload();
|
|
}
|
|
|
|
void PropagateUploadFileNG::slotPropfindIterate(const QString &name, const QMap<QString, QString> &properties)
|
|
{
|
|
if (name == chunkUrl().path()) {
|
|
return; // skip the info about the path itself
|
|
}
|
|
bool ok = false;
|
|
QString chunkName = name.mid(name.lastIndexOf('/') + 1);
|
|
auto chunkId = chunkName.toUInt(&ok);
|
|
if (ok) {
|
|
ServerChunkInfo chunkinfo = { properties["getcontentlength"].toULongLong(), chunkName };
|
|
_serverChunks[chunkId] = chunkinfo;
|
|
}
|
|
}
|
|
|
|
void PropagateUploadFileNG::slotPropfindFinished()
|
|
{
|
|
auto job = qobject_cast<LsColJob *>(sender());
|
|
slotJobDestroyed(job); // remove it from the _jobs list
|
|
propagator()->_activeJobList.removeOne(this);
|
|
|
|
_currentChunk = 0;
|
|
_sent = 0;
|
|
while (_serverChunks.contains(_currentChunk)) {
|
|
_sent += _serverChunks[_currentChunk].size;
|
|
_serverChunks.remove(_currentChunk);
|
|
++_currentChunk;
|
|
}
|
|
|
|
if (_sent > _fileToUpload._size) {
|
|
// Normally this can't happen because the size is xor'ed with the transfer id, and it is
|
|
// therefore impossible that there is more data on the server than on the file.
|
|
qCCritical(lcPropagateUpload) << "Inconsistency while resuming " << _item->_file
|
|
<< ": the size on the server (" << _sent << ") is bigger than the size of the file ("
|
|
<< _fileToUpload._size << ")";
|
|
|
|
// Wipe the old chunking data.
|
|
// Fire and forget. Any error will be ignored.
|
|
(new DeleteJob(propagator()->account(), chunkUrl(), this))->start();
|
|
|
|
propagator()->_activeJobList.append(this);
|
|
startNewUpload();
|
|
return;
|
|
}
|
|
|
|
qCInfo(lcPropagateUpload) << "Resuming " << _item->_file << " from chunk " << _currentChunk << "; sent =" << _sent;
|
|
|
|
if (!_serverChunks.isEmpty()) {
|
|
qCInfo(lcPropagateUpload) << "To Delete" << _serverChunks.keys();
|
|
propagator()->_activeJobList.append(this);
|
|
_removeJobError = false;
|
|
|
|
// Make sure that if there is a "hole" and then a few more chunks, on the server
|
|
// we should remove the later chunks. Otherwise when we do dynamic chunk sizing, we may end up
|
|
// with corruptions if there are too many chunks, or if we abort and there are still stale chunks.
|
|
for (const auto &serverChunk : qAsConst(_serverChunks)) {
|
|
auto job = new DeleteJob(propagator()->account(), Utility::concatUrlPath(chunkUrl(), serverChunk.originalName), this);
|
|
QObject::connect(job, &DeleteJob::finishedSignal, this, &PropagateUploadFileNG::slotDeleteJobFinished);
|
|
_jobs.append(job);
|
|
job->start();
|
|
}
|
|
_serverChunks.clear();
|
|
return;
|
|
}
|
|
|
|
startNextChunk();
|
|
}
|
|
|
|
void PropagateUploadFileNG::slotPropfindFinishedWithError()
|
|
{
|
|
auto job = qobject_cast<LsColJob *>(sender());
|
|
slotJobDestroyed(job); // remove it from the _jobs list
|
|
QNetworkReply::NetworkError err = job->reply()->error();
|
|
auto httpErrorCode = job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
|
auto status = classifyError(err, httpErrorCode, &propagator()->_anotherSyncNeeded);
|
|
if (status == SyncFileItem::FatalError) {
|
|
propagator()->_activeJobList.removeOne(this);
|
|
abortWithError(status, job->errorStringParsingBody());
|
|
return;
|
|
}
|
|
startNewUpload();
|
|
}
|
|
|
|
void PropagateUploadFileNG::slotDeleteJobFinished()
|
|
{
|
|
auto job = qobject_cast<DeleteJob *>(sender());
|
|
ASSERT(job);
|
|
_jobs.remove(_jobs.indexOf(job));
|
|
|
|
QNetworkReply::NetworkError err = job->reply()->error();
|
|
if (err != QNetworkReply::NoError && err != QNetworkReply::ContentNotFoundError) {
|
|
const int httpStatus = job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
|
SyncFileItem::Status status = classifyError(err, httpStatus);
|
|
if (status == SyncFileItem::FatalError) {
|
|
abortWithError(status, job->errorString());
|
|
return;
|
|
} else {
|
|
qCWarning(lcPropagateUpload) << "DeleteJob errored out" << job->errorString() << job->reply()->url();
|
|
_removeJobError = true;
|
|
// Let the other jobs finish
|
|
}
|
|
}
|
|
|
|
if (_jobs.isEmpty()) {
|
|
propagator()->_activeJobList.removeOne(this);
|
|
if (_removeJobError) {
|
|
// There was an error removing some files, just start over
|
|
startNewUpload();
|
|
} else {
|
|
startNextChunk();
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
void PropagateUploadFileNG::startNewUpload()
|
|
{
|
|
ASSERT(propagator()->_activeJobList.count(this) == 1);
|
|
_transferId = qrand() ^ _item->_modtime ^ (_fileToUpload._size << 16) ^ qHash(_fileToUpload._file);
|
|
_sent = 0;
|
|
_currentChunk = 0;
|
|
|
|
propagator()->reportProgress(*_item, 0);
|
|
|
|
SyncJournalDb::UploadInfo pi;
|
|
pi._valid = true;
|
|
pi._transferid = _transferId;
|
|
pi._modtime = _item->_modtime;
|
|
pi._contentChecksum = _item->_checksumHeader;
|
|
pi._size = _item->_size;
|
|
propagator()->_journal->setUploadInfo(_item->_file, pi);
|
|
propagator()->_journal->commit("Upload info");
|
|
QMap<QByteArray, QByteArray> headers;
|
|
|
|
// But we should send the temporary (or something) one.
|
|
headers["OC-Total-Length"] = QByteArray::number(_fileToUpload._size);
|
|
auto job = new MkColJob(propagator()->account(), chunkUrl(), headers, this);
|
|
|
|
connect(job, SIGNAL(finished(QNetworkReply::NetworkError)),
|
|
this, SLOT(slotMkColFinished(QNetworkReply::NetworkError)));
|
|
connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed);
|
|
job->start();
|
|
}
|
|
|
|
void PropagateUploadFileNG::slotMkColFinished(QNetworkReply::NetworkError)
|
|
{
|
|
propagator()->_activeJobList.removeOne(this);
|
|
auto job = qobject_cast<MkColJob *>(sender());
|
|
slotJobDestroyed(job); // remove it from the _jobs list
|
|
QNetworkReply::NetworkError err = job->reply()->error();
|
|
_item->_httpErrorCode = job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
|
|
|
if (err != QNetworkReply::NoError || _item->_httpErrorCode != 201) {
|
|
SyncFileItem::Status status = classifyError(err, _item->_httpErrorCode,
|
|
&propagator()->_anotherSyncNeeded);
|
|
abortWithError(status, job->errorStringParsingBody());
|
|
return;
|
|
}
|
|
startNextChunk();
|
|
}
|
|
|
|
void PropagateUploadFileNG::startNextChunk()
|
|
{
|
|
if (propagator()->_abortRequested.fetchAndAddRelaxed(0))
|
|
return;
|
|
|
|
quint64 fileSize = _fileToUpload._size;
|
|
ENFORCE(fileSize >= _sent, "Sent data exceeds file size");
|
|
|
|
// prevent situation that chunk size is bigger then required one to send
|
|
_currentChunkSize = qMin(propagator()->_chunkSize, fileSize - _sent);
|
|
|
|
if (_currentChunkSize == 0) {
|
|
Q_ASSERT(_jobs.isEmpty()); // There should be no running job anymore
|
|
_finished = true;
|
|
|
|
// Finish with a MOVE
|
|
// If we changed the file name, we must store the changed filename in the remote folder, not the original one.
|
|
QString destination = QDir::cleanPath(propagator()->account()->url().path() + QLatin1Char('/')
|
|
+ propagator()->account()->davPath() + propagator()->_remoteFolder + _fileToUpload._file);
|
|
auto headers = PropagateUploadFileCommon::headers();
|
|
|
|
// "If-Match applies to the source, but we are interested in comparing the etag of the destination
|
|
auto ifMatch = headers.take("If-Match");
|
|
if (!ifMatch.isEmpty()) {
|
|
headers["If"] = "<" + QUrl::toPercentEncoding(destination, "/") + "> ([" + ifMatch + "])";
|
|
}
|
|
if (!_transmissionChecksumHeader.isEmpty()) {
|
|
qCInfo(lcPropagateUpload) << destination << _transmissionChecksumHeader;
|
|
headers[checkSumHeaderC] = _transmissionChecksumHeader;
|
|
}
|
|
headers["OC-Total-Length"] = QByteArray::number(fileSize);
|
|
|
|
auto job = new MoveJob(propagator()->account(), Utility::concatUrlPath(chunkUrl(), "/.file"),
|
|
destination, headers, this);
|
|
_jobs.append(job);
|
|
connect(job, &MoveJob::finishedSignal, this, &PropagateUploadFileNG::slotMoveJobFinished);
|
|
connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed);
|
|
propagator()->_activeJobList.append(this);
|
|
adjustLastJobTimeout(job, fileSize);
|
|
job->start();
|
|
return;
|
|
}
|
|
|
|
auto device = std::make_unique<UploadDevice>(&propagator()->_bandwidthManager);
|
|
const QString fileName = _fileToUpload._path;
|
|
|
|
if (!device->prepareAndOpen(fileName, _sent, _currentChunkSize)) {
|
|
qCWarning(lcPropagateUpload) << "Could not prepare upload device: " << device->errorString();
|
|
|
|
// If the file is currently locked, we want to retry the sync
|
|
// when it becomes available again.
|
|
if (FileSystem::isFileLocked(fileName)) {
|
|
emit propagator()->seenLockedFile(fileName);
|
|
}
|
|
// Soft error because this is likely caused by the user modifying his files while syncing
|
|
abortWithError(SyncFileItem::SoftError, device->errorString());
|
|
return;
|
|
}
|
|
|
|
QMap<QByteArray, QByteArray> headers;
|
|
headers["OC-Chunk-Offset"] = QByteArray::number(_sent);
|
|
|
|
_sent += _currentChunkSize;
|
|
QUrl url = chunkUrl(_currentChunk);
|
|
|
|
// job takes ownership of device via a QScopedPointer. Job deletes itself when finishing
|
|
auto devicePtr = device.get(); // for connections later
|
|
auto *job = new PUTFileJob(propagator()->account(), url, std::move(device), headers, _currentChunk, this);
|
|
_jobs.append(job);
|
|
connect(job, &PUTFileJob::finishedSignal, this, &PropagateUploadFileNG::slotPutFinished);
|
|
connect(job, &PUTFileJob::uploadProgress,
|
|
this, &PropagateUploadFileNG::slotUploadProgress);
|
|
connect(job, &PUTFileJob::uploadProgress,
|
|
devicePtr, &UploadDevice::slotJobUploadProgress);
|
|
connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed);
|
|
job->start();
|
|
propagator()->_activeJobList.append(this);
|
|
_currentChunk++;
|
|
}
|
|
|
|
void PropagateUploadFileNG::slotPutFinished()
|
|
{
|
|
auto *job = qobject_cast<PUTFileJob *>(sender());
|
|
ASSERT(job);
|
|
|
|
slotJobDestroyed(job); // remove it from the _jobs list
|
|
|
|
propagator()->_activeJobList.removeOne(this);
|
|
|
|
if (_finished) {
|
|
// We have sent the finished signal already. We don't need to handle any remaining jobs
|
|
return;
|
|
}
|
|
|
|
QNetworkReply::NetworkError err = job->reply()->error();
|
|
|
|
if (err != QNetworkReply::NoError) {
|
|
_item->_httpErrorCode = job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
|
commonErrorHandling(job);
|
|
return;
|
|
}
|
|
|
|
ENFORCE(_sent <= _fileToUpload._size, "can't send more than size");
|
|
|
|
// Adjust the chunk size for the time taken.
|
|
//
|
|
// Dynamic chunk sizing is enabled if the server configured a
|
|
// target duration for each chunk upload.
|
|
auto targetDuration = propagator()->syncOptions()._targetChunkUploadDuration;
|
|
if (targetDuration.count() > 0) {
|
|
auto uploadTime = ++job->msSinceStart(); // add one to avoid div-by-zero
|
|
qint64 predictedGoodSize = (_currentChunkSize * targetDuration) / uploadTime;
|
|
|
|
// The whole targeting is heuristic. The predictedGoodSize will fluctuate
|
|
// quite a bit because of external factors (like available bandwidth)
|
|
// and internal factors (like number of parallel uploads).
|
|
//
|
|
// We use an exponential moving average here as a cheap way of smoothing
|
|
// the chunk sizes a bit.
|
|
quint64 targetSize = (propagator()->_chunkSize + predictedGoodSize) / 2;
|
|
|
|
// Adjust the dynamic chunk size _chunkSize used for sizing of the item's chunks to be send
|
|
propagator()->_chunkSize = qBound(
|
|
propagator()->syncOptions()._minChunkSize,
|
|
targetSize,
|
|
propagator()->syncOptions()._maxChunkSize);
|
|
|
|
qCInfo(lcPropagateUpload) << "Chunked upload of" << _currentChunkSize << "bytes took" << uploadTime.count()
|
|
<< "ms, desired is" << targetDuration.count() << "ms, expected good chunk size is"
|
|
<< predictedGoodSize << "bytes and nudged next chunk size to "
|
|
<< propagator()->_chunkSize << "bytes";
|
|
}
|
|
|
|
_finished = _sent == _item->_size;
|
|
|
|
// Check if the file still exists
|
|
const QString fullFilePath(propagator()->getFilePath(_item->_file));
|
|
if (!FileSystem::fileExists(fullFilePath)) {
|
|
if (!_finished) {
|
|
abortWithError(SyncFileItem::SoftError, tr("The local file was removed during sync."));
|
|
return;
|
|
} else {
|
|
propagator()->_anotherSyncNeeded = true;
|
|
}
|
|
}
|
|
|
|
// Check whether the file changed since discovery - this acts on the original file.
|
|
if (!FileSystem::verifyFileUnchanged(fullFilePath, _item->_size, _item->_modtime)) {
|
|
propagator()->_anotherSyncNeeded = true;
|
|
if (!_finished) {
|
|
abortWithError(SyncFileItem::SoftError, tr("Local file changed during sync."));
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (!_finished) {
|
|
// Deletes an existing blacklist entry on successful chunk upload
|
|
if (_item->_hasBlacklistEntry) {
|
|
propagator()->_journal->wipeErrorBlacklistEntry(_item->_file);
|
|
_item->_hasBlacklistEntry = false;
|
|
}
|
|
|
|
// Reset the error count on successful chunk upload
|
|
auto uploadInfo = propagator()->_journal->getUploadInfo(_item->_file);
|
|
uploadInfo._errorCount = 0;
|
|
propagator()->_journal->setUploadInfo(_item->_file, uploadInfo);
|
|
propagator()->_journal->commit("Upload info");
|
|
}
|
|
startNextChunk();
|
|
}
|
|
|
|
void PropagateUploadFileNG::slotMoveJobFinished()
|
|
{
|
|
propagator()->_activeJobList.removeOne(this);
|
|
auto job = qobject_cast<MoveJob *>(sender());
|
|
slotJobDestroyed(job); // remove it from the _jobs list
|
|
QNetworkReply::NetworkError err = job->reply()->error();
|
|
_item->_httpErrorCode = job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
|
|
|
if (err != QNetworkReply::NoError) {
|
|
commonErrorHandling(job);
|
|
return;
|
|
}
|
|
if (_item->_httpErrorCode != 201 && _item->_httpErrorCode != 204) {
|
|
abortWithError(SyncFileItem::NormalError, tr("Unexpected return code from server (%1)").arg(_item->_httpErrorCode));
|
|
return;
|
|
}
|
|
|
|
QByteArray fid = job->reply()->rawHeader("OC-FileID");
|
|
if (fid.isEmpty()) {
|
|
qCWarning(lcPropagateUpload) << "Server did not return a OC-FileID" << _item->_file;
|
|
abortWithError(SyncFileItem::NormalError, tr("Missing File ID from server"));
|
|
return;
|
|
} else {
|
|
// the old file id should only be empty for new files uploaded
|
|
if (!_item->_fileId.isEmpty() && _item->_fileId != fid) {
|
|
qCWarning(lcPropagateUpload) << "File ID changed!" << _item->_fileId << fid;
|
|
}
|
|
_item->_fileId = fid;
|
|
}
|
|
|
|
_item->_etag = getEtagFromReply(job->reply());
|
|
;
|
|
if (_item->_etag.isEmpty()) {
|
|
qCWarning(lcPropagateUpload) << "Server did not return an ETAG" << _item->_file;
|
|
abortWithError(SyncFileItem::NormalError, tr("Missing ETag from server"));
|
|
return;
|
|
}
|
|
_item->_responseTimeStamp = job->responseTimestamp();
|
|
finalize();
|
|
}
|
|
|
|
void PropagateUploadFileNG::slotUploadProgress(qint64 sent, qint64 total)
|
|
{
|
|
// Completion is signaled with sent=0, total=0; avoid accidentally
|
|
// resetting progress due to the sent being zero by ignoring it.
|
|
// finishedSignal() is bound to be emitted soon anyway.
|
|
// See https://bugreports.qt.io/browse/QTBUG-44782.
|
|
if (sent == 0 && total == 0) {
|
|
return;
|
|
}
|
|
propagator()->reportProgress(*_item, _sent + sent - total);
|
|
}
|
|
|
|
void PropagateUploadFileNG::abort(PropagatorJob::AbortType abortType)
|
|
{
|
|
abortNetworkJobs(
|
|
abortType,
|
|
[abortType](AbstractNetworkJob *job) {
|
|
return abortType != AbortType::Asynchronous || !qobject_cast<MoveJob *>(job);
|
|
});
|
|
}
|
|
|
|
}
|