diff options
| author | rch <rch@chromium.org> | 2015-02-09 10:32:54 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-09 18:33:20 +0000 |
| commit | 796a0ab344091f0782693b636206286e4784a078 (patch) | |
| tree | 0dd9a9b1c1314267846b3f9f7b10a70bcaa44941 /sync/protocol | |
| parent | bd7a27361b8a72157ddbf25733a521022641481c (diff) | |
| download | chromium_src-796a0ab344091f0782693b636206286e4784a078.zip chromium_src-796a0ab344091f0782693b636206286e4784a078.tar.gz chromium_src-796a0ab344091f0782693b636206286e4784a078.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/891123003
Cr-Commit-Position: refs/heads/master@{#315346}
Diffstat (limited to 'sync/protocol')
| -rw-r--r-- | sync/protocol/sync.proto | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sync/protocol/sync.proto b/sync/protocol/sync.proto index 2c79c22..df302e3 100644 --- a/sync/protocol/sync.proto +++ b/sync/protocol/sync.proto @@ -492,13 +492,6 @@ message GetUpdateTriggers { // // Introduced in M38. optional bool initial_sync_in_progress = 7; - - // This flag is set if this GetUpdate request is due to client receiving - // conflict response from server, so client needs to sync and then resolve - // conflict locally, and then commit again. - // - // Introduced in M42. - optional bool sync_for_resolve_conflict_in_progress = 8; } message GarbageCollectionDirective { |