Revert "Remove behavior changes."

allexzander · allexzander · commit d6d3add0bfee · 2022-08-05T13:07:55.000+03:00
This reverts commit 84d06ce.
diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp
@@ -1722,7 +1722,7 @@ void SyncJournalDb::deleteStaleFlagsEntries()
 
     SqlQuery delQuery("DELETE FROM flags WHERE path != '' AND path NOT IN (SELECT path from metadata);", _db);
     if (!delQuery.exec()) {
-        qCWarning(lcDb) << QStringLiteral("deleteStaleFlagsEntries") << delQuery.error();
+        sqlFail(QStringLiteral("deleteStaleFlagsEntries"), delQuery);
     }
 }
 
@@ -1865,7 +1865,7 @@ void SyncJournalDb::setPollInfo(const SyncJournalDb::PollInfo &info)
         SqlQuery query("DELETE FROM async_poll WHERE path=?", _db);
         query.bindValue(1, info._file);
         if (!query.exec()) {
-            qCWarning(lcDb) << QStringLiteral("setPollInfo DELETE FROM async_poll") << query.error();
+            sqlFail(QStringLiteral("setPollInfo DELETE FROM async_poll"), query);
         }
     } else {
         SqlQuery query("INSERT OR REPLACE INTO async_poll (path, modtime, filesize, pollpath) VALUES( ? , ? , ? , ? )", _db);
@@ -1874,7 +1874,7 @@ void SyncJournalDb::setPollInfo(const SyncJournalDb::PollInfo &info)
         query.bindValue(3, info._fileSize);
         query.bindValue(4, info._url);
         if (!query.exec()) {
-            qCWarning(lcDb) << QStringLiteral("setPollInfo INSERT OR REPLACE INTO async_poll") << query.error();
+            sqlFail(QStringLiteral("setPollInfo INSERT OR REPLACE INTO async_poll"), query);
         }
     }
 }
@@ -1963,7 +1963,7 @@ void SyncJournalDb::avoidRenamesOnNextSync(const QByteArray &path)
     query.bindValue(1, path);
 
     if (!query.exec()) {
-        qCWarning(lcDb) << QStringLiteral("avoidRenamesOnNextSync path: %1").arg(QString::fromUtf8(path)) << query.error();
+        sqlFail(QStringLiteral("avoidRenamesOnNextSync path: %1").arg(QString::fromUtf8(path)), query);
     }
 
     // We also need to remove the ETags so the update phase refreshes the directory paths
@@ -1991,7 +1991,7 @@ void SyncJournalDb::schedulePathForRemoteDiscovery(const QByteArray &fileName)
     query.bindValue(1, argument);
 
     if (!query.exec()) {
-        qCWarning(lcDb) << QStringLiteral("schedulePathForRemoteDiscovery path: %11").arg(QString::fromUtf8(fileName)) << query.error();
+        sqlFail(QStringLiteral("schedulePathForRemoteDiscovery path: %1").arg(QString::fromUtf8(fileName)), query);
     }
 
     // Prevent future overwrite of the etags of this folder and all
@@ -2023,7 +2023,7 @@ void SyncJournalDb::forceRemoteDiscoveryNextSyncLocked()
     deleteRemoteFolderEtagsQuery.prepare("UPDATE metadata SET md5='_invalid_' WHERE type=2;");
 
     if (!deleteRemoteFolderEtagsQuery.exec()) {
-        qCWarning(lcDb) << QStringLiteral("forceRemoteDiscoveryNextSyncLocked") << deleteRemoteFolderEtagsQuery.error();
+        sqlFail(QStringLiteral("forceRemoteDiscoveryNextSyncLocked"), deleteRemoteFolderEtagsQuery);
     }
 }
 
@@ -2233,7 +2233,7 @@ void SyncJournalDb::clearFileTable()
     query.prepare("DELETE FROM metadata;");
 
     if (!query.exec()) {
-        qCWarning(lcDb) << QStringLiteral("clearFileTable") << query.error();
+        sqlFail(QStringLiteral("clearFileTable"), query);
     }
 }
 
