Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Increase restore timeout for system agents"

Browse Source
This commit is contained in:
Ruslan Tkhakokhov
2020-10-07 22:26:27 +00:00
committed by Android (Google) Code Review
parent 53d614ccf1 623ad185ca
commit d8211133b5
6 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
services/backup/java/com/android/server/backup/BackupAgentTimeoutParameters.java
View File

@@ -19,6 +19,7 @@ package com.android.server.backup;
import android.content.ContentResolver;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.KeyValueListParser;
import android.util.KeyValueSettingObserver;
@@ -52,10 +53,18 @@ public class BackupAgentTimeoutParameters extends KeyValueSettingObserver {
public static final String SETTING_RESTORE_AGENT_TIMEOUT_MILLIS =
"restore_agent_timeout_millis";
@VisibleForTesting
public static final String SETTING_RESTORE_SYSTEM_AGENT_TIMEOUT_MILLIS =
"restore_system_agent_timeout_millis";
@VisibleForTesting
public static final String SETTING_RESTORE_AGENT_FINISHED_TIMEOUT_MILLIS =
"restore_agent_finished_timeout_millis";
@VisibleForTesting
public static final String SETTING_RESTORE_SESSION_TIMEOUT_MILLIS =
"restore_session_timeout_millis";
@VisibleForTesting
public static final String SETTING_QUOTA_EXCEEDED_TIMEOUT_MILLIS =
"quota_exceeded_timeout_millis";
@@ -71,9 +80,14 @@ public class BackupAgentTimeoutParameters extends KeyValueSettingObserver {
@VisibleForTesting public static final long DEFAULT_RESTORE_AGENT_TIMEOUT_MILLIS = 60 * 1000;
@VisibleForTesting public static final long DEFAULT_RESTORE_SYSTEM_AGENT_TIMEOUT_MILLIS =
180 * 1000;
@VisibleForTesting
public static final long DEFAULT_RESTORE_AGENT_FINISHED_TIMEOUT_MILLIS = 30 * 1000;
@VisibleForTesting public static final long DEFAULT_RESTORE_SESSION_TIMEOUT_MILLIS = 60 * 1000;
@VisibleForTesting
public static final long DEFAULT_QUOTA_EXCEEDED_TIMEOUT_MILLIS = 3 * 1000;
@@ -89,6 +103,12 @@ public class BackupAgentTimeoutParameters extends KeyValueSettingObserver {
@GuardedBy("mLock")
private long mRestoreAgentTimeoutMillis;
@GuardedBy("mLock")
private long mRestoreSystemAgentTimeoutMillis;
@GuardedBy("mLock")
private long mRestoreSessionTimeoutMillis;
@GuardedBy("mLock")
private long mRestoreAgentFinishedTimeoutMillis;
@@ -123,10 +143,18 @@ public class BackupAgentTimeoutParameters extends KeyValueSettingObserver {
parser.getLong(
SETTING_RESTORE_AGENT_TIMEOUT_MILLIS,
DEFAULT_RESTORE_AGENT_TIMEOUT_MILLIS);
mRestoreSystemAgentTimeoutMillis =
parser.getLong(
SETTING_RESTORE_SYSTEM_AGENT_TIMEOUT_MILLIS,
DEFAULT_RESTORE_SYSTEM_AGENT_TIMEOUT_MILLIS);
mRestoreAgentFinishedTimeoutMillis =
parser.getLong(
SETTING_RESTORE_AGENT_FINISHED_TIMEOUT_MILLIS,
DEFAULT_RESTORE_AGENT_FINISHED_TIMEOUT_MILLIS);
mRestoreSessionTimeoutMillis =
parser.getLong(
SETTING_RESTORE_SESSION_TIMEOUT_MILLIS,
DEFAULT_RESTORE_SESSION_TIMEOUT_MILLIS);
mQuotaExceededTimeoutMillis =
parser.getLong(
SETTING_QUOTA_EXCEEDED_TIMEOUT_MILLIS,
@@ -152,9 +180,20 @@ public class BackupAgentTimeoutParameters extends KeyValueSettingObserver {
}
}
public long getRestoreAgentTimeoutMillis() {
/**
* @param applicationUid UID of the application for which to get restore timeout
* @return restore timeout in milliseconds
*/
public long getRestoreAgentTimeoutMillis(int applicationUid) {
synchronized (mLock) {
return mRestoreAgentTimeoutMillis;
return UserHandle.isCore(applicationUid) ? mRestoreSystemAgentTimeoutMillis :
mRestoreAgentTimeoutMillis;
}
}
public long getRestoreSessionTimeoutMillis() {
synchronized (mLock) {
return mRestoreSessionTimeoutMillis;
}
}

2
services/backup/java/com/android/server/backup/UserBackupManagerService.java
View File

@@ -4088,7 +4088,7 @@ public class UserBackupManagerService {
mActiveRestoreSession = new ActiveRestoreSession(this, packageName, transport,
getEligibilityRulesForOperation(operationType));
mBackupHandler.sendEmptyMessageDelayed(MSG_RESTORE_SESSION_TIMEOUT,
mAgentTimeoutParameters.getRestoreAgentTimeoutMillis());
mAgentTimeoutParameters.getRestoreSessionTimeoutMillis());
}
return mActiveRestoreSession;
}

2
services/backup/java/com/android/server/backup/internal/BackupHandler.java
View File

@@ -390,7 +390,7 @@ public class BackupHandler extends Handler {
// Done: reset the session timeout clock
removeMessages(MSG_RESTORE_SESSION_TIMEOUT);
sendEmptyMessageDelayed(MSG_RESTORE_SESSION_TIMEOUT,
mAgentTimeoutParameters.getRestoreAgentTimeoutMillis());
mAgentTimeoutParameters.getRestoreSessionTimeoutMillis());
params.listener.onFinished(callerLogString);
}

3
services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java
View File

@@ -403,7 +403,8 @@ public class FullRestoreEngine extends RestoreEngine {
final boolean isSharedStorage = pkg.equals(SHARED_BACKUP_AGENT_PACKAGE);
final long timeout = isSharedStorage ?
mAgentTimeoutParameters.getSharedBackupAgentTimeoutMillis() :
mAgentTimeoutParameters.getRestoreAgentTimeoutMillis();
mAgentTimeoutParameters.getRestoreAgentTimeoutMillis(
mTargetApp.uid);
try {
mBackupManagerService.prepareOperationTimeout(token,
timeout,

9
services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java
View File

@@ -46,6 +46,7 @@ import android.content.pm.PackageManagerInternal;
import android.os.Bundle;
import android.os.Message;
import android.os.ParcelFileDescriptor;
import android.os.Process;
import android.os.RemoteException;
import android.os.SystemClock;
import android.os.UserHandle;
@@ -433,6 +434,8 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask {
// Pull the Package Manager metadata from the restore set first
mCurrentPackage = new PackageInfo();
mCurrentPackage.packageName = PACKAGE_MANAGER_SENTINEL;
mCurrentPackage.applicationInfo = new ApplicationInfo();
mCurrentPackage.applicationInfo.uid = Process.SYSTEM_UID;
mPmAgent = backupManagerService.makeMetadataAgent(null);
mAgent = IBackupAgent.Stub.asInterface(mPmAgent.onBind());
if (MORE_DEBUG) {
@@ -760,7 +763,8 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask {
// Kick off the restore, checking for hung agents. The timeout or
// the operationComplete() callback will schedule the next step,
// so we do not do that here.
long restoreAgentTimeoutMillis = mAgentTimeoutParameters.getRestoreAgentTimeoutMillis();
long restoreAgentTimeoutMillis = mAgentTimeoutParameters.getRestoreAgentTimeoutMillis(
app.applicationInfo.uid);
backupManagerService.prepareOperationTimeout(
mEphemeralOpToken, restoreAgentTimeoutMillis, this, OP_TYPE_RESTORE_WAIT);
startedAgentRestore = true;
@@ -1122,7 +1126,8 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask {
} else {
// We were invoked via an active restore session, not by the Package
// Manager, so start up the session timeout again.
long restoreAgentTimeoutMillis = mAgentTimeoutParameters.getRestoreAgentTimeoutMillis();
long restoreAgentTimeoutMillis =
mAgentTimeoutParameters.getRestoreSessionTimeoutMillis();
backupManagerService.getBackupHandler().sendEmptyMessageDelayed(
MSG_RESTORE_SESSION_TIMEOUT,
restoreAgentTimeoutMillis);

34
services/robotests/backup/src/com/android/server/backup/BackupAgentTimeoutParametersTest.java
View File

@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEquals;
import android.content.ContentResolver;
import android.content.Context;
import android.os.Handler;
import android.os.Process;
import android.platform.test.annotations.Presubmit;
import android.provider.Settings;
@@ -64,7 +65,7 @@ public class BackupAgentTimeoutParametersTest {
long kvBackupAgentTimeoutMillis = mParameters.getKvBackupAgentTimeoutMillis();
long fullBackupAgentTimeoutMillis = mParameters.getFullBackupAgentTimeoutMillis();
long sharedBackupAgentTimeoutMillis = mParameters.getSharedBackupAgentTimeoutMillis();
long restoreAgentTimeoutMillis = mParameters.getRestoreAgentTimeoutMillis();
long restoreSessionTimeoutMillis = mParameters.getRestoreSessionTimeoutMillis();
long restoreAgentFinishedTimeoutMillis = mParameters.getRestoreAgentFinishedTimeoutMillis();
assertEquals(
@@ -77,13 +78,40 @@ public class BackupAgentTimeoutParametersTest {
BackupAgentTimeoutParameters.DEFAULT_SHARED_BACKUP_AGENT_TIMEOUT_MILLIS,
sharedBackupAgentTimeoutMillis);
assertEquals(
BackupAgentTimeoutParameters.DEFAULT_RESTORE_AGENT_TIMEOUT_MILLIS,
restoreAgentTimeoutMillis);
BackupAgentTimeoutParameters.DEFAULT_RESTORE_SESSION_TIMEOUT_MILLIS,
restoreSessionTimeoutMillis);
assertEquals(
BackupAgentTimeoutParameters.DEFAULT_RESTORE_AGENT_FINISHED_TIMEOUT_MILLIS,
restoreAgentFinishedTimeoutMillis);
}
@Test
public void
testGetRestoreAgentTimeout_afterConstructorWithStartForSystemAgent_returnsDefaultValue() {
mParameters.start();
// Numbers before FIRST_APPLICATION_UID are reserved as UIDs for system components.
long restoreTimeout =
mParameters.getRestoreAgentTimeoutMillis(Process.FIRST_APPLICATION_UID - 1);
assertThat(restoreTimeout)
.isEqualTo(
BackupAgentTimeoutParameters.DEFAULT_RESTORE_SYSTEM_AGENT_TIMEOUT_MILLIS);
}
@Test
public void
testGetRestoreAgentTimeout_afterConstructorWithStartForAppAgent_returnsDefaultValue() {
mParameters.start();
// Numbers starting from FIRST_APPLICATION_UID are reserved for app UIDs.
long restoreTimeout =
mParameters.getRestoreAgentTimeoutMillis(Process.FIRST_APPLICATION_UID);
assertThat(restoreTimeout)
.isEqualTo(BackupAgentTimeoutParameters.DEFAULT_RESTORE_AGENT_TIMEOUT_MILLIS);
}
@Test
public void testGetQuotaExceededTimeoutMillis_returnsDefaultValue() {
mParameters.start();