Merge "Add a first chance retry delay of 1s." into sc-dev am: 2181315b0a (220f8676) · Commits · e / os / android_frameworks_base

services/incremental/IncrementalService.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -81,8 +81,8 @@ struct Constants {

	static constexpr auto bindingTimeout = 1min;		static constexpr auto bindingTimeout = 1min;

	// 10s, 100s (~2min), 1000s (~15min), 10000s (~3hrs)		// 1s, 10s, 100s (~2min), 1000s (~15min), 10000s (~3hrs)
	static constexpr auto minBindDelay = 10s;		static constexpr auto minBindDelay = 1s;
	static constexpr auto maxBindDelay = 10000s;		static constexpr auto maxBindDelay = 10000s;
	static constexpr auto bindDelayMultiplier = 10;		static constexpr auto bindDelayMultiplier = 10;
	static constexpr auto bindDelayJitterDivider = 10;		static constexpr auto bindDelayJitterDivider = 10;

services/incremental/test/IncrementalServiceTest.cpp

+29 −10

Original line number	Original line	Diff line number	Diff line
	@@ -272,12 +272,20 @@ public:
	}		}
	return binder::Status::ok();		return binder::Status::ok();
	}		}
			binder::Status bindToDataLoaderOkWith1sDelay(int32_t mountId,
			const DataLoaderParamsParcel& params,
			int bindDelayMs,
			const sp<IDataLoaderStatusListener>& listener,
			bool* _aidl_return) {
			CHECK(100 * 9 <= bindDelayMs && bindDelayMs <= 100 * 11) << bindDelayMs;
			return bindToDataLoaderOk(mountId, params, bindDelayMs, listener, _aidl_return);
			}
	binder::Status bindToDataLoaderOkWith10sDelay(int32_t mountId,		binder::Status bindToDataLoaderOkWith10sDelay(int32_t mountId,
	const DataLoaderParamsParcel& params,		const DataLoaderParamsParcel& params,
	int bindDelayMs,		int bindDelayMs,
	const sp<IDataLoaderStatusListener>& listener,		const sp<IDataLoaderStatusListener>& listener,
	bool* _aidl_return) {		bool* _aidl_return) {
	CHECK(1000 * 9 <= bindDelayMs && bindDelayMs <= 1000 * 11) << bindDelayMs;		CHECK(100 * 9 * 9 <= bindDelayMs && bindDelayMs <= 100 * 11 * 11) << bindDelayMs;
	return bindToDataLoaderOk(mountId, params, bindDelayMs, listener, _aidl_return);		return bindToDataLoaderOk(mountId, params, bindDelayMs, listener, _aidl_return);
	}		}
	binder::Status bindToDataLoaderOkWith100sDelay(int32_t mountId,		binder::Status bindToDataLoaderOkWith100sDelay(int32_t mountId,
	@@ -285,7 +293,7 @@ public:
	int bindDelayMs,		int bindDelayMs,
	const sp<IDataLoaderStatusListener>& listener,		const sp<IDataLoaderStatusListener>& listener,
	bool* _aidl_return) {		bool* _aidl_return) {
	CHECK(1000 * 9 * 9 < bindDelayMs && bindDelayMs < 1000 * 11 * 11) << bindDelayMs;		CHECK(100 * 9 * 9 * 9 < bindDelayMs && bindDelayMs < 100 * 11 * 11 * 11) << bindDelayMs;
	return bindToDataLoaderOk(mountId, params, bindDelayMs, listener, _aidl_return);		return bindToDataLoaderOk(mountId, params, bindDelayMs, listener, _aidl_return);
	}		}
	binder::Status bindToDataLoaderOkWith1000sDelay(int32_t mountId,		binder::Status bindToDataLoaderOkWith1000sDelay(int32_t mountId,
	@@ -293,7 +301,8 @@ public:
	int bindDelayMs,		int bindDelayMs,
	const sp<IDataLoaderStatusListener>& listener,		const sp<IDataLoaderStatusListener>& listener,
	bool* _aidl_return) {		bool* _aidl_return) {
	CHECK(1000 * 9 * 9 * 9 < bindDelayMs && bindDelayMs < 1000 * 11 * 11 * 11) << bindDelayMs;		CHECK(100 * 9 * 9 * 9 * 9 < bindDelayMs && bindDelayMs < 100 * 11 * 11 * 11 * 11)
			<< bindDelayMs;
	return bindToDataLoaderOk(mountId, params, bindDelayMs, listener, _aidl_return);		return bindToDataLoaderOk(mountId, params, bindDelayMs, listener, _aidl_return);
	}		}
	binder::Status bindToDataLoaderOkWith10000sDelay(int32_t mountId,		binder::Status bindToDataLoaderOkWith10000sDelay(int32_t mountId,
	@@ -301,7 +310,7 @@ public:
	int bindDelayMs,		int bindDelayMs,
	const sp<IDataLoaderStatusListener>& listener,		const sp<IDataLoaderStatusListener>& listener,
	bool* _aidl_return) {		bool* _aidl_return) {
	CHECK(1000 * 9 * 9 * 9 * 9 < bindDelayMs && bindDelayMs < 1000 * 11 * 11 * 11 * 11)		CHECK(100 * 9 * 9 * 9 * 9 * 9 < bindDelayMs && bindDelayMs < 100 * 11 * 11 * 11 * 11 * 11)
	<< bindDelayMs;		<< bindDelayMs;
	return bindToDataLoaderOk(mountId, params, bindDelayMs, listener, _aidl_return);		return bindToDataLoaderOk(mountId, params, bindDelayMs, listener, _aidl_return);
	}		}
	@@ -865,10 +874,10 @@ TEST_F(IncrementalServiceTest, testDeleteStorageSuccess) {
	}		}

	TEST_F(IncrementalServiceTest, testDataLoaderDestroyedAndDelayed) {		TEST_F(IncrementalServiceTest, testDataLoaderDestroyedAndDelayed) {
	EXPECT_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _, _)).Times(6);		EXPECT_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _, _)).Times(7);
	EXPECT_CALL(*mDataLoaderManager, unbindFromDataLoader(_)).Times(1);		EXPECT_CALL(*mDataLoaderManager, unbindFromDataLoader(_)).Times(1);
	EXPECT_CALL(*mDataLoader, create(_, _, _, _)).Times(6);		EXPECT_CALL(*mDataLoader, create(_, _, _, _)).Times(7);
	EXPECT_CALL(*mDataLoader, start(_)).Times(6);		EXPECT_CALL(*mDataLoader, start(_)).Times(7);
	EXPECT_CALL(*mDataLoader, destroy(_)).Times(1);		EXPECT_CALL(*mDataLoader, destroy(_)).Times(1);
	EXPECT_CALL(*mVold, unmountIncFs(_)).Times(2);		EXPECT_CALL(*mVold, unmountIncFs(_)).Times(2);
	TemporaryDir tempDir;		TemporaryDir tempDir;
	@@ -880,6 +889,11 @@ TEST_F(IncrementalServiceTest, testDataLoaderDestroyedAndDelayed) {

	// Simulated crash/other connection breakage.		// Simulated crash/other connection breakage.

			ON_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _, _))
			.WillByDefault(Invoke(mDataLoaderManager,
			&MockDataLoaderManager::bindToDataLoaderOkWith1sDelay));
			mDataLoaderManager->setDataLoaderStatusDestroyed();

	ON_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _, _))		ON_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _, _))
	.WillByDefault(Invoke(mDataLoaderManager,		.WillByDefault(Invoke(mDataLoaderManager,
	&MockDataLoaderManager::bindToDataLoaderOkWith10sDelay));		&MockDataLoaderManager::bindToDataLoaderOkWith10sDelay));
	@@ -912,10 +926,10 @@ TEST_F(IncrementalServiceTest, testDataLoaderOnRestart) {

	constexpr auto bindRetryInterval = 5s;		constexpr auto bindRetryInterval = 5s;

	EXPECT_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _, _)).Times(10);		EXPECT_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _, _)).Times(11);
	EXPECT_CALL(*mDataLoaderManager, unbindFromDataLoader(_)).Times(1);		EXPECT_CALL(*mDataLoaderManager, unbindFromDataLoader(_)).Times(1);
	EXPECT_CALL(*mDataLoader, create(_, _, _, _)).Times(6);		EXPECT_CALL(*mDataLoader, create(_, _, _, _)).Times(7);
	EXPECT_CALL(*mDataLoader, start(_)).Times(6);		EXPECT_CALL(*mDataLoader, start(_)).Times(7);
	EXPECT_CALL(*mDataLoader, destroy(_)).Times(1);		EXPECT_CALL(*mDataLoader, destroy(_)).Times(1);
	EXPECT_CALL(*mVold, unmountIncFs(_)).Times(2);		EXPECT_CALL(*mVold, unmountIncFs(_)).Times(2);
	EXPECT_CALL(*mTimedQueue, addJob(_, _, _)).Times(4);		EXPECT_CALL(*mTimedQueue, addJob(_, _, _)).Times(4);
	@@ -993,6 +1007,11 @@ TEST_F(IncrementalServiceTest, testDataLoaderOnRestart) {

	// And test the rest of the backoff.		// And test the rest of the backoff.
	// Simulated crash/other connection breakage.		// Simulated crash/other connection breakage.
			ON_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _, _))
			.WillByDefault(Invoke(mDataLoaderManager,
			&MockDataLoaderManager::bindToDataLoaderOkWith1sDelay));
			mDataLoaderManager->setDataLoaderStatusDestroyed();

	ON_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _, _))		ON_CALL(*mDataLoaderManager, bindToDataLoader(_, _, _, _, _))
	.WillByDefault(Invoke(mDataLoaderManager,		.WillByDefault(Invoke(mDataLoaderManager,
	&MockDataLoaderManager::bindToDataLoaderOkWith10sDelay));		&MockDataLoaderManager::bindToDataLoaderOkWith10sDelay));