@@ -2250,7 +2250,7 @@ void SyncJournalDb::markVirtualFileForDownloadRecursively(const QByteArray &path
     query.bindValue(1, path);
 
     if (!query.exec()) {
-        qCWarning(lcDb) << QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET type=5 path: %1").arg(QString::fromUtf8(path)) << query.error();
+        sqlFail(QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET type=5 path: %1").arg(QString::fromUtf8(path)), query);
     }
 
     // We also must make sure we do not read the files from the database (same logic as in schedulePathForRemoteDiscovery)
@@ -2261,7 +2261,7 @@ void SyncJournalDb::markVirtualFileForDownloadRecursively(const QByteArray &path
     query.bindValue(1, path);
 
     if (!query.exec()) {
-        qCWarning(lcDb) << QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET md5='_invalid_' path: %1").arg(QString::fromUtf8(path)) << query.error();
+        sqlFail(QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET md5='_invalid_' path: %1").arg(QString::fromUtf8(path)), query);
     }
 }
 
@@ -2395,6 +2395,8 @@ SyncJournalDb::PinStateInterface::rawList()
 
     if (!query.exec()) {
         qCWarning(lcDb) << "SQL Error" << "PinStateInterface::rawList" << query.error();
+        _db->close();
+        ASSERT(false);
     }
 
     QVector<QPair<QByteArray, PinState>> result;
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
@@ -626,6 +626,7 @@ void Folder::implicitlyHydrateFile(const QString &relativepath)
     ;
     if (!_journal.getFileRecord(relativepath.toUtf8(), &record)) {
         qCWarning(lcFolder) << "could not get file from local DB" << relativepath;
+        return;
     }
     if (!record.isValid()) {
         qCInfo(lcFolder) << "Did not find file in db";
@@ -641,6 +642,7 @@ void Folder::implicitlyHydrateFile(const QString &relativepath)
     const auto result = _journal.setFileRecord(record);
     if (!result) {
         qCWarning(lcFolder) << "Error when setting the file record to the database" << record._path << result.error();
+        return;
     }
 
     // Change the file's pin state if it's contradictory to being hydrated
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
@@ -900,6 +900,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
             // Not locally, not on the server. The entry is stale!
             qCInfo(lcDisco) << "Stale DB entry";
             if (!_discoveryData->_statedb->deleteFileRecord(path._original, true)) {
+                _discoveryData->fatalError(tr("Error while deleting file record %1 from the database").arg(path._original));
                 qCWarning(lcDisco) << "Failed to delete a file record from the local DB" << path._original;
             }
             return;
diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
@@ -1197,6 +1197,13 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)
         if (_item->_instruction == CSYNC_INSTRUCTION_RENAME && _item->_originalFile != _item->_renameTarget) {
             if (!propagator()->_journal->deleteFileRecord(_item->_originalFile, true)) {
                 qCWarning(lcDirectory) << "could not delete file from local DB" << _item->_originalFile;
+                _state = Finished;
+                status = _item->_status = SyncFileItem::FatalError;
+                _item->_errorString = tr("could not delete file %1 from local DB").arg(_item->_originalFile);
+                qCInfo(lcPropagator) << "PropagateDirectory::slotSubJobsFinished"
+                                     << "emit finished" << status;
+                emit finished(status);
+                return;
             }
         }
 
diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
@@ -461,6 +461,8 @@ void PropagateDownloadFile::start()
     SyncJournalFileRecord parentRec;
     if (!propagator()->_journal->getFileRecord(parentPath, &parentRec)) {
         qCWarning(lcPropagateDownload) << "could not get file from local DB" << parentPath;
+        done(SyncFileItem::NormalError, tr("could not get file %1 from local DB").arg(parentPath));
+        return;
     }
 
     const auto account = propagator()->account();
@@ -507,6 +509,8 @@ void PropagateDownloadFile::startAfterIsEncryptedIsChecked()
 
         if (!propagator()->_journal->deleteFileRecord(_item->_originalFile)) {
             qCWarning(lcPropagateDownload) << "could not delete file from local DB" << _item->_originalFile;
+            done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(_item->_originalFile));
+            return;
         }
 
         updateMetadata(false);
@@ -1245,6 +1249,8 @@ void PropagateDownloadFile::downloadFinished()
 
             if (!propagator()->_journal->deleteFileRecord(virtualFile)) {
                 qCWarning(lcPropagateDownload) << "could not delete file from local DB" << virtualFile;
+                done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(virtualFile));
+                return;
             }
 
             // Move the pin state to the new location
diff --git a/src/libsync/propagateremotedelete.cpp b/src/libsync/propagateremotedelete.cpp
@@ -115,6 +115,8 @@ void PropagateRemoteDelete::slotDeleteJobFinished()
 
     if (!propagator()->_journal->deleteFileRecord(_item->_originalFile, _item->isDirectory())) {
         qCWarning(lcPropagateRemoteDelete) << "could not delete file from local DB" << _item->_originalFile;
+        done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(_item->_originalFile));
+        return;
     }
 
     propagator()->_journal->commit("Remote Remove");
