Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(552)

Issue 891123003: Revert of Sync commit errors should temporarily re-enable trigger pre-commit getupdates (Closed)

Created:
5 years, 10 months ago by Ryan Hamilton
Modified:
5 years, 10 months ago
CC:
chromium-reviews, tim+watch_chromium.org, zea+watch_chromium.org, maxbogue+watch_chromium.org, pvalenzuela+watch_chromium.org, albertb+watch_chromium.org, maniscalco+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Sync commit errors should temporarily re-enable trigger pre-commit getupdates (patchset #2 id:20001 of https://codereview.chromium.org/905853002/) Reason for revert: Looks like this broke the build Undefined symbols for architecture armv7: "syncer::sessions::test_util::SimulateDownloadUpdatesFailed(syncer::EnumSet<syncer::ModelType, (syncer::ModelType)2, (syncer::ModelType)33>, syncer::sessions::NudgeTracker const&, syncer::sessions::SyncSession*)", referenced from: syncer::BackoffTriggersSyncSchedulerTest_FailDownloadOnceThenSucceed_Test::TestBody() in sync_scheduler_unittest.o syncer::BackoffTriggersSyncSchedulerTest_FailDownloadTwice_Test::TestBody() in sync_scheduler_unittest.o syncer::SyncSchedulerTest_FailedRetry_Test::TestBody() in sync_scheduler_unittest.o Original issue's description: > Sync commit errors should temporarily re-enable > trigger pre-commit getupdates > > Add a boolean variable in class DataTypeTracker, so every > time when a data type got conflict response from server > during commit, will set that boolean variable to true, then > next time sync, GetUpdate will check the boolean to see if > need to GetUpdate to resolve conflict locally. > > BUG=324893 > > Committed: https://crrev.com/21f43c5af27e24c34565df26bb51fcc704c97597 > Cr-Commit-Position: refs/heads/master@{#315339} TBR=zea@chromium.org,stanisc@chromium.org,maniscalco@chromium.org,pvalenzuela@chromium.org,gangwu@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=324893 Committed: https://crrev.com/796a0ab344091f0782693b636206286e4784a078 Cr-Commit-Position: refs/heads/master@{#315346}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+49 lines, -111 lines) Patch
M sync/engine/commit.h View 2 chunks +4 lines, -5 lines 0 comments Download
M sync/engine/commit.cc View 2 chunks +0 lines, -4 lines 0 comments Download
M sync/engine/sync_scheduler_impl.cc View 1 chunk +3 lines, -1 line 0 comments Download
M sync/engine/sync_scheduler_unittest.cc View 1 chunk +3 lines, -4 lines 0 comments Download
M sync/engine/syncer.h View 2 chunks +5 lines, -5 lines 0 comments Download
M sync/engine/syncer.cc View 4 chunks +9 lines, -9 lines 0 comments Download
M sync/engine/syncer_unittest.cc View 3 chunks +7 lines, -22 lines 0 comments Download
M sync/protocol/sync.proto View 1 chunk +0 lines, -7 lines 0 comments Download
M sync/sessions/data_type_tracker.h View 3 chunks +0 lines, -10 lines 0 comments Download
M sync/sessions/data_type_tracker.cc View 6 chunks +2 lines, -14 lines 0 comments Download
M sync/sessions/nudge_tracker.h View 1 chunk +0 lines, -4 lines 0 comments Download
M sync/sessions/nudge_tracker.cc View 1 chunk +0 lines, -6 lines 0 comments Download
M sync/sessions/nudge_tracker_unittest.cc View 1 chunk +0 lines, -6 lines 0 comments Download
M sync/sessions/test_util.h View 2 chunks +5 lines, -5 lines 0 comments Download
M sync/sessions/test_util.cc View 3 chunks +11 lines, -9 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
Ryan Hamilton
Created Revert of Sync commit errors should temporarily re-enable trigger pre-commit getupdates
5 years, 10 months ago (2015-02-09 18:31:02 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/891123003/1
5 years, 10 months ago (2015-02-09 18:32:07 UTC) #2
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years, 10 months ago (2015-02-09 18:33:03 UTC) #3
commit-bot: I haz the power
5 years, 10 months ago (2015-02-09 18:33:42 UTC) #4
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/796a0ab344091f0782693b636206286e4784a078
Cr-Commit-Position: refs/heads/master@{#315346}

Powered by Google App Engine
This is Rietveld 408576698