Fix oban

Author: vtm9

apps/codebattle/lib/codebattle/user_group_tournament/context.ex

@@ -567,26 +567,28 @@ defmodule Codebattle.UserGroupTournament.Context do
     |> Enum.uniq()
   end
 
-  @hide_unveil_chunk_size 500
+  @default_hide_unveil_chunk_size 500
 
   @doc """
-  Enqueues `RepoHideWorker` jobs in chunks of #{@hide_unveil_chunk_size} repo IDs each.
+  Enqueues `RepoHideWorker` jobs in chunks of repo IDs.
   Returns the number of repo IDs that were enqueued (not the number of jobs).
   """
-  @spec enqueue_bulk_hide(GroupTournament.t()) :: non_neg_integer()
-  def enqueue_bulk_hide(%GroupTournament{} = group_tournament) do
-    enqueue_repo_id_chunks(group_tournament, &Codebattle.Workers.RepoHideWorker.new/2)
+  @spec enqueue_bulk_hide(GroupTournament.t(), pos_integer()) :: non_neg_integer()
+  def enqueue_bulk_hide(%GroupTournament{} = group_tournament, batch_size \\ @default_hide_unveil_chunk_size) do
+    enqueue_repo_id_chunks(group_tournament, batch_size, &Codebattle.Workers.RepoHideWorker.new/2)
   end
 
-  @spec enqueue_bulk_unveil(GroupTournament.t()) :: non_neg_integer()
-  def enqueue_bulk_unveil(%GroupTournament{} = group_tournament) do
-    enqueue_repo_id_chunks(group_tournament, &Codebattle.Workers.RepoUnveilWorker.new/2)
+  @spec enqueue_bulk_unveil(GroupTournament.t(), pos_integer()) :: non_neg_integer()
+  def enqueue_bulk_unveil(%GroupTournament{} = group_tournament, batch_size \\ @default_hide_unveil_chunk_size) do
+    enqueue_repo_id_chunks(group_tournament, batch_size, &Codebattle.Workers.RepoUnveilWorker.new/2)
   end
 
-  defp enqueue_repo_id_chunks(%GroupTournament{} = group_tournament, build_job) do
+  defp enqueue_repo_id_chunks(%GroupTournament{} = group_tournament, batch_size, build_job) do
+    safe_batch_size = max(batch_size, 1)
+
     group_tournament
     |> list_repo_ids()
-    |> Enum.chunk_every(@hide_unveil_chunk_size)
+    |> Enum.chunk_every(safe_batch_size)
     |> Enum.with_index()
     |> Enum.reduce(0, fn {chunk, idx}, count ->
       args = %{repo_ids: chunk, group_tournament_id: group_tournament.id}

apps/codebattle/lib/codebattle_web/controllers/admin/group_tournament_controller.ex

@@ -295,7 +295,7 @@ defmodule CodebattleWeb.Admin.GroupTournamentController do
 
   defp enqueue_bulk_op(conn, id, params, action) do
     group_tournament = Context.get_group_tournament!(id)
-    batch_size = parse_batch_size(get_in(params, ["bulk_repo", "batch_size"]))
+    batch_size = parse_bulk_op_batch_size(action, get_in(params, ["bulk_repo", "batch_size"]))
     {label, unit, enqueued, rate_note} = run_bulk_op(action, group_tournament, batch_size)
     {kind, message} = bulk_op_flash(label, unit, enqueued, rate_note)
 
@@ -312,11 +312,11 @@ defmodule CodebattleWeb.Admin.GroupTournamentController do
     add_viewer_roles: {"add-viewer-role", &UserGroupTournamentContext.enqueue_bulk_add_viewer_roles/2}
   }
 
-  defp run_bulk_op(:hide, gt, _batch_size),
-    do: {"hide", "repos", UserGroupTournamentContext.enqueue_bulk_hide(gt), :chunked}
+  defp run_bulk_op(:hide, gt, chunk_size),
+    do: {"hide", "repos", UserGroupTournamentContext.enqueue_bulk_hide(gt, chunk_size), {:chunked, chunk_size}}
 
-  defp run_bulk_op(:unveil, gt, _batch_size),
-    do: {"unveil", "repos", UserGroupTournamentContext.enqueue_bulk_unveil(gt), :chunked}
+  defp run_bulk_op(:unveil, gt, chunk_size),
+    do: {"unveil", "repos", UserGroupTournamentContext.enqueue_bulk_unveil(gt, chunk_size), {:chunked, chunk_size}}
 
   defp run_bulk_op(action, gt, batch_size) do
     {label, fun} = Map.fetch!(@bulk_per_user_ops, action)
@@ -325,8 +325,8 @@ defmodule CodebattleWeb.Admin.GroupTournamentController do
 
   defp bulk_op_flash(label, _unit, 0, _rate_note), do: {:error, "Nothing to enqueue for #{label}."}
 
