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

Unified Diff: components/sync/engine_impl/sync_scheduler_impl_unittest.cc

Issue 2475043002: [Sync] Sync client should to exponential backoff when receive partial failure (Closed)
Patch Set: rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/sync/engine_impl/sync_scheduler_impl_unittest.cc
diff --git a/components/sync/engine_impl/sync_scheduler_impl_unittest.cc b/components/sync/engine_impl/sync_scheduler_impl_unittest.cc
index 061eb7aea098798b1940acab5152866a6b8935ac..94f7e78af0dfe6775e286216a855a72a40785e2d 100644
--- a/components/sync/engine_impl/sync_scheduler_impl_unittest.cc
+++ b/components/sync/engine_impl/sync_scheduler_impl_unittest.cc
@@ -169,6 +169,7 @@ class SyncSchedulerImplTest : public testing::Test {
MockDelayProvider* delay() { return delay_; }
MockConnectionManager* connection() { return connection_.get(); }
TimeDelta default_delay() { return TimeDelta::FromSeconds(0); }
+ TimeDelta long_delay() { return TimeDelta::FromSeconds(60); }
TimeDelta timeout() { return TestTimeouts::action_timeout(); }
void TearDown() override {
@@ -226,7 +227,33 @@ class SyncSchedulerImplTest : public testing::Test {
SyncCycleContext* context() { return context_.get(); }
ModelTypeSet GetThrottledTypes() {
- return scheduler_->nudge_tracker_.GetThrottledTypes();
+ ModelTypeSet throttled_types;
+ ModelTypeSet blocked_types = scheduler_->nudge_tracker_.GetBlockedTypes();
+ for (ModelTypeSet::Iterator type_it = blocked_types.First(); type_it.Good();
+ type_it.Inc()) {
+ if (scheduler_->nudge_tracker_.GetTypeBlockingMode(type_it.Get()) ==
+ WaitInterval::THROTTLED) {
+ throttled_types.Put(type_it.Get());
+ }
+ }
+ return throttled_types;
+ }
+
+ ModelTypeSet GetBackedOffTypes() {
+ ModelTypeSet backed_off_types;
+ ModelTypeSet blocked_types = scheduler_->nudge_tracker_.GetBlockedTypes();
+ for (ModelTypeSet::Iterator type_it = blocked_types.First(); type_it.Good();
+ type_it.Inc()) {
+ if (scheduler_->nudge_tracker_.GetTypeBlockingMode(type_it.Get()) ==
+ WaitInterval::EXPONENTIAL_BACKOFF) {
+ backed_off_types.Put(type_it.Get());
+ }
+ }
+ return backed_off_types;
+ }
+
+ bool IsAnyTypeBlocked() {
+ return scheduler_->nudge_tracker_.IsAnyTypeBlocked();
}
base::TimeDelta GetRetryTimerDelay() {
@@ -240,6 +267,22 @@ class SyncSchedulerImplTest : public testing::Test {
return MockInvalidation::Build(version, payload);
}
+ base::TimeDelta GetTypeBlockingTime(ModelType type) {
+ NudgeTracker::TypeTrackerMap::const_iterator tracker_it =
+ scheduler_->nudge_tracker_.type_trackers_.find(type);
+ DCHECK(tracker_it != scheduler_->nudge_tracker_.type_trackers_.end());
+ DCHECK(tracker_it->second->wait_interval_.get());
+ return tracker_it->second->wait_interval_->length;
+ }
+
+ void SetTypeBlockingMode(ModelType type, WaitInterval::BlockingMode mode) {
+ NudgeTracker::TypeTrackerMap::const_iterator tracker_it =
+ scheduler_->nudge_tracker_.type_trackers_.find(type);
+ DCHECK(tracker_it != scheduler_->nudge_tracker_.type_trackers_.end());
+ DCHECK(tracker_it->second->wait_interval_.get());
+ tracker_it->second->wait_interval_->mode = mode;
+ }
+
private:
syncable::Directory* directory() {
return test_user_share_.user_share()->directory.get();
@@ -805,9 +848,6 @@ TEST_F(SyncSchedulerImplTest, ThrottlingExpiresFromConfigure) {
}
TEST_F(SyncSchedulerImplTest, TypeThrottlingBlocksNudge) {
- UseMockDelayProvider();
- EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(default_delay()));
-
TimeDelta poll(TimeDelta::FromDays(1));
TimeDelta throttle1(TimeDelta::FromSeconds(60));
scheduler()->OnReceivedLongPollIntervalUpdate(poll);
@@ -818,7 +858,7 @@ TEST_F(SyncSchedulerImplTest, TypeThrottlingBlocksNudge) {
EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
.WillOnce(
DoAll(WithArg<2>(test_util::SimulateTypesThrottled(types, throttle1)),
- Return(false)))
+ Return(true)))
.RetiresOnSaturation();
StartSyncScheduler(base::Time());
@@ -826,6 +866,8 @@ TEST_F(SyncSchedulerImplTest, TypeThrottlingBlocksNudge) {
PumpLoop(); // To get PerformDelayedNudge called.
PumpLoop(); // To get TrySyncCycleJob called
EXPECT_TRUE(GetThrottledTypes().HasAll(types));
+ EXPECT_FALSE(scheduler()->IsBackingOff());
+ EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
// This won't cause a sync cycle because the types are throttled.
scheduler()->ScheduleLocalNudge(types, FROM_HERE);
@@ -834,6 +876,164 @@ TEST_F(SyncSchedulerImplTest, TypeThrottlingBlocksNudge) {
StopSyncScheduler();
}
+TEST_F(SyncSchedulerImplTest, TypeBackingOffBlocksNudge) {
+ UseMockDelayProvider();
+ EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(long_delay()));
+
+ TimeDelta poll(TimeDelta::FromDays(1));
+ scheduler()->OnReceivedLongPollIntervalUpdate(poll);
+
+ const ModelTypeSet types(THEMES);
+
+ ::testing::InSequence seq;
+ EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
+ .WillOnce(DoAll(WithArg<2>(test_util::SimulatePartialFailure(types)),
+ Return(true)))
+ .RetiresOnSaturation();
+
+ StartSyncScheduler(base::Time());
+ scheduler()->ScheduleLocalNudge(types, FROM_HERE);
+ PumpLoop(); // To get PerformDelayedNudge called.
+ PumpLoop(); // To get TrySyncCycleJob called
+ EXPECT_TRUE(GetBackedOffTypes().HasAll(types));
+ EXPECT_FALSE(scheduler()->IsBackingOff());
+ EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
+
+ // This won't cause a sync cycle because the types are backed off.
+ scheduler()->ScheduleLocalNudge(types, FROM_HERE);
+ PumpLoop();
+
+ StopSyncScheduler();
+}
+
+TEST_F(SyncSchedulerImplTest, TypeBackingOffWillExpire) {
+ UseMockDelayProvider();
+ EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(default_delay()));
+
+ TimeDelta poll(TimeDelta::FromDays(1));
+ scheduler()->OnReceivedLongPollIntervalUpdate(poll);
+
+ const ModelTypeSet types(THEMES);
+
+ ::testing::InSequence seq;
+ EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
+ .WillOnce(DoAll(WithArg<2>(test_util::SimulatePartialFailure(types)),
+ Return(true)))
+ .RetiresOnSaturation();
+
+ StartSyncScheduler(base::Time());
+ scheduler()->ScheduleLocalNudge(types, FROM_HERE);
+ PumpLoop(); // To get PerformDelayedNudge called.
+ PumpLoop(); // To get TrySyncCycleJob called
+ EXPECT_TRUE(GetBackedOffTypes().HasAll(types));
+ EXPECT_FALSE(scheduler()->IsBackingOff());
+ EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
+
+ SyncShareTimes times;
+ EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
+ .WillRepeatedly(DoAll(Invoke(test_util::SimulateNormalSuccess),
+ RecordSyncShare(&times, true)));
+ PumpLoop(); // To get PerformDelayedNudge called.
+ PumpLoop(); // To get TrySyncCycleJob called
+ EXPECT_FALSE(IsAnyTypeBlocked());
+ EXPECT_FALSE(scheduler()->IsBackingOff());
+ EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
+
+ StopSyncScheduler();
+}
+
+TEST_F(SyncSchedulerImplTest, TypeBackingOffAndThrottling) {
+ UseMockDelayProvider();
+ EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(long_delay()));
+
+ TimeDelta poll(TimeDelta::FromDays(1));
+ scheduler()->OnReceivedLongPollIntervalUpdate(poll);
+
+ const ModelTypeSet types(THEMES);
+
+ ::testing::InSequence seq;
+ EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
+ .WillOnce(DoAll(WithArg<2>(test_util::SimulatePartialFailure(types)),
+ Return(true)))
+ .RetiresOnSaturation();
+
+ StartSyncScheduler(base::Time());
+ scheduler()->ScheduleLocalNudge(types, FROM_HERE);
+ PumpLoop(); // To get PerformDelayedNudge called.
+ PumpLoop(); // To get TrySyncCycleJob called
+ EXPECT_TRUE(GetBackedOffTypes().HasAll(types));
+ EXPECT_FALSE(scheduler()->IsBackingOff());
+ EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
+
+ TimeDelta throttle1(TimeDelta::FromMilliseconds(150));
+
+ EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
+ .WillOnce(DoAll(WithArg<2>(test_util::SimulateThrottled(throttle1)),
+ Return(false)))
+ .RetiresOnSaturation();
+
+ // Sync still can throttle.
+ const ModelTypeSet unbacked_off_types(TYPED_URLS);
+ scheduler()->ScheduleLocalNudge(unbacked_off_types, FROM_HERE);
+ PumpLoop(); // TO get TypesUnblock called.
+ PumpLoop(); // To get TrySyncCycleJob called.
+
+ EXPECT_TRUE(GetBackedOffTypes().HasAll(types));
+ EXPECT_FALSE(scheduler()->IsBackingOff());
+ EXPECT_TRUE(scheduler()->IsCurrentlyThrottled());
+
+ StopSyncScheduler();
+}
+
+TEST_F(SyncSchedulerImplTest, TypeThrottlingBackingOffBlocksNudge) {
+ UseMockDelayProvider();
+ EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(long_delay()));
+
+ TimeDelta poll(TimeDelta::FromDays(1));
+ TimeDelta throttle(TimeDelta::FromSeconds(60));
+ scheduler()->OnReceivedLongPollIntervalUpdate(poll);
+
+ const ModelTypeSet throttled_types(THEMES);
+
+ ::testing::InSequence seq;
+ EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
+ .WillOnce(DoAll(WithArg<2>(test_util::SimulateTypesThrottled(
+ throttled_types, throttle)),
+ Return(true)))
+ .RetiresOnSaturation();
+
+ StartSyncScheduler(base::Time());
+ scheduler()->ScheduleLocalNudge(throttled_types, FROM_HERE);
+ PumpLoop(); // To get PerformDelayedNudge called.
+ PumpLoop(); // To get TrySyncCycleJob called
+
+ const ModelTypeSet backed_off_types(TYPED_URLS);
+
+ EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
+ .WillOnce(
+ DoAll(WithArg<2>(test_util::SimulatePartialFailure(backed_off_types)),
+ Return(true)))
+ .RetiresOnSaturation();
+
+ scheduler()->ScheduleLocalNudge(backed_off_types, FROM_HERE);
+
+ PumpLoop(); // To get PerformDelayedNudge called.
+ PumpLoop(); // To get TrySyncCycleJob called
+
+ EXPECT_TRUE(GetThrottledTypes().HasAll(throttled_types));
+ EXPECT_TRUE(GetBackedOffTypes().HasAll(backed_off_types));
+ EXPECT_FALSE(scheduler()->IsBackingOff());
+ EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
+
+ // This won't cause a sync cycle because the types are throttled or backed
+ // off.
+ scheduler()->ScheduleLocalNudge(Union(throttled_types, backed_off_types),
+ FROM_HERE);
+ PumpLoop();
+
+ StopSyncScheduler();
+}
+
TEST_F(SyncSchedulerImplTest, TypeThrottlingDoesBlockOtherSources) {
UseMockDelayProvider();
EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(default_delay()));
@@ -850,7 +1050,7 @@ TEST_F(SyncSchedulerImplTest, TypeThrottlingDoesBlockOtherSources) {
EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
.WillOnce(DoAll(WithArg<2>(test_util::SimulateTypesThrottled(
throttled_types, throttle1)),
- Return(false)))
+ Return(true)))
.RetiresOnSaturation();
StartSyncScheduler(base::Time());
@@ -858,6 +1058,8 @@ TEST_F(SyncSchedulerImplTest, TypeThrottlingDoesBlockOtherSources) {
PumpLoop(); // To get PerformDelayedNudge called.
PumpLoop(); // To get TrySyncCycleJob called
EXPECT_TRUE(GetThrottledTypes().HasAll(throttled_types));
+ EXPECT_FALSE(scheduler()->IsBackingOff());
+ EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
// Ignore invalidations for throttled types.
scheduler()->ScheduleInvalidationNudge(THEMES, BuildInvalidation(10, "test"),
@@ -881,6 +1083,54 @@ TEST_F(SyncSchedulerImplTest, TypeThrottlingDoesBlockOtherSources) {
StopSyncScheduler();
}
+TEST_F(SyncSchedulerImplTest, TypeBackingOffDoesBlockOtherSources) {
+ UseMockDelayProvider();
+ EXPECT_CALL(*delay(), GetDelay(_)).WillRepeatedly(Return(long_delay()));
+
+ SyncShareTimes times;
+ TimeDelta poll(TimeDelta::FromDays(1));
+ scheduler()->OnReceivedLongPollIntervalUpdate(poll);
+
+ const ModelTypeSet backed_off_types(THEMES);
+ const ModelTypeSet unbacked_off_types(PREFERENCES);
+
+ ::testing::InSequence seq;
+ EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
+ .WillOnce(
+ DoAll(WithArg<2>(test_util::SimulatePartialFailure(backed_off_types)),
+ Return(true)))
+ .RetiresOnSaturation();
+
+ StartSyncScheduler(base::Time());
+ scheduler()->ScheduleLocalNudge(backed_off_types, FROM_HERE);
+ PumpLoop(); // To get PerformDelayedNudge called.
+ PumpLoop(); // To get TrySyncCycleJob called
+ EXPECT_TRUE(GetBackedOffTypes().HasAll(backed_off_types));
+ EXPECT_FALSE(scheduler()->IsBackingOff());
+ EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
+
+ // Ignore invalidations for backed off types.
+ scheduler()->ScheduleInvalidationNudge(THEMES, BuildInvalidation(10, "test"),
+ FROM_HERE);
+ PumpLoop();
+
+ // Ignore refresh requests for backed off types.
+ scheduler()->ScheduleLocalRefreshRequest(backed_off_types, FROM_HERE);
+ PumpLoop();
+
+ Mock::VerifyAndClearExpectations(syncer());
+
+ // Local nudges for non-backed off types will trigger a sync.
+ EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
+ .WillRepeatedly(DoAll(Invoke(test_util::SimulateNormalSuccess),
+ RecordSyncShare(&times, true)));
+ scheduler()->ScheduleLocalNudge(unbacked_off_types, FROM_HERE);
+ RunLoop();
+ Mock::VerifyAndClearExpectations(syncer());
+
+ StopSyncScheduler();
+}
+
// Test nudges / polls don't run in config mode and config tasks do.
TEST_F(SyncSchedulerImplTest, ConfigurationMode) {
TimeDelta poll(TimeDelta::FromMilliseconds(15));
@@ -1439,4 +1689,40 @@ TEST_F(SyncSchedulerImplTest, ScheduleClearServerData_FailsRetriesSucceeds) {
ASSERT_FALSE(scheduler()->IsBackingOff());
}
+TEST_F(SyncSchedulerImplTest, PartialFailureWillExponentialBackoff) {
+ TimeDelta poll(TimeDelta::FromDays(1));
+ scheduler()->OnReceivedLongPollIntervalUpdate(poll);
+
+ const ModelTypeSet types(THEMES);
+
+ ::testing::InSequence seq;
+ EXPECT_CALL(*syncer(), NormalSyncShare(_, _, _))
+ .WillRepeatedly(DoAll(
+ WithArg<2>(test_util::SimulatePartialFailure(types)), Return(true)))
+ .RetiresOnSaturation();
+
+ StartSyncScheduler(base::Time());
+ scheduler()->ScheduleLocalNudge(types, FROM_HERE);
+ PumpLoop(); // To get PerformDelayedNudge called.
+ PumpLoop(); // To get TrySyncCycleJob called
+ EXPECT_TRUE(GetBackedOffTypes().HasAll(types));
+ EXPECT_FALSE(scheduler()->IsBackingOff());
+ EXPECT_FALSE(scheduler()->IsCurrentlyThrottled());
+ base::TimeDelta first_blocking_time = GetTypeBlockingTime(THEMES);
+
+ SetTypeBlockingMode(THEMES, WaitInterval::EXPONENTIAL_BACKOFF_RETRYING);
+ // This won't cause a sync cycle because the types are backed off.
+ scheduler()->ScheduleLocalNudge(types, FROM_HERE);
+ PumpLoop();
+ PumpLoop();
+ base::TimeDelta second_blocking_time = GetTypeBlockingTime(THEMES);
+
+ // The Exponential backoff should be between previous backoff 1.5 and 2.5
+ // times.
+ EXPECT_LE(first_blocking_time * 1.5, second_blocking_time);
+ EXPECT_GE(first_blocking_time * 2.5, second_blocking_time);
+
+ StopSyncScheduler();
+}
+
} // namespace syncer
« no previous file with comments | « components/sync/engine_impl/sync_scheduler_impl.cc ('k') | components/sync/engine_impl/syncer_proto_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698