mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Adapt maxInstancesForQueue to only consider instances of the same job. 

Currently the maxInstancesForQueue limit checks the count of all jobs in a
given queue. If there are already too many jobs, the new job is discarded.

However this is not the expected behavior for the two jobs where it's used:
GroupCallPeekWorkerJob and AutomaticSessionResetJob
For both the expected behavior is that there aren't too many jobs of them
started, but that there will be at least one instance of them started.
Both of them use the same queue as the PushProcessMessageJob and the MarkerJob.
Those two jobs are often in the queue at the same time, effectively preventing
the GroupCallPeekWorkerJob and AutomaticSessionResetJob from being enqueued.
fork-5.53.8
AsamK 2021-02-06 16:54:52 +01:00 zatwierdzone przez Cody Henthorne
rodzic 53dc5bab43
commit 8f51bdcb78
5 zmienionych plików z 11 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java
Wyświetl plik

@ -407,8 +407,8 @@ public abstract class Job {
/**
* Specify the maximum number of instances you'd want of this job at any given time, as
* determined by the job's queue key. If enqueueing this job would put it over that limit,
* it will be ignored.
* determined by the job's factory key and queue key. If enqueueing this job would put it over
* that limit, it will be ignored.
*
* This property is ignored if the job is submitted as part of a {@link JobManager.Chain}, or
* if the job has no queue key.

2
app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java
Wyświetl plik

@ -314,7 +314,7 @@ class JobController {
boolean exceedsQueue = solo.getParameters().getQueue() != null &&
solo.getParameters().getMaxInstancesForQueue() != Job.Parameters.UNLIMITED &&
jobStorage.getJobCountForQueue(solo.getParameters().getQueue()) >= solo.getParameters().getMaxInstancesForQueue();
jobStorage.getJobCountForFactoryAndQueue(solo.getFactoryKey(), solo.getParameters().getQueue()) >= solo.getParameters().getMaxInstancesForQueue();
if (exceedsQueue) {
return true;

2
app/src/main/java/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java
Wyświetl plik

@ -30,7 +30,7 @@ public interface JobStorage {
int getJobCountForFactory(@NonNull String factoryKey);
@WorkerThread
int getJobCountForQueue(@NonNull String queueKey);
int getJobCountForFactoryAndQueue(@NonNull String factoryKey, @NonNull String queueKey);
@WorkerThread
void updateJobRunningState(@NonNull String id, boolean isRunning);

5
app/src/main/java/org/thoughtcrime/securesms/jobs/FastJobStorage.java
Wyświetl plik

@ -167,9 +167,10 @@ public class FastJobStorage implements JobStorage {
}
@Override
public synchronized int getJobCountForQueue(@NonNull String queueKey) {
public synchronized int getJobCountForFactoryAndQueue(@NonNull String factoryKey, @NonNull String queueKey) {
return (int) Stream.of(jobs)
.filter(j -> queueKey.equals(j.getQueueKey()))
.filter(j -> factoryKey.equals(j.getFactoryKey()) &&
queueKey.equals(j.getQueueKey()))
.count();
}

7
app/src/test/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java
Wyświetl plik

@ -547,13 +547,14 @@ public class FastJobStorageTest {
}
@Test
public void getJobCountForQueue_general() {
public void getJobCountForFactoryAndQueue_general() {
FastJobStorage subject = new FastJobStorage(fixedDataDatabase(DataSet1.FULL_SPECS));
subject.init();
assertEquals(1, subject.getJobCountForQueue("q1"));
assertEquals(0, subject.getJobCountForQueue("does-not-exist"));
assertEquals(1, subject.getJobCountForFactoryAndQueue("f1", "q1"));
assertEquals(0, subject.getJobCountForFactoryAndQueue("f2", "q1"));
assertEquals(0, subject.getJobCountForFactoryAndQueue("f1", "does-not-exist"));
}
private JobDatabase noopDatabase() {