Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 288e73b0 authored by Kweku Adams's avatar Kweku Adams
Browse files

Adding job count quota limits. 

The main change is to have a limit for the past 10 minutes to avoid
short job bursts/spam. I've included bucket limits in case we want to
try them, but the limits are extremely high, so they should only affect
bad/pathological cases.

Bug: 117846754
Bug: 111423978
Test: atest com.android.server.job.controllers.QuotaControllerTest
Change-Id: I7bf7f1da64981187fa0295d0f6382779667e09dc
parent cdfa6ed8

core/proto/android/server/jobscheduler.proto

+19 −0
Original line number Diff line number Diff line
@@ -221,6 +221,8 @@ message ConstantsProto { 
    optional bool use_heartbeats = 23;



    message TimeController {

        option (.android.msg_privacy).dest = DEST_AUTOMATIC;



        // Whether or not TimeController should skip setting wakeup alarms for jobs that aren't

        // ready now.

        optional bool skip_not_ready_jobs = 1;
@@ -228,6 +230,8 @@ message ConstantsProto { 
    optional TimeController time_controller = 25;



    message QuotaController {

        option (.android.msg_privacy).dest = DEST_AUTOMATIC;



        // How much time each app will have to run jobs within their standby bucket window.

        optional int64 allowed_time_per_period_ms = 1;

        // How much time the package should have before transitioning from out-of-quota to in-quota.
@@ -251,6 +255,21 @@ message ConstantsProto { 
        optional int64 rare_window_size_ms = 6;

        // The maximum amount of time an app can have its jobs running within a 24 hour window.

        optional int64 max_execution_time_ms = 7;

        // The maximum number of jobs an app can run within this particular standby bucket's

        // window size.

        optional int32 max_job_count_active = 8;

        // The maximum number of jobs an app can run within this particular standby bucket's

        // window size.

        optional int32 max_job_count_working = 9;

        // The maximum number of jobs an app can run within this particular standby bucket's

        // window size.

        optional int32 max_job_count_frequent = 10;

        // The maximum number of jobs an app can run within this particular standby bucket's

        // window size.

        optional int32 max_job_count_rare = 11;

        // The maximum number of jobs that should be allowed to run in the past

        // {@link QUOTA_CONTROLLER_ALLOWED_TIME_PER_PERIOD_MS}.

        optional int32 max_job_count_per_allowed_time = 12;

    }

    optional QuotaController quota_controller = 24;

services/core/java/com/android/server/job/JobSchedulerService.java

+89 −0
Original line number Diff line number Diff line
@@ -419,6 +419,16 @@ public class JobSchedulerService extends com.android.server.SystemService 
                "qc_window_size_rare_ms";

        private static final String KEY_QUOTA_CONTROLLER_MAX_EXECUTION_TIME_MS =

                "qc_max_execution_time_ms";

        private static final String KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_ACTIVE =

                "qc_max_job_count_active";

        private static final String KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_WORKING =

                "qc_max_job_count_working";

        private static final String KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_FREQUENT =

                "qc_max_job_count_frequent";

        private static final String KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_RARE =

                "qc_max_job_count_rare";

        private static final String KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_PER_ALLOWED_TIME =

                "qc_max_count_per_allowed_time";



        private static final int DEFAULT_MIN_IDLE_COUNT = 1;

        private static final int DEFAULT_MIN_CHARGING_COUNT = 1;
@@ -460,6 +470,15 @@ public class JobSchedulerService extends com.android.server.SystemService 
                24 * 60 * 60 * 1000L; // 24 hours

        private static final long DEFAULT_QUOTA_CONTROLLER_MAX_EXECUTION_TIME_MS =

                4 * 60 * 60 * 1000L; // 4 hours

        private static final int DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_ACTIVE =

                200; // 1200/hr

        private static final int DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_WORKING =

                1200; // 600/hr

        private static final int DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_FREQUENT =

                1800; // 225/hr

        private static final int DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_RARE =

                2400; // 100/hr

        private static final int DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_PER_ALLOWED_TIME = 20;



        /**

         * Minimum # of idle jobs that must be ready in order to force the JMS to schedule things
@@ -677,6 +696,41 @@ public class JobSchedulerService extends com.android.server.SystemService 
        public long QUOTA_CONTROLLER_MAX_EXECUTION_TIME_MS =

                DEFAULT_QUOTA_CONTROLLER_MAX_EXECUTION_TIME_MS;



        /**

         * The maximum number of jobs an app can run within this particular standby bucket's

         * window size.

         */

        public int QUOTA_CONTROLLER_MAX_JOB_COUNT_ACTIVE =

                DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_ACTIVE;



        /**

         * The maximum number of jobs an app can run within this particular standby bucket's

         * window size.

         */

        public int QUOTA_CONTROLLER_MAX_JOB_COUNT_WORKING =

                DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_WORKING;



        /**

         * The maximum number of jobs an app can run within this particular standby bucket's

         * window size.

         */

        public int QUOTA_CONTROLLER_MAX_JOB_COUNT_FREQUENT =

                DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_FREQUENT;



        /**

         * The maximum number of jobs an app can run within this particular standby bucket's

         * window size.

         */

        public int QUOTA_CONTROLLER_MAX_JOB_COUNT_RARE =

                DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_RARE;



        /**

         * The maximum number of jobs that can run within the past

         * {@link #QUOTA_CONTROLLER_ALLOWED_TIME_PER_PERIOD_MS}.

         */

        public int QUOTA_CONTROLLER_MAX_JOB_COUNT_PER_ALLOWED_TIME =

                DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_PER_ALLOWED_TIME;



        private final KeyValueListParser mParser = new KeyValueListParser(',');



        void updateConstantsLocked(String value) {
@@ -784,6 +838,21 @@ public class JobSchedulerService extends com.android.server.SystemService 
            QUOTA_CONTROLLER_MAX_EXECUTION_TIME_MS = mParser.getDurationMillis(

                    KEY_QUOTA_CONTROLLER_MAX_EXECUTION_TIME_MS,

                    DEFAULT_QUOTA_CONTROLLER_MAX_EXECUTION_TIME_MS);

            QUOTA_CONTROLLER_MAX_JOB_COUNT_ACTIVE = mParser.getInt(

                    KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_ACTIVE,

                    DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_ACTIVE);

            QUOTA_CONTROLLER_MAX_JOB_COUNT_WORKING = mParser.getInt(

                    KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_WORKING,

                    DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_WORKING);

            QUOTA_CONTROLLER_MAX_JOB_COUNT_FREQUENT = mParser.getInt(

                    KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_FREQUENT,

                    DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_FREQUENT);

            QUOTA_CONTROLLER_MAX_JOB_COUNT_RARE = mParser.getInt(

                    KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_RARE,

                    DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_RARE);

            QUOTA_CONTROLLER_MAX_JOB_COUNT_PER_ALLOWED_TIME = mParser.getInt(

                    KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_PER_ALLOWED_TIME,

                    DEFAULT_QUOTA_CONTROLLER_MAX_JOB_COUNT_PER_ALLOWED_TIME);

        }



        void dump(IndentingPrintWriter pw) {
@@ -845,6 +914,16 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    QUOTA_CONTROLLER_WINDOW_SIZE_RARE_MS).println();

            pw.printPair(KEY_QUOTA_CONTROLLER_MAX_EXECUTION_TIME_MS,

                    QUOTA_CONTROLLER_MAX_EXECUTION_TIME_MS).println();

            pw.printPair(KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_ACTIVE,

                    QUOTA_CONTROLLER_MAX_JOB_COUNT_ACTIVE).println();

            pw.printPair(KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_WORKING,

                    QUOTA_CONTROLLER_MAX_JOB_COUNT_WORKING).println();

            pw.printPair(KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_FREQUENT,

                    QUOTA_CONTROLLER_MAX_JOB_COUNT_FREQUENT).println();

            pw.printPair(KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_RARE,

                    QUOTA_CONTROLLER_MAX_JOB_COUNT_RARE).println();

            pw.printPair(KEY_QUOTA_CONTROLLER_MAX_JOB_COUNT_PER_ALLOWED_TIME,

                    QUOTA_CONTROLLER_MAX_JOB_COUNT_PER_ALLOWED_TIME).println();

            pw.decreaseIndent();

        }
@@ -899,6 +978,16 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    QUOTA_CONTROLLER_WINDOW_SIZE_RARE_MS);

            proto.write(ConstantsProto.QuotaController.MAX_EXECUTION_TIME_MS,

                    QUOTA_CONTROLLER_MAX_EXECUTION_TIME_MS);

            proto.write(ConstantsProto.QuotaController.MAX_JOB_COUNT_ACTIVE,

                    QUOTA_CONTROLLER_MAX_JOB_COUNT_ACTIVE);

            proto.write(ConstantsProto.QuotaController.MAX_JOB_COUNT_WORKING,

                    QUOTA_CONTROLLER_MAX_JOB_COUNT_WORKING);

            proto.write(ConstantsProto.QuotaController.MAX_JOB_COUNT_FREQUENT,

                    QUOTA_CONTROLLER_MAX_JOB_COUNT_FREQUENT);

            proto.write(ConstantsProto.QuotaController.MAX_JOB_COUNT_RARE,

                    QUOTA_CONTROLLER_MAX_JOB_COUNT_RARE);

            proto.write(ConstantsProto.QuotaController.MAX_JOB_COUNT_PER_ALLOWED_TIME,

                    QUOTA_CONTROLLER_MAX_JOB_COUNT_PER_ALLOWED_TIME);

            proto.end(qcToken);



            proto.end(token);

services/core/java/com/android/server/job/controllers/QuotaController.java

+187 −41

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/mockingservicestests/src/com/android/server/job/controllers/QuotaControllerTest.java

+213 −27

File changed.

Preview size limit exceeded, changes collapsed.