-  defp bulk_op_flash(label, unit, enqueued, :chunked),
-    do: {:info, "Enqueued #{label} jobs covering #{enqueued} #{unit} (chunks of 500 per bulk call)."}
+  defp bulk_op_flash(label, unit, enqueued, {:chunked, chunk_size}),
+    do: {:info, "Enqueued #{label} jobs covering #{enqueued} #{unit} (chunks of #{chunk_size} per bulk call)."}
 
   defp bulk_op_flash(label, unit, enqueued, batch_size),
     do: {:info, "Enqueued #{label} jobs for #{enqueued} #{unit} (rate: #{batch_size} jobs/sec)."}
@@ -531,6 +531,11 @@ defmodule CodebattleWeb.Admin.GroupTournamentController do
   # even with concurrent runs from other tournaments.
   @default_batch_size 50
   @max_batch_size 100
+  @default_repo_chunk_size 500
+  @repo_chunk_sizes [1, 10, 100, 500]
+
+  defp parse_bulk_op_batch_size(action, value) when action in [:hide, :unveil], do: parse_repo_chunk_size(value)
+  defp parse_bulk_op_batch_size(_action, value), do: parse_batch_size(value)
 
   defp parse_batch_size(nil), do: @default_batch_size
 
@@ -544,6 +549,18 @@ defmodule CodebattleWeb.Admin.GroupTournamentController do
   defp parse_batch_size(value) when is_integer(value) and value >= 1 and value <= @max_batch_size, do: value
   defp parse_batch_size(_), do: @default_batch_size
 
+  defp parse_repo_chunk_size(nil), do: @default_repo_chunk_size
+
+  defp parse_repo_chunk_size(value) when is_binary(value) do
+    case value |> String.trim() |> Integer.parse() do
+      {n, ""} when n in @repo_chunk_sizes -> n
+      _ -> @default_repo_chunk_size
+    end
+  end
+
+  defp parse_repo_chunk_size(value) when value in @repo_chunk_sizes, do: value
+  defp parse_repo_chunk_size(_), do: @default_repo_chunk_size
+
   def create_token(conn, %{"id" => id, "group_tournament_token" => token_params}) do
     group_tournament = Context.get_group_tournament!(id)
 

apps/codebattle/lib/codebattle_web/templates/admin/group_tournament/show.html.heex

@@ -314,14 +314,27 @@
       <h4 class="text-white">Hide Repos</h4>
       <p class="cb-text small mb-3">
         Enqueues <code>RepoHideWorker</code>
-        jobs that batch all tournament repos into chunks of 500 per <code>/repos/hide</code>
+        jobs that batch all tournament repos into configurable chunks per <code>/repos/hide</code>
         call. One job per chunk, scheduled 1 second apart, retried by Oban on failure.
       </p>
       <form
         action={Routes.admin_group_tournament_path(@conn, :hide_repos, @group_tournament)}
         method="post"
+        class="d-flex align-items-end flex-wrap"
       >
         <input type="hidden" name="_csrf_token" value={Plug.CSRFProtection.get_csrf_token()} />
+        <div class="form-group mb-0 mr-3" style="max-width: 240px;">
+          <label class="text-white">Batch size</label>
+          <select
+            name="bulk_repo[batch_size]"
+            class="form-control cb-bg-panel cb-border-color text-white mt-2"
+          >
+            <option value="1">1 repo per call</option>
+            <option value="10">10 repos per call</option>
+            <option value="100">100 repos per call</option>
+            <option value="500" selected>500 repos per call</option>
+          </select>
+        </div>
         <button
           type="submit"
           class="btn btn-outline-warning cb-rounded"
@@ -336,15 +349,28 @@
       <h4 class="text-white">Unveil Repos</h4>
       <p class="cb-text small mb-3">
         Enqueues <code>RepoUnveilWorker</code>
-        jobs that batch all hidden tournament repos into chunks of 500 per
+        jobs that batch all hidden tournament repos into configurable chunks per
         <code>/repos/unveil</code>
         call.
       </p>
       <form
         action={Routes.admin_group_tournament_path(@conn, :unveil_repos, @group_tournament)}
         method="post"
+        class="d-flex align-items-end flex-wrap"
       >
         <input type="hidden" name="_csrf_token" value={Plug.CSRFProtection.get_csrf_token()} />
+        <div class="form-group mb-0 mr-3" style="max-width: 240px;">
+          <label class="text-white">Batch size</label>
+          <select
+            name="bulk_repo[batch_size]"
+            class="form-control cb-bg-panel cb-border-color text-white mt-2"
+          >
+            <option value="1">1 repo per call</option>
+            <option value="10">10 repos per call</option>
+            <option value="100">100 repos per call</option>
+            <option value="500" selected>500 repos per call</option>
+          </select>
+        </div>
         <button
           type="submit"
           class="btn btn-outline-success cb-rounded"

config/config.exs

@@ -36,7 +36,7 @@ config :codebattle, Oban,
   # `bot_detection` is intentionally low-concurrency: the analysis is CPU-bound
   # (telemetry aggregation + code parsing) and runs after every finished game,
   # so we cap parallelism to keep the box responsive under bursts.
-  queues: [default: 10, bot_detection: 2]
+  queues: [default: 40, bot_detection: 2]
 
 config :codebattle, :api_key, "x-key"
 config :codebattle, :app_subtitle, "by Hexlet’s community"