[Pkg-owncloud-commits] [owncloud-client] 313/332: journaldb: Fix that fileid might be missing in the db

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 6d24bd036169bb1bd819aac7ecb8d5e1bebf686e
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Aug 7 12:10:32 2014 +0200

    journaldb:  Fix that fileid might be missing in the db
    
    When recovering from a inalid move operation, we call
    avoidReadFromDbOnNextSync. This will remove the fileid from the db so
    we don't detect a move on the next sync.  But we want the next sync to fetch
    the file id again, and this can only happen if we don't read them
    from the db and do the actual PROPFIND, this is done by avoidReadFromDbOnNextSync
    
    However, if there is propagation in that source directory later, it
    will overide the invalid etag with the real one and we will not uissue the PROPFIND
    to fetch the fileid.
    We must therefore also protect the future write to the DB when calling
    avoidReadFromDbOnNextSync
---
 csync/tests/ownCloud/t7.pl   | 13 ++++++-------
 src/mirall/syncjournaldb.cpp | 20 +++++++++++++++++++-
 src/mirall/syncjournaldb.h   | 13 ++++++-------
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/csync/tests/ownCloud/t7.pl b/csync/tests/ownCloud/t7.pl
index 3288d66..3bee934 100755
--- a/csync/tests/ownCloud/t7.pl
+++ b/csync/tests/ownCloud/t7.pl
@@ -35,7 +35,10 @@ print "Hello, this is t7, a tester for syncing of files in read only directory\n
 # https://github.com/owncloud/mirall/issues/2038
 sub assertCsyncJournalOk {
 	my $path = $_[0];
-	my $cmd = 'sqlite3 ' . $path . '.csync_journal.db "SELECT count(*) from metadata where length(remotePerm) == 0 or length(fileId) == 0 or length(md5) == 0"';
+
+    # FIXME: should test also remoteperm but it's not working with owncloud6
+    #     my $cmd = 'sqlite3 ' . $path . '.csync_journal.db "SELECT count(*) from metadata where length(remotePerm) == 0 or length(fileId) == 0"';
+    my $cmd = 'sqlite3 ' . $path . '.csync_journal.db "SELECT count(*) from metadata where length(fileId) == 0"';
 	my $result = `$cmd`;
 	assert($result == "0");
 }
@@ -173,11 +176,8 @@ system("sqlite3 " . localDir().'.csync_journal.db .dump');
 #new directory should be uploaded
 system("mv " . localDir().'readonlyDirectory_PERM_M_/subdir_PERM_CK_ ' . localDir().'normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_'  );
 
-# two syncs may be necessary for now
+# two syncs may be necessary for now: https://github.com/owncloud/mirall/issues/2038
 csync();
-system("sqlite3 " . localDir().'.csync_journal.db .dump');
-printInfo("CRAAAAAAAP");
-#assertCsyncJournalOk(localDir()); <-- some fileId entries are empty so we don't check the DB here. See https://github.com/owncloud/mirall/issues/2038
 csync();
 system("sqlite3 " . localDir().'.csync_journal.db .dump');
 assertCsyncJournalOk(localDir());
@@ -209,9 +209,8 @@ system("mv " . localDir().'readonlyDirectory_PERM_M_/subdir_PERM_CK_ ' . localDi
 #2. move a directory from read to read only  (move the directory from previous step)
 system("mv " . localDir().'normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_ ' . localDir().'readonlyDirectory_PERM_M_/moved_PERM_CK_'  );
 
-# two syncs may be necessary for now
+# two syncs may be necessary for now: https://github.com/owncloud/mirall/issues/2038
 csync();
-assertCsyncJournalOk(localDir());
 csync();
 assertCsyncJournalOk(localDir());
 
diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp
index c1f1aa8..b51083d 100644
--- a/src/mirall/syncjournaldb.cpp
+++ b/src/mirall/syncjournaldb.cpp
@@ -297,6 +297,7 @@ void SyncJournalDb::close()
     _db.close();
     _db = QSqlDatabase(); // avoid the warning QSqlDatabasePrivate::removeDatabase: connection [...] still in use
     QSqlDatabase::removeDatabase(_dbFile);
+    _avoidReadFromDbOnNextSyncFilter.clear();
 }
 
 
@@ -372,9 +373,23 @@ qint64 SyncJournalDb::getPHash(const QString& file) const
     return h;
 }
 
-bool SyncJournalDb::setFileRecord( const SyncJournalFileRecord& record )
+bool SyncJournalDb::setFileRecord( const SyncJournalFileRecord& _record )
 {
+    SyncJournalFileRecord record = _record;
     QMutexLocker locker(&_mutex);
+
+    if (!_avoidReadFromDbOnNextSyncFilter.isEmpty()) {
+        // If we are a directory that should not be read from db next time, don't write the etag
+        QString prefix = record._path + "/";
+        foreach(const QString &it, _avoidReadFromDbOnNextSyncFilter) {
+            if (it.startsWith(prefix)) {
+                qDebug() << "Filtered writing the etag of" << prefix << "because it is a prefix of" << it;
+                record._etag = "_invalid_";
+                break;
+            }
+        }
+    }
+
     qlonglong phash = getPHash(record._path);
     if( checkConnect() ) {
         QByteArray arr = record._path.toUtf8();
@@ -865,6 +880,9 @@ void SyncJournalDb::avoidReadFromDbOnNextSync(const QString& fileName)
     } else {
         qDebug() << Q_FUNC_INFO << query.executedQuery()  << fileName << "(" << query.numRowsAffected() << " rows)";
     }
+
+    // Prevent future overwrite of the etag for this sync
+    _avoidReadFromDbOnNextSyncFilter.append(fileName);
 }
 
 void SyncJournalDb::commit(const QString& context, bool startTrans)
diff --git a/src/mirall/syncjournaldb.h b/src/mirall/syncjournaldb.h
index bf11f11..1f12a1c 100644
--- a/src/mirall/syncjournaldb.h
+++ b/src/mirall/syncjournaldb.h
@@ -99,13 +99,6 @@ public:
      */
     bool isUpdateFrom_1_5();
 
-
-
-
-signals:
-
-public slots:
-
 private:
     qint64 getPHash(const QString& ) const;
     bool updateDatabaseStructure();
@@ -132,6 +125,12 @@ private:
     QScopedPointer<QSqlQuery> _deleteFileRecordPhash;
     QScopedPointer<QSqlQuery> _deleteFileRecordRecursively;
     QScopedPointer<QSqlQuery> _blacklistQuery;
+
+    /* This is the list of paths we called avoidReadFromDbOnNextSync on.
+     * It means that they should not be written to the DB in any case since doing
+     * that would write the etag and would void the purpose of avoidReadFromDbOnNextSync
+     */
+    QList<QString> _avoidReadFromDbOnNextSyncFilter;
 };
 
 }  // namespace Mirall

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git