diff --git a/src/libsync/propagateremotemove.cpp b/src/libsync/propagateremotemove.cpp
@@ -247,6 +247,8 @@ void PropagateRemoteMove::finalize()
     SyncJournalFileRecord oldRecord;
     if (!propagator()->_journal->getFileRecord(_item->_originalFile, &oldRecord)) {
         qCWarning(lcPropagateRemoteMove) << "could not get file from local DB" << _item->_originalFile;
+        done(SyncFileItem::NormalError, tr("could not get file %1 from local DB").arg(_item->_originalFile));
+        return;
     }
     auto &vfs = propagator()->syncOptions()._vfs;
     auto pinState = vfs->pinState(_item->_originalFile);
@@ -257,6 +259,8 @@ void PropagateRemoteMove::finalize()
         // Delete old db data.
         if (!propagator()->_journal->deleteFileRecord(_item->_originalFile)) {
             qCWarning(lcPropagateRemoteMove) << "could not delete file from local DB" << _item->_originalFile;
+            done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(_item->_originalFile));
+            return;
         }
         if (!vfs->setPinState(_item->_originalFile, PinState::Inherited)) {
             qCWarning(lcPropagateRemoteMove) << "Could not set pin state of" << _item->_originalFile << "to inherited";
diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp
@@ -130,6 +130,8 @@ void PropagateLocalRemove::start()
     propagator()->reportProgress(*_item, 0);
     if (!propagator()->_journal->deleteFileRecord(_item->_originalFile, _item->isDirectory())) {
         qCWarning(lcPropagateLocalRename) << "could not delete file from local DB" << _item->_originalFile;
+        done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(_item->_originalFile));
+        return;
     }
     propagator()->_journal->commit("Local remove");
     done(SyncFileItem::Success);
@@ -249,9 +251,13 @@ void PropagateLocalRename::start()
     SyncJournalFileRecord oldRecord;
     if (!propagator()->_journal->getFileRecord(_item->_originalFile, &oldRecord)) {
         qCWarning(lcPropagateLocalRename) << "could not get file from local DB" << _item->_originalFile;
+        done(SyncFileItem::NormalError, tr("could not get file %1 from local DB").arg(_item->_originalFile));
+        return;
     }
     if (!propagator()->_journal->deleteFileRecord(_item->_originalFile)) {
         qCWarning(lcPropagateLocalRename) << "could not delete file from local DB" << _item->_originalFile;
+        done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(_item->_originalFile));
+        return;
     }
 
     auto &vfs = propagator()->syncOptions()._vfs;
diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
@@ -377,6 +377,9 @@ void OCC::SyncEngine::slotItemDiscovered(const OCC::SyncFileItemPtr &item)
 
             // Updating the db happens on success
             if (!_journal->setFileRecord(rec)) {
+                item->_status = SyncFileItem::Status::NormalError;
+                item->_instruction = CSYNC_INSTRUCTION_ERROR;
+                item->_errorString = tr("Could not set file record to local DB: %1").arg(rec.path());
                 qCWarning(lcEngine) << "Could not set file record to local DB" << rec.path();
             }
 
diff --git a/src/libsync/vfs/cfapi/hydrationjob.cpp b/src/libsync/vfs/cfapi/hydrationjob.cpp
@@ -291,6 +291,7 @@ void OCC::HydrationJob::finalize(OCC::VfsCfApi *vfs)
     SyncJournalFileRecord record;
     if (!_journal->getFileRecord(_folderPath, &record)) {
         qCWarning(lcHydration) << "could not get file from local DB" << _folderPath;
+        return;
     }
     Q_ASSERT(record.isValid());
     if (!record.isValid()) {

Original file line number	Diff line number	Diff line change
`@@ -1722,7 +1722,7 @@ void SyncJournalDb::deleteStaleFlagsEntries()`
`1722`	`1722`
`1723`	`1723`	`SqlQuery delQuery("DELETE FROM flags WHERE path != '' AND path NOT IN (SELECT path from metadata);", _db);`
`1724`	`1724`	`if (!delQuery.exec()) {`
`1725`		`- qCWarning(lcDb) << QStringLiteral("deleteStaleFlagsEntries") << delQuery.error();`
	`1725`	`+ sqlFail(QStringLiteral("deleteStaleFlagsEntries"), delQuery);`
`1726`	`1726`	`}`
`1727`	`1727`	`}`
`1728`	`1728`
`@@ -1865,7 +1865,7 @@ void SyncJournalDb::setPollInfo(const SyncJournalDb::PollInfo &info)`
`1865`	`1865`	`SqlQuery query("DELETE FROM async_poll WHERE path=?", _db);`
`1866`	`1866`	`query.bindValue(1, info._file);`
`1867`	`1867`	`if (!query.exec()) {`
`1868`		`- qCWarning(lcDb) << QStringLiteral("setPollInfo DELETE FROM async_poll") << query.error();`
	`1868`	`+ sqlFail(QStringLiteral("setPollInfo DELETE FROM async_poll"), query);`
`1869`	`1869`	`}`
`1870`	`1870`	`} else {`
`1871`	`1871`	`SqlQuery query("INSERT OR REPLACE INTO async_poll (path, modtime, filesize, pollpath) VALUES( ? , ? , ? , ? )", _db);`
`@@ -1874,7 +1874,7 @@ void SyncJournalDb::setPollInfo(const SyncJournalDb::PollInfo &info)`
`1874`	`1874`	`query.bindValue(3, info._fileSize);`
`1875`	`1875`	`query.bindValue(4, info._url);`
`1876`	`1876`	`if (!query.exec()) {`
`1877`		`- qCWarning(lcDb) << QStringLiteral("setPollInfo INSERT OR REPLACE INTO async_poll") << query.error();`
	`1877`	`+ sqlFail(QStringLiteral("setPollInfo INSERT OR REPLACE INTO async_poll"), query);`
`1878`	`1878`	`}`
`1879`	`1879`	`}`
`1880`	`1880`	`}`
`@@ -1963,7 +1963,7 @@ void SyncJournalDb::avoidRenamesOnNextSync(const QByteArray &path)`
`1963`	`1963`	`query.bindValue(1, path);`
`1964`	`1964`
`1965`	`1965`	`if (!query.exec()) {`
`1966`		`- qCWarning(lcDb) << QStringLiteral("avoidRenamesOnNextSync path: %1").arg(QString::fromUtf8(path)) << query.error();`
	`1966`	`+ sqlFail(QStringLiteral("avoidRenamesOnNextSync path: %1").arg(QString::fromUtf8(path)), query);`
`1967`	`1967`	`}`
`1968`	`1968`
`1969`	`1969`	`// We also need to remove the ETags so the update phase refreshes the directory paths`
`@@ -1991,7 +1991,7 @@ void SyncJournalDb::schedulePathForRemoteDiscovery(const QByteArray &fileName)`
`1991`	`1991`	`query.bindValue(1, argument);`
`1992`	`1992`
`1993`	`1993`	`if (!query.exec()) {`
`1994`		`- qCWarning(lcDb) << QStringLiteral("schedulePathForRemoteDiscovery path: %11").arg(QString::fromUtf8(fileName)) << query.error();`
	`1994`	`+ sqlFail(QStringLiteral("schedulePathForRemoteDiscovery path: %1").arg(QString::fromUtf8(fileName)), query);`
`1995`	`1995`	`}`
`1996`	`1996`
`1997`	`1997`	`// Prevent future overwrite of the etags of this folder and all`
`@@ -2023,7 +2023,7 @@ void SyncJournalDb::forceRemoteDiscoveryNextSyncLocked()`
`2023`	`2023`	`deleteRemoteFolderEtagsQuery.prepare("UPDATE metadata SET md5='_invalid_' WHERE type=2;");`
`2024`	`2024`
`2025`	`2025`	`if (!deleteRemoteFolderEtagsQuery.exec()) {`
`2026`		`- qCWarning(lcDb) << QStringLiteral("forceRemoteDiscoveryNextSyncLocked") << deleteRemoteFolderEtagsQuery.error();`
	`2026`	`+ sqlFail(QStringLiteral("forceRemoteDiscoveryNextSyncLocked"), deleteRemoteFolderEtagsQuery);`
`2027`	`2027`	`}`
`2028`	`2028`	`}`
`2029`	`2029`
`@@ -2233,7 +2233,7 @@ void SyncJournalDb::clearFileTable()`
`2233`	`2233`	`query.prepare("DELETE FROM metadata;");`
`2234`	`2234`
`2235`	`2235`	`if (!query.exec()) {`
`2236`		`- qCWarning(lcDb) << QStringLiteral("clearFileTable") << query.error();`
	`2236`	`+ sqlFail(QStringLiteral("clearFileTable"), query);`
`2237`	`2237`	`}`
`2238`	`2238`	`}`
`2239`	`2239`
`@@ -2250,7 +2250,7 @@ void SyncJournalDb::markVirtualFileForDownloadRecursively(const QByteArray &path`
`2250`	`2250`	`query.bindValue(1, path);`
`2251`	`2251`
`2252`	`2252`	`if (!query.exec()) {`
`2253`		`- qCWarning(lcDb) << QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET type=5 path: %1").arg(QString::fromUtf8(path)) << query.error();`
	`2253`	`+ sqlFail(QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET type=5 path: %1").arg(QString::fromUtf8(path)), query);`
`2254`	`2254`	`}`
`2255`	`2255`
`2256`	`2256`	`// We also must make sure we do not read the files from the database (same logic as in schedulePathForRemoteDiscovery)`
`@@ -2261,7 +2261,7 @@ void SyncJournalDb::markVirtualFileForDownloadRecursively(const QByteArray &path`
`2261`	`2261`	`query.bindValue(1, path);`
`2262`	`2262`
`2263`	`2263`	`if (!query.exec()) {`
`2264`		`- qCWarning(lcDb) << QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET md5='_invalid_' path: %1").arg(QString::fromUtf8(path)) << query.error();`
	`2264`	`+ sqlFail(QStringLiteral("markVirtualFileForDownloadRecursively UPDATE metadata SET md5='_invalid_' path: %1").arg(QString::fromUtf8(path)), query);`
`2265`	`2265`	`}`
`2266`	`2266`	`}`
`2267`	`2267`
`@@ -2395,6 +2395,8 @@ SyncJournalDb::PinStateInterface::rawList()`
`2395`	`2395`
`2396`	`2396`	`if (!query.exec()) {`
`2397`	`2397`	`qCWarning(lcDb) << "SQL Error" << "PinStateInterface::rawList" << query.error();`
	`2398`	`+ _db->close();`
	`2399`	`+ ASSERT(false);`
`2398`	`2400`	`}`
`2399`	`2401`
`2400`	`2402`	`QVector<QPair<QByteArray, PinState>> result;`
Original file line number	Diff line number	Diff line change
`@@ -626,6 +626,7 @@ void Folder::implicitlyHydrateFile(const QString &relativepath)`
`626`	`626`	`;`
`627`	`627`	`if (!_journal.getFileRecord(relativepath.toUtf8(), &record)) {`
`628`	`628`	`qCWarning(lcFolder) << "could not get file from local DB" << relativepath;`
	`629`	`+ return;`
`629`	`630`	`}`
`630`	`631`	`if (!record.isValid()) {`
`631`	`632`	`qCInfo(lcFolder) << "Did not find file in db";`
`@@ -641,6 +642,7 @@ void Folder::implicitlyHydrateFile(const QString &relativepath)`
`641`	`642`	`const auto result = _journal.setFileRecord(record);`
`642`	`643`	`if (!result) {`
`643`	`644`	`qCWarning(lcFolder) << "Error when setting the file record to the database" << record._path << result.error();`
	`645`	`+ return;`
`644`	`646`	`}`
`645`	`647`
`646`	`648`	`// Change the file's pin state if it's contradictory to being hydrated`
Original file line number	Diff line number	Diff line change
`@@ -900,6 +900,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(`
`900`	`900`	`// Not locally, not on the server. The entry is stale!`
`901`	`901`	`qCInfo(lcDisco) << "Stale DB entry";`
`902`	`902`	`if (!_discoveryData->_statedb->deleteFileRecord(path._original, true)) {`
	`903`	`+ _discoveryData->fatalError(tr("Error while deleting file record %1 from the database").arg(path._original));`
`903`	`904`	`qCWarning(lcDisco) << "Failed to delete a file record from the local DB" << path._original;`
`904`	`905`	`}`
`905`	`906`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -1197,6 +1197,13 @@ void PropagateDirectory::slotSubJobsFinished(SyncFileItem::Status status)`
`1197`	`1197`	`if (_item->_instruction == CSYNC_INSTRUCTION_RENAME && _item->_originalFile != _item->_renameTarget) {`
`1198`	`1198`	`if (!propagator()->_journal->deleteFileRecord(_item->_originalFile, true)) {`
`1199`	`1199`	`qCWarning(lcDirectory) << "could not delete file from local DB" << _item->_originalFile;`
	`1200`	`+ _state = Finished;`
	`1201`	`+ status = _item->_status = SyncFileItem::FatalError;`
	`1202`	`+ _item->_errorString = tr("could not delete file %1 from local DB").arg(_item->_originalFile);`
	`1203`	`+ qCInfo(lcPropagator) << "PropagateDirectory::slotSubJobsFinished"`
	`1204`	`+ << "emit finished" << status;`
	`1205`	`+ emit finished(status);`
	`1206`	`+ return;`
`1200`	`1207`	`}`
`1201`	`1208`	`}`
`1202`	`1209`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,8 @@ void PropagateRemoteDelete::slotDeleteJobFinished()`
`115`	`115`
`116`	`116`	`if (!propagator()->_journal->deleteFileRecord(_item->_originalFile, _item->isDirectory())) {`
`117`	`117`	`qCWarning(lcPropagateRemoteDelete) << "could not delete file from local DB" << _item->_originalFile;`
	`118`	`+ done(SyncFileItem::NormalError, tr("Could not delete file record %1 from local DB").arg(_item->_originalFile));`
	`119`	`+ return;`
`118`	`120`	`}`
`119`	`121`
`120`	`122`	`propagator()->_journal->commit("Remote Remove");`
Original file line number	Diff line number	Diff line change
`@@ -377,6 +377,9 @@ void OCC::SyncEngine::slotItemDiscovered(const OCC::SyncFileItemPtr &item)`
`377`	`377`
`378`	`378`	`// Updating the db happens on success`
`379`	`379`	`if (!_journal->setFileRecord(rec)) {`
	`380`	`+ item->_status = SyncFileItem::Status::NormalError;`
	`381`	`+ item->_instruction = CSYNC_INSTRUCTION_ERROR;`
	`382`	`+ item->_errorString = tr("Could not set file record to local DB: %1").arg(rec.path());`
`380`	`383`	`qCWarning(lcEngine) << "Could not set file record to local DB" << rec.path();`
`381`	`384`	`}`
`382`	`385`
Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,7 @@ void OCC::HydrationJob::finalize(OCC::VfsCfApi *vfs)`
`291`	`291`	`SyncJournalFileRecord record;`
`292`	`292`	`if (!_journal->getFileRecord(_folderPath, &record)) {`
`293`	`293`	`qCWarning(lcHydration) << "could not get file from local DB" << _folderPath;`
	`294`	`+ return;`
`294`	`295`	`}`
`295`	`296`	`Q_ASSERT(record.isValid());`
`296`	`297`	`if (!record.isValid()) {`