mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 23:28:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

New disco algorithm: Fix some moving

Browse source 
Fix TestSyncMove::testSelectiveSyncMovedFolder
This commit is contained in:
Olivier Goffart 2018-07-12 10:36:15 +02:00 committed by Kevin Ottens
parent 5a57a36729
commit 7e36cc3fcb
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
3 changed files with 45 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/remotepermissions.h
View file

@ -21,6 +21,7 @@
#include <QString> #include <QString>
#include <QMetaType> #include <QMetaType>
#include "ocsynclib.h" #include "ocsynclib.h"
#include <QDebug>
namespace OCC { namespace OCC {
@ -84,6 +85,11 @@ public:
{ {
return !(a == b); return !(a == b);
} }
friend QDebug operator<<(QDebug &dbg, RemotePermissions p)
{
return dbg << p.toString().constData();
}
}; };

48
src/libsync/discovery.cpp
View file

@ -62,6 +62,8 @@ DiscoverServerJob::DiscoverServerJob(const AccountPtr &account, const QString &p
void ProcessDirectoryJob::start() void ProcessDirectoryJob::start()
{ {
qCInfo(lcDisco) << "STARTING" << _currentFolder._server << _queryServer << _currentFolder._local << _queryLocal;
if (_queryServer == NormalQuery) { if (_queryServer == NormalQuery) {
_serverJob = new DiscoverServerJob(_discoveryData->_account, _discoveryData->_remoteFolder + _currentFolder._server, this); _serverJob = new DiscoverServerJob(_discoveryData->_account, _discoveryData->_remoteFolder + _currentFolder._server, this);
connect(_serverJob.data(), &DiscoverServerJob::finished, this, [this](const auto &results) { connect(_serverJob.data(), &DiscoverServerJob::finished, this, [this](const auto &results) {
@ -176,7 +178,7 @@ void ProcessDirectoryJob::process()
if (!_discoveryData->_statedb->getFileRecord(path._original, &record)) { if (!_discoveryData->_statedb->getFileRecord(path._original, &record)) {
qFatal("TODO: DB ERROR HANDLING"); qFatal("TODO: DB ERROR HANDLING");
} }
if (_queryServer == InBlackList || _discoveryData->isInSelectiveSyncBlackList(path._server)) { if (_queryServer == InBlackList || _discoveryData->isInSelectiveSyncBlackList(path._original)) {
processBlacklisted(path, localEntry, record); processBlacklisted(path, localEntry, record);
continue; continue;
} }
@ -306,12 +308,16 @@ void ProcessDirectoryJob::processFile(PathTuple path,
const LocalInfo &localEntry, const RemoteInfo &serverEntry, const LocalInfo &localEntry, const RemoteInfo &serverEntry,
const SyncJournalFileRecord &dbEntry) const SyncJournalFileRecord &dbEntry)
{ {
const char *hasServer = serverEntry.isValid() ? "true" : _queryServer == ParentNotChanged ? "db" : "false";
qCInfo(lcDisco).nospace() << "Processing " << path._original qCInfo(lcDisco).nospace() << "Processing " << path._original
<< " | valid: " << dbEntry.isValid() << "/" << localEntry.isValid() << "/" << serverEntry.isValid() << " | valid: " << dbEntry.isValid() << "/" << localEntry.isValid() << "/" << hasServer
<< " | mtime: " << dbEntry._modtime << "/" << localEntry.modtime << "/" << serverEntry.modtime << " | mtime: " << dbEntry._modtime << "/" << localEntry.modtime << "/" << serverEntry.modtime
<< " | size: " << dbEntry._fileSize << "/" << localEntry.size << "/" << serverEntry.size << " | size: " << dbEntry._fileSize << "/" << localEntry.size << "/" << serverEntry.size
<< " | etag: " << dbEntry._etag << "//" << serverEntry.etag << " | etag: " << dbEntry._etag << "//" << serverEntry.etag
<< " | checksum: " << dbEntry._checksumHeader << "//" << serverEntry.checksumHeader; << " | checksum: " << dbEntry._checksumHeader << "//" << serverEntry.checksumHeader
<< " | perm: " << dbEntry._remotePerm << "//" << serverEntry.remotePerm
<< " | fileid: " << dbEntry._fileId << "//" << serverEntry.fileId
<< " | inode: " << dbEntry._inode << "/" << localEntry.inode << "/";
if (_discoveryData->_renamedItems.contains(path._original)) { if (_discoveryData->_renamedItems.contains(path._original)) {
qCDebug(lcDisco) << "Ignoring renamed"; qCDebug(lcDisco) << "Ignoring renamed";
@ -334,8 +340,10 @@ void ProcessDirectoryJob::processFile(PathTuple path,
return false; return false;
}; };
auto recurseQueryServer = _queryServer; auto recurseQueryServer = _queryServer;
if (recurseQueryServer != ParentNotChanged && !serverEntry.isValid())
recurseQueryServer = ParentDontExist;
if (_queryServer == NormalQuery && serverEntry.isValid()) { if (_queryServer == NormalQuery && serverEntry.isValid()) {
item->_checksumHeader = serverEntry.checksumHeader; item->_checksumHeader = serverEntry.checksumHeader;
item->_fileId = serverEntry.fileId; item->_fileId = serverEntry.fileId;
@ -371,7 +379,7 @@ void ProcessDirectoryJob::processFile(PathTuple path,
// Since we don't do the same checks again in reconcile, we can't // Since we don't do the same checks again in reconcile, we can't
// just skip the candidate, but have to give up completely. // just skip the candidate, but have to give up completely.
if (base._type != item->_type && base._type != ItemTypeVirtualFile) { if (base._type != item->_type && base._type != ItemTypeVirtualFile) {
qCDebug(lcDisco, "file types different, not a rename"); qCInfo(lcDisco, "file types different, not a rename");
done = true; done = true;
return; return;
} }
@ -408,17 +416,16 @@ void ProcessDirectoryJob::processFile(PathTuple path,
else if (item->_type == ItemTypeFile) { else if (item->_type == ItemTypeFile) {
csync_file_stat_t buf; csync_file_stat_t buf;
if (csync_vio_local_stat((_discoveryData->_localDir + path._local).toUtf8(), &buf)) { if (csync_vio_local_stat((_discoveryData->_localDir + originalPath).toUtf8(), &buf)) {
qFatal("FIXME! ERROR HANDLING"); qCInfo(lcDisco) << "Local file does not exist anymore." << originalPath;
return; return;
} }
if (buf.modtime != base._modtime || buf.size != base._fileSize) { if (buf.modtime != base._modtime || buf.size != base._fileSize) {
// File has changed locally, not a rename. qCInfo(lcDisco) << "File has changed locally, not a rename." << originalPath;
return; return;
} }
} }
auto it = _discoveryData->_deletedItem.find(originalPath); auto it = _discoveryData->_deletedItem.find(originalPath);
if (it != _discoveryData->_deletedItem.end()) { if (it != _discoveryData->_deletedItem.end()) {
if ((*it)->_instruction != CSYNC_INSTRUCTION_REMOVE) if ((*it)->_instruction != CSYNC_INSTRUCTION_REMOVE)
@ -441,7 +448,7 @@ void ProcessDirectoryJob::processFile(PathTuple path,
qCInfo(lcDisco) << "Rename detected (down) " << item->_file << " -> " << item->_renameTarget; qCInfo(lcDisco) << "Rename detected (down) " << item->_file << " -> " << item->_renameTarget;
// FIXME! chech that the server version of origialPath is gone! // FIXME! check that the server version of origialPath is gone!
}; };
if (!_discoveryData->_statedb->getFileRecordsByFileId(serverEntry.fileId, renameCandidateProcessing)) { if (!_discoveryData->_statedb->getFileRecordsByFileId(serverEntry.fileId, renameCandidateProcessing)) {
qFatal("TODO: Handle DB ERROR"); qFatal("TODO: Handle DB ERROR");
@ -549,7 +556,6 @@ void ProcessDirectoryJob::processFile(PathTuple path,
} else if (!dbEntry.isValid()) { // New local file } else if (!dbEntry.isValid()) { // New local file
item->_instruction = CSYNC_INSTRUCTION_NEW; item->_instruction = CSYNC_INSTRUCTION_NEW;
item->_direction = SyncFileItem::Up; item->_direction = SyncFileItem::Up;
// TODO! rename;
item->_checksumHeader.clear(); item->_checksumHeader.clear();
item->_size = localEntry.size; item->_size = localEntry.size;
item->_modtime = localEntry.modtime; item->_modtime = localEntry.modtime;
@ -579,11 +585,17 @@ void ProcessDirectoryJob::processFile(PathTuple path,
if (isRename) { if (isRename) {
auto originalPath = QString::fromUtf8(base._path); auto originalPath = QString::fromUtf8(base._path);
auto it = _discoveryData->_deletedItem.find(originalPath); auto it = _discoveryData->_deletedItem.find(originalPath);
QByteArray oldEtag;
if (it != _discoveryData->_deletedItem.end()) { if (it != _discoveryData->_deletedItem.end()) {
if ((*it)->_instruction != CSYNC_INSTRUCTION_REMOVE) if ((*it)->_instruction != CSYNC_INSTRUCTION_REMOVE)
isRename = false; isRename = false;
else else
(*it)->_instruction = CSYNC_INSTRUCTION_NONE; (*it)->_instruction = CSYNC_INSTRUCTION_NONE;
oldEtag = (*it)->_etag;
if (!item->isDirectory() && oldEtag != base._etag)
isRename = false;
} else {
// FIXME! We should do a server query to find out if the original path still exist and has the same etag
} }
if (_discoveryData->_renamedItems.contains(originalPath)) if (_discoveryData->_renamedItems.contains(originalPath))
isRename = false; isRename = false;
@ -599,9 +611,11 @@ void ProcessDirectoryJob::processFile(PathTuple path,
item->_file = originalPath; item->_file = originalPath;
item->_originalFile = originalPath; item->_originalFile = originalPath;
item->_fileId = base._fileId; item->_fileId = base._fileId;
item->_remotePerm = base._remotePerm;
item->_etag = base._etag; item->_etag = base._etag;
path._original = originalPath; path._original = originalPath;
path._server = originalPath; path._server = originalPath;
recurseQueryServer = oldEtag == base._etag ? ParentNotChanged : NormalQuery;
qCInfo(lcDisco) << "Rename detected (up) " << item->_file << " -> " << item->_renameTarget; qCInfo(lcDisco) << "Rename detected (up) " << item->_file << " -> " << item->_renameTarget;
} }
} }
@ -636,15 +650,21 @@ void ProcessDirectoryJob::processFile(PathTuple path,
} }
} }
if (path._original != path._target && (item->_instruction == CSYNC_INSTRUCTION_UPDATE_METADATA || item->_instruction == CSYNC_INSTRUCTION_NONE)) {
ASSERT(_dirItem && _dirItem->_instruction == CSYNC_INSTRUCTION_RENAME);
// This is because otherwise subitems are not updated! (ideally renaming a directory could
// update the database for all items! See PropagateDirectory::slotSubJobsFinished)
item->_instruction = CSYNC_INSTRUCTION_RENAME;
item->_renameTarget = path._target;
item->_direction = _dirItem->_direction;
}
qCInfo(lcDisco) << "Discovered" << item->_file << item->_instruction << item->_direction << item->isDirectory(); qCInfo(lcDisco) << "Discovered" << item->_file << item->_instruction << item->_direction << item->isDirectory();
if (item->isDirectory()) { if (item->isDirectory()) {
if (item->_instruction == CSYNC_INSTRUCTION_SYNC) { if (item->_instruction == CSYNC_INSTRUCTION_SYNC) {
item->_instruction = CSYNC_INSTRUCTION_UPDATE_METADATA; item->_instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
} }
if (recurseQueryServer != ParentNotChanged && !serverEntry.isValid())
recurseQueryServer = ParentDontExist;
auto job = new ProcessDirectoryJob(item, recurseQueryServer, auto job = new ProcessDirectoryJob(item, recurseQueryServer,
localEntry.isValid() || item->_instruction == CSYNC_INSTRUCTION_RENAME ? NormalQuery : ParentDontExist, localEntry.isValid() || item->_instruction == CSYNC_INSTRUCTION_RENAME ? NormalQuery : ParentDontExist,
_discoveryData, this); _discoveryData, this);

7
src/libsync/discovery.h
View file

@ -110,10 +110,13 @@ class ProcessDirectoryJob : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
enum QueryMode { NormalQuery, enum QueryMode {
NormalQuery,
ParentDontExist, ParentDontExist,
ParentNotChanged, ParentNotChanged,
InBlackList }; InBlackList
};
Q_ENUM(QueryMode)
explicit ProcessDirectoryJob(const SyncFileItemPtr &dirItem, QueryMode queryServer, QueryMode queryLocal, explicit ProcessDirectoryJob(const SyncFileItemPtr &dirItem, QueryMode queryServer, QueryMode queryLocal,
DiscoveryPhase *data, QObject *parent) DiscoveryPhase *data, QObject *parent)
: QObject(parent) : QObject(parent)