Merge pull request #1111 from meganz/sync-logs

New sync logs to debug the initial scan
meganz · Jul 2, 2018 · 962ddd4 · 962ddd4
2 parents 63e1c32 + 173bc28
commit 962ddd4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/megaclient.cpp b/src/megaclient.cpp
@@ -3096,7 +3096,8 @@ bool MegaClient::dispatch(direction_t d)
                 {
                     if (ts->fa->mtime != nexttransfer->mtime || ts->fa->size != nexttransfer->size)
                     {
-                        LOG_warn << "Modification detected starting upload";
+                        LOG_warn << "Modification detected starting upload.   Size: " << nexttransfer->size << "  Mtime: " << nexttransfer->mtime
+                                 << "    FaSize: " << ts->fa->size << "  FaMtime: " << ts->fa->mtime;
                         nexttransfer->failed(API_EREAD);
                         continue;
                     }
@@ -10644,6 +10645,7 @@ error MegaClient::addsync(string* rootpath, const char* debris, string* localdeb
                 syncsup = false;
                 e = API_OK;
                 sync->initializing = false;
+                LOG_debug << "Initial scan finished. New / modified files: " << sync->dirnotify->notifyq[DirNotify::DIREVENTS].size();
             }
             else
             {

diff --git a/src/sync.cpp b/src/sync.cpp
@@ -631,6 +631,7 @@ LocalNode* Sync::checkpath(LocalNode* l, string* localpath, string* localname, d
                 // if it's a file, size and mtime must match to qualify
                 if (l->type != FILENODE || (l->size == fa->size && l->mtime == fa->mtime))
                 {
+                    LOG_verbose << "Cached localnode is still valid. Type: " << l->type << "  Size: " << l->size << "  Mtime: " << l->mtime;
                     l->scanseqno = scanseqno;
 
                     if (l->type == FOLDERNODE)
@@ -654,6 +655,15 @@ LocalNode* Sync::checkpath(LocalNode* l, string* localpath, string* localname, d
 
         if (initializing)
         {
+            if (cl)
+            {
+                LOG_verbose << "Outdated localnode. Type: " << cl->type << "  Size: " << cl->size << "  Mtime: " << cl->mtime
+                            << "    FaType: " << fa->type << "  FaSize: " << fa->size << "  FaMtime: " << fa->mtime;
+            }
+            else
+            {
+                LOG_verbose << "New file. FaType: " << fa->type << "  FaSize: " << fa->size << "  FaMtime: " << fa->mtime;
+            }
             delete fa;
             return NULL;
         }

diff --git a/src/transfer.cpp b/src/transfer.cpp
@@ -405,7 +405,8 @@ void Transfer::failed(error e, dstime timeleft)
 
         if (slot && slot->fa && (slot->fa->mtime != mtime || slot->fa->size != size))
         {
-            LOG_warn << "Modification detected during active upload";
+            LOG_warn << "Modification detected during active upload. Size: " << size << "  Mtime: " << mtime
+                     << "    FaSize: " << slot->fa->size << "  FaMtime: " << slot->fa->mtime;
             defer = false;
         }
     }