Make manage submissions rejudging idempotent; fixes DMOJ#1009 (DMOJ#1127

)

judge/bridge/judgelist.py

@@ -99,12 +99,14 @@ def check_priority(self, priority):
     def judge(self, id, problem, language, source, priority):
         with self.lock:
             if id in self.submission_map or id in self.node_map:
-                logger.warning('Already judging? %d', id)
+                # Already judging, don't queue again. This can happen during batch rejudges, rejudges should be
+                # idempotent.
                 return
 
             candidates = [judge for judge in self.judges if not judge.working and judge.can_judge(problem, language)]
             logger.info('Free judges: %d', len(candidates))
             if candidates:
+                # Schedule the submission on the judge reporting least load.
                 judge = min(candidates, key=attrgetter('load'))
                 logger.info('Dispatched submission %d to: %s', id, judge.name)
                 self.submission_map[id] = judge

judge/models/submission.py

@@ -41,6 +41,7 @@ class Submission(models.Model):
         ('CE', _('Compile Error')),
         ('AB', _('Aborted')),
     )
+    IN_PROGRESS_GRADING_STATUS = ('QU', 'P', 'G')
     RESULT = SUBMISSION_RESULT
     USER_DISPLAY_CODES = {
         'AC': _('Accepted'),

judge/tasks/submission.py

@@ -16,6 +16,7 @@ def apply_submission_filter(queryset, id_range, languages, results):
         queryset = queryset.filter(language_id__in=languages)
     if results:
         queryset = queryset.filter(result__in=results)
+    queryset = queryset.exclude(status__in=Submission.IN_PROGRESS_GRADING_STATUS)
     return queryset