Merge "Remove job rescheduling limits." (57829fb8) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+3 −35

Original line number	Diff line number	Diff line
		@@ -494,9 +494,10 @@ public class JobSchedulerService extends com.android.server.SystemService
		private static final String DEPRECATED_KEY_BG_LOW_JOB_COUNT = "bg_low_job_count";
		private static final String DEPRECATED_KEY_BG_CRITICAL_JOB_COUNT = "bg_critical_job_count";

		private static final String KEY_MAX_STANDARD_RESCHEDULE_COUNT
		private static final String DEPRECATED_KEY_MAX_STANDARD_RESCHEDULE_COUNT
		= "max_standard_reschedule_count";
		private static final String KEY_MAX_WORK_RESCHEDULE_COUNT = "max_work_reschedule_count";
		private static final String DEPRECATED_KEY_MAX_WORK_RESCHEDULE_COUNT =
		"max_work_reschedule_count";
		private static final String KEY_MIN_LINEAR_BACKOFF_TIME = "min_linear_backoff_time";
		private static final String KEY_MIN_EXP_BACKOFF_TIME = "min_exp_backoff_time";
		private static final String DEPRECATED_KEY_STANDBY_HEARTBEAT_TIME =
		@@ -525,8 +526,6 @@ public class JobSchedulerService extends com.android.server.SystemService
		private static final long DEFAULT_MAX_NON_ACTIVE_JOB_BATCH_DELAY_MS = 31 * MINUTE_IN_MILLIS;
		private static final float DEFAULT_HEAVY_USE_FACTOR = .9f;
		private static final float DEFAULT_MODERATE_USE_FACTOR = .5f;
		private static final int DEFAULT_MAX_STANDARD_RESCHEDULE_COUNT = Integer.MAX_VALUE;
		private static final int DEFAULT_MAX_WORK_RESCHEDULE_COUNT = Integer.MAX_VALUE;
		private static final long DEFAULT_MIN_LINEAR_BACKOFF_TIME = JobInfo.MIN_BACKOFF_MILLIS;
		private static final long DEFAULT_MIN_EXP_BACKOFF_TIME = JobInfo.MIN_BACKOFF_MILLIS;
		private static final float DEFAULT_CONN_CONGESTION_DELAY_FRAC = 0.5f;
		@@ -639,16 +638,6 @@ public class JobSchedulerService extends com.android.server.SystemService
		new KeyValueListParser.IntValue(
		"screen_off_job_concurrency_increase_delay_ms", 30_000);

		/**
		* The maximum number of times we allow a job to have itself rescheduled before
		* giving up on it, for standard jobs.
		*/
		int MAX_STANDARD_RESCHEDULE_COUNT = DEFAULT_MAX_STANDARD_RESCHEDULE_COUNT;
		/**
		* The maximum number of times we allow a job to have itself rescheduled before
		* giving up on it, for jobs that are executing work.
		*/
		int MAX_WORK_RESCHEDULE_COUNT = DEFAULT_MAX_WORK_RESCHEDULE_COUNT;
		/**
		* The minimum backoff time to allow for linear backoff.
		*/
		@@ -735,10 +724,6 @@ public class JobSchedulerService extends com.android.server.SystemService

		SCREEN_OFF_JOB_CONCURRENCY_INCREASE_DELAY_MS.parse(mParser);

		MAX_STANDARD_RESCHEDULE_COUNT = mParser.getInt(KEY_MAX_STANDARD_RESCHEDULE_COUNT,
		DEFAULT_MAX_STANDARD_RESCHEDULE_COUNT);
		MAX_WORK_RESCHEDULE_COUNT = mParser.getInt(KEY_MAX_WORK_RESCHEDULE_COUNT,
		DEFAULT_MAX_WORK_RESCHEDULE_COUNT);
		MIN_LINEAR_BACKOFF_TIME = mParser.getDurationMillis(KEY_MIN_LINEAR_BACKOFF_TIME,
		DEFAULT_MIN_LINEAR_BACKOFF_TIME);
		MIN_EXP_BACKOFF_TIME = mParser.getDurationMillis(KEY_MIN_EXP_BACKOFF_TIME,
		@@ -790,8 +775,6 @@ public class JobSchedulerService extends com.android.server.SystemService

		SCREEN_OFF_JOB_CONCURRENCY_INCREASE_DELAY_MS.dump(pw, "");

		pw.printPair(KEY_MAX_STANDARD_RESCHEDULE_COUNT, MAX_STANDARD_RESCHEDULE_COUNT).println();
		pw.printPair(KEY_MAX_WORK_RESCHEDULE_COUNT, MAX_WORK_RESCHEDULE_COUNT).println();
		pw.printPair(KEY_MIN_LINEAR_BACKOFF_TIME, MIN_LINEAR_BACKOFF_TIME).println();
		pw.printPair(KEY_MIN_EXP_BACKOFF_TIME, MIN_EXP_BACKOFF_TIME).println();
		pw.printPair(KEY_CONN_CONGESTION_DELAY_FRAC, CONN_CONGESTION_DELAY_FRAC).println();
		@@ -827,8 +810,6 @@ public class JobSchedulerService extends com.android.server.SystemService
		SCREEN_OFF_JOB_CONCURRENCY_INCREASE_DELAY_MS.dumpProto(proto,
		ConstantsProto.SCREEN_OFF_JOB_CONCURRENCY_INCREASE_DELAY_MS);

		proto.write(ConstantsProto.MAX_STANDARD_RESCHEDULE_COUNT, MAX_STANDARD_RESCHEDULE_COUNT);
		proto.write(ConstantsProto.MAX_WORK_RESCHEDULE_COUNT, MAX_WORK_RESCHEDULE_COUNT);
		proto.write(ConstantsProto.MIN_LINEAR_BACKOFF_TIME_MS, MIN_LINEAR_BACKOFF_TIME);
		proto.write(ConstantsProto.MIN_EXP_BACKOFF_TIME_MS, MIN_EXP_BACKOFF_TIME);
		proto.write(ConstantsProto.CONN_CONGESTION_DELAY_FRAC, CONN_CONGESTION_DELAY_FRAC);
		@@ -1738,19 +1719,6 @@ public class JobSchedulerService extends com.android.server.SystemService
		final int backoffAttempts = failureToReschedule.getNumFailures() + 1;
		long delayMillis;

		if (failureToReschedule.hasWorkLocked()) {
		if (backoffAttempts > mConstants.MAX_WORK_RESCHEDULE_COUNT) {
		Slog.w(TAG, "Not rescheduling " + failureToReschedule + ": attempt #"
		+ backoffAttempts + " > work limit "
		+ mConstants.MAX_STANDARD_RESCHEDULE_COUNT);
		return null;
		}
		} else if (backoffAttempts > mConstants.MAX_STANDARD_RESCHEDULE_COUNT) {
		Slog.w(TAG, "Not rescheduling " + failureToReschedule + ": attempt #"
		+ backoffAttempts + " > std limit " + mConstants.MAX_STANDARD_RESCHEDULE_COUNT);
		return null;
		}

		switch (job.getBackoffPolicy()) {
		case JobInfo.BACKOFF_POLICY_LINEAR: {
		long backoff = initialBackoffMillis;

core/proto/android/server/jobscheduler.proto

+2 −6

Original line number	Diff line number	Diff line
		@@ -219,12 +219,8 @@ message ConstantsProto {
		// The maximum number of background jobs we allow when the system is in a
		// critical memory state.
		optional int32 bg_critical_job_count = 14;
		// The maximum number of times we allow a job to have itself rescheduled
		// before giving up on it, for standard jobs.
		optional int32 max_standard_reschedule_count = 15;
		// The maximum number of times we allow a job to have itself rescheduled
		// before giving up on it, for jobs that are executing work.
		optional int32 max_work_reschedule_count = 16;
		reserved 15; // max_standard_reschedule_count
		reserved 16; // max_work_reschedule_count
		// The minimum backoff time to allow for linear backoff.
		optional int64 min_linear_backoff_time_ms = 17;
		// The minimum backoff time to allow for exponential backoff.