diff options
| author | gangwu <gangwu@chromium.org> | 2015-02-11 12:44:08 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-11 20:44:45 +0000 |
| commit | f951166bde5650de692d30c542e320a1e6c0e75a (patch) | |
| tree | e6f66df7bb1efb9976d5da8e2d8ceeac94e8115a /sync/protocol | |
| parent | fddf37153bd228737419f53791489987938778a0 (diff) | |
| download | chromium_src-f951166bde5650de692d30c542e320a1e6c0e75a.zip chromium_src-f951166bde5650de692d30c542e320a1e6c0e75a.tar.gz chromium_src-f951166bde5650de692d30c542e320a1e6c0e75a.tar.bz2 | |
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}
Review URL: https://codereview.chromium.org/905853002
Cr-Commit-Position: refs/heads/master@{#315828}
Diffstat (limited to 'sync/protocol')
| -rw-r--r-- | sync/protocol/sync.proto | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sync/protocol/sync.proto b/sync/protocol/sync.proto index df302e3..2c79c22 100644 --- a/sync/protocol/sync.proto +++ b/sync/protocol/sync.proto @@ -492,6 +492,13 @@ 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 { |