diff options
| author | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 21:12:36 +0000 |
|---|---|---|
| committer | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 21:12:36 +0000 |
| commit | 8b0a7b0ab95dc4c25ba143560df45cefd0fc0d73 (patch) | |
| tree | 5f065dce105a398c966d6298bf0accf688411ca4 /chrome/browser/sync/engine/syncer_thread.cc | |
| parent | 84f4c303b828157bb0bf81982b6d328501235f15 (diff) | |
| download | chromium_src-8b0a7b0ab95dc4c25ba143560df45cefd0fc0d73.zip chromium_src-8b0a7b0ab95dc4c25ba143560df45cefd0fc0d73.tar.gz chromium_src-8b0a7b0ab95dc4c25ba143560df45cefd0fc0d73.tar.bz2 | |
Add extra logging to prove a theory for the race condition in bug 81256.
BUG=80706
TEST=
Review URL: http://codereview.chromium.org/6932049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/syncer_thread.cc')
| -rw-r--r-- | chrome/browser/sync/engine/syncer_thread.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/sync/engine/syncer_thread.cc b/chrome/browser/sync/engine/syncer_thread.cc index b4639d9..edf66a0 100644 --- a/chrome/browser/sync/engine/syncer_thread.cc +++ b/chrome/browser/sync/engine/syncer_thread.cc @@ -396,7 +396,7 @@ void SyncerThread::ScheduleNudgeImpl(const TimeDelta& delay, pending_nudge_->session->Coalesce(*(job.session.get())); if (!IsBackingOff()) { - VLOG(1) << "SyncerThread(" << this << ")" << " Dropping a nudge because" + VLOG(0) << "SyncerThread(" << this << ")" << " Dropping a nudge because" << " we are not in backoff and the job was coalesced"; return; } else { @@ -547,8 +547,12 @@ void SyncerThread::DoSyncSessionJob(const SyncSessionJob& job) { } if (job.purpose == SyncSessionJob::NUDGE) { - if (pending_nudge_.get() == NULL || pending_nudge_->session != job.session) + if (pending_nudge_.get() == NULL || + pending_nudge_->session != job.session) { + VLOG(0) << "SyncerThread(" << this << ")" << "Dropping a nudge in " + << "DoSyncSessionJob because another nudge was scheduled"; return; // Another nudge must have been scheduled in in the meantime. + } pending_nudge_.reset(); // Create the session with the latest model safe table and use it to purge |