Backout of 7cb26c341a4e due to new TPS sync failures
authorHenrik Skupin <mail@hskupin.info>
Fri, 29 Aug 2014 22:37:44 +0200
changeset 202494 eed9fe35a00d284c6a10f083c104d3f4373108ba
parent 202493 2a354048f9641f1cb71b9c94a6e7fce53a311b24
child 202495 984eb24bd94fb165320917d9864e33f264bc8489
push id27400
push userhskupin@mozilla.com
push dateFri, 29 Aug 2014 20:38:58 +0000
treeherdermozilla-central@eed9fe35a00d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone34.0a1
backs out7cb26c341a4e23726913fa39da5cc866d28c049a
first release with
nightly linux32
eed9fe35a00d / 34.0a1 / 20140830030204 / files
nightly linux64
eed9fe35a00d / 34.0a1 / 20140830030204 / files
nightly mac
eed9fe35a00d / 34.0a1 / 20140830030204 / files
nightly win32
eed9fe35a00d / 34.0a1 / 20140830030204 / files
nightly win64
eed9fe35a00d / 34.0a1 / 20140830030204 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout of 7cb26c341a4e due to new TPS sync failures
services/sync/tps/extensions/tps/resource/tps.jsm
--- a/services/sync/tps/extensions/tps/resource/tps.jsm
+++ b/services/sync/tps/extensions/tps/resource/tps.jsm
@@ -295,17 +295,22 @@ let TPS = {
           // new tabs before continuing
           let that = this;
           let taburi = tab.uri;
           BrowserTabs.Add(tab.uri, function() {
             that._tabsFinished++;
             Logger.logInfo("tab for " + taburi + " finished loading");
             if (that._tabsFinished == that._tabsAdded) {
               Logger.logInfo("all tabs loaded, continuing...");
-              that.FinishAsyncOperation();
+
+              // Wait a second before continuing to be sure tabs can be synced,
+              // otherwise we can get 'error locating tab'
+              Utils.namedTimer(function () {
+                that.FinishAsyncOperation();
+              }, 1000, this, "postTabsOpening");
             }
           });
           break;
         case ACTION_VERIFY:
           Logger.AssertTrue(typeof(tab.profile) != "undefined",
             "profile must be defined when verifying tabs");
           Logger.AssertTrue(
             BrowserTabs.Find(tab.uri, tab.title, tab.profile), "error locating tab");
@@ -885,23 +890,17 @@ let TPS = {
     else {
       Weave.Svc.Prefs.reset("firstSync");
     }
 
     this.Login(false);
 
     this._triggeredSync = true;
     this.StartAsyncOperation();
-
-    // Bug 682446
-    // We wait a little before we trigger the Sync call to be sure elements are
-    // ready to be synced
-    Utils.namedTimer(function () {
-        Weave.Service.sync();
-    }, 2500, this, "beforeSyncDelay");
+    Weave.Service.sync();
   },
 
   WipeServer: function TPS__WipeServer() {
     Logger.logInfo("Wiping data from server.");
 
     this.Login(false);
     Weave.Service.login();
     Weave.Service.wipeServer();