summaryrefslogtreecommitdiffstats
path: root/sync/sessions/status_controller.h
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-16 22:19:08 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-16 22:19:08 +0000
commit4ea9ef6c1510b8d3b8ede09445a99577be585afa (patch)
tree87006eb9ce78c328d683c909a76c79726c0a75c1 /sync/sessions/status_controller.h
parent7977afd39dc5367aa104a1a4bff7025d456d930a (diff)
downloadchromium_src-4ea9ef6c1510b8d3b8ede09445a99577be585afa.zip
chromium_src-4ea9ef6c1510b8d3b8ede09445a99577be585afa.tar.gz
chromium_src-4ea9ef6c1510b8d3b8ede09445a99577be585afa.tar.bz2
Revert 132455 - Abort sync cycles when download step fails
This change causes the syncer to exit from its download then commit function if the download fails. This helps prevent the creation of server-side conflicts, which would be more likely to happen if a download failed but the following commit succeeded. The main changes are as follows: - Rather than proceed to the next step when a download updates failure is detected, the syncer will exit. This should cause the SyncScheduler to schedule a retry at a later time. - The definition of a download updates failure is now based on the return code of the download attempt, rather than checking the contents of the (possible non-existent) returned protobuf. This makes the error detection logic used here more closely match the logic used to decide whether or not to schedule retries. This implementation has a side-effect on configure sync cycles. The old behaviour was to handle failures by applying whatever updates we had downloaded at that point. The new behaviour will leave updates unapplied if any error occurs. This better matches a nearby comment's assertion which states that we should not attempt to apply updates until we have downloaded all of them. I believe the author of that comment would approve of this change. This change moves around some of the ExtensionActivityMonitor logic. It's important that we not take the data from the extensions acitivity monitor at the start of the cycle. Restoring that data is handled in the commit building and response code, which might not be executed if we need to break out early. This also fixes issue 123270. Most of the diffs for this change are concentrated in the unit tests: - Expose more of the SyncScheduler to the SyncerTest test harness. - Add functions to SyncerTest for testing specific types of sync jobs. - Add some functions that allow us to better control failures in MockConnectionManager. - Added tests for configure job success and failure. - Added tests for update then commit job success and failure. - Removed some redundant tests. BUG=122033,123270 TEST=sync_unit_tests, specifically: SyncerTest.UpdateThenCommit, SyncerTest.UpdateFailsThenDontCommit, SyncerTest.ConfigureDownloadsTwoBatchesSuccess, SyncerTest.ConfigureFailsDontApplyUpdates Review URL: http://codereview.chromium.org/10006046 TBR=rlarocque@chromium.org Review URL: https://chromiumcodereview.appspot.com/10107004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132476 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sessions/status_controller.h')
-rw-r--r--sync/sessions/status_controller.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sync/sessions/status_controller.h b/sync/sessions/status_controller.h
index 7e2f258..c2a3cfc 100644
--- a/sync/sessions/status_controller.h
+++ b/sync/sessions/status_controller.h
@@ -175,8 +175,7 @@ class StatusController {
// Returns true if the last download_updates_command received a valid
// server response.
bool download_updates_succeeded() const {
- return shared_.error.value().last_download_updates_result
- == SYNCER_OK;
+ return updates_response().has_get_updates();
}
// Returns true if the last updates response indicated that we were fully