Make the batch robust against differnet sorting of keys

ooni · Nov 20, 2023 · 9b8f594 · 9b8f594
1 parent ca20afa
commit 9b8f594
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/oonidata/workers/analysis.py b/oonidata/workers/analysis.py
@@ -211,11 +211,12 @@ def make_cc_batches(
     cc_batches = []
     current_cc_batch_size = 0
     current_cc_batch = []
-    while cnt_by_cc:
+    cnt_by_cc_sorted = sorted(cnt_by_cc.items(), key=lambda x: x[0])
+    while cnt_by_cc_sorted:
         while current_cc_batch_size <= max_obs_per_batch:
             try:
-                cc, cnt = cnt_by_cc.popitem()
-            except KeyError:
+                cc, cnt = cnt_by_cc_sorted.pop()
+            except IndexError:
                 break
             current_cc_batch.append(cc)
             current_cc_batch_size += cnt