mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 13:05:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Propagator: Don't abort sync on error 503

Browse source 
Only do it when it is actually a maintenance mode

Issues #5088, #5859, https://github.com/owncloud/enterprise/issues/2637
This commit is contained in:
Olivier Goffart 2018-06-20 15:46:58 +02:00 committed by Kevin Ottens
parent feb770eca7
commit edd806960d
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
4 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libsync/owncloudpropagator_p.h
View file

@ -59,8 +59,7 @@ inline QByteArray getEtagFromReply(QNetworkReply *reply)
* Given an error from the network, map to a SyncFileItem::Status error
*/
inline SyncFileItem::Status classifyError(QNetworkReply::NetworkError nerror,
int httpCode,
bool *anotherSyncNeeded = nullptr)
int httpCode, bool *anotherSyncNeeded = nullptr, const QByteArray &errorBody = QByteArray())
{
Q_ASSERT(nerror != QNetworkReply::NoError); // we should only be called when there is an error
@ -76,9 +75,10 @@ inline SyncFileItem::Status classifyError(QNetworkReply::NetworkError nerror,
}
if (httpCode == 503) {
// "Service unavailable"
// Happens for maintenance mode and other temporary outages
return SyncFileItem::FatalError;
// When the server is in maintenance mode, we want to exit the sync immediatly
// so that we do not flood the server with many requests
return errorBody.contains(R"(>Sabre\DAV\Exception\ServiceUnavailable<)") ?
SyncFileItem::FatalError : SyncFileItem::NormalError;
}
if (httpCode == 412) {

7
src/libsync/propagatedownload.cpp
View file

@ -689,13 +689,16 @@ void PropagateDownloadFile::slotGetFinished()
propagator()->_journal->avoidReadFromDbOnNextSync(_item->_file);
}
QByteArray errorBody;
QString errorString = _item->_httpErrorCode >= 400 ? job->errorStringParsingBody(&errorBody)
: job->errorString();
SyncFileItem::Status status = job->errorStatus();
if (status == SyncFileItem::NoStatus) {
status = classifyError(err, _item->_httpErrorCode,
&propagator()->_anotherSyncNeeded);
&propagator()->_anotherSyncNeeded, errorBody);
}
done(status,_item->_httpErrorCode >= 400 ? job->errorStringParsingBody() : job->errorString());
done(status, errorString);
return;
}

2
src/libsync/propagateupload.cpp
View file

@ -651,7 +651,7 @@ void PropagateUploadFileCommon::commonErrorHandling(AbstractNetworkJob *job)
checkResettingErrors();
SyncFileItem::Status status = classifyError(job->reply()->error(), _item->_httpErrorCode,
&propagator()->_anotherSyncNeeded);
&propagator()->_anotherSyncNeeded, replyContent);
// Insufficient remote storage.
if (_item->_httpErrorCode == 507) {

12
test/testsyncengine.cpp
View file

@ -239,8 +239,8 @@ private slots:
fakeFolder.remoteModifier().insert("Y/Z/d7");
fakeFolder.remoteModifier().insert("Y/Z/d8");
fakeFolder.remoteModifier().insert("Y/Z/d9");
fakeFolder.serverErrorPaths().append("Y/Z/d2", 503); // 503 is a fatal error
fakeFolder.serverErrorPaths().append("Y/Z/d3", 503); // 503 is a fatal error
fakeFolder.serverErrorPaths().append("Y/Z/d2", 503);
fakeFolder.serverErrorPaths().append("Y/Z/d3", 503);
QVERIFY(!fakeFolder.syncOnce());
QCoreApplication::processEvents(); // should not crash
@ -251,12 +251,12 @@ private slots:
QVERIFY(!seen.contains(item->_file)); // signal only sent once per item
seen.insert(item->_file);
if (item->_file == "Y/Z/d2") {
QVERIFY(item->_status == SyncFileItem::FatalError);
} else if(item->_file == "Y/Z/d3") {
QVERIFY(item->_status == SyncFileItem::NormalError);
} else if (item->_file == "Y/Z/d3") {
QVERIFY(item->_status != SyncFileItem::Success);
} else if (!item->isDirectory()) {
QVERIFY(item->_status == SyncFileItem::Success);
}
// We do not know about the other files - maybe the sync was aborted,
// maybe they finished before the error caused the abort.
}
}