Allow each cmsWorker to use up to 1000 isolate boxes.

Also updates the box range to reflect the new default in isolate.

Author: veluca93

Dockerfile

@@ -63,7 +63,8 @@ RUN <<EOF
 #!/bin/bash -ex
     # Need to set user ID manually: otherwise it'd be 1000 on debian
     # and 1001 on ubuntu.
-    useradd -ms /bin/bash -u 1001 cmsuser
+    # 1001 is taken by `isolate`.
+    useradd -ms /bin/bash -u 1002 cmsuser
     usermod -aG sudo cmsuser
     usermod -aG isolate cmsuser
     # Disable sudo password
@@ -79,12 +80,12 @@ COPY --chown=cmsuser:cmsuser install.py constraints.txt /home/cmsuser/src/
 
 WORKDIR /home/cmsuser/src
 
-RUN --mount=type=cache,target=/home/cmsuser/.cache/pip,uid=1001 ./install.py venv
+RUN --mount=type=cache,target=/home/cmsuser/.cache/pip,uid=1002 ./install.py venv
 ENV PATH="/home/cmsuser/cms/bin:$PATH"
 
 COPY --chown=cmsuser:cmsuser . /home/cmsuser/src
 
-RUN --mount=type=cache,target=/home/cmsuser/.cache/pip,uid=1001 ./install.py cms --devel
+RUN --mount=type=cache,target=/home/cmsuser/.cache/pip,uid=1002 ./install.py cms --devel
 
 RUN <<EOF
 #!/bin/bash -ex

cms/grading/Sandbox.py

@@ -904,18 +904,21 @@ def __init__(self, file_cacher, name=None, temp_dir=None):
         """
         SandboxBase.__init__(self, file_cacher, name, temp_dir)
 
-        # Isolate only accepts ids between 0 and 999 (by default). We assign
-        # the range [(shard+1)*10, (shard+2)*10) to each Worker and keep the
-        # range [0, 10) for other uses (command-line scripts like cmsMake or
-        # direct console users of isolate). Inside each range ids are assigned
-        # sequentially, with a wrap-around.
+        NUM_IDS = 65000
+        IDS_PER_SHARD = 1000
+
+        # Isolate only accepts ids up to 65000. We assign
+        # the range [(shard+1)*1000, (shard+2)*1000) to each Worker and keep
+        # the range [0, 1000) for other uses (command-line scripts like cmsMake
+        # or direct console users of isolate). Inside each range ids are
+        # assigned sequentially, with a wrap-around.
         # FIXME This is the only use of FileCacher.service, and it's an
         # improper use! Avoid it!
         if file_cacher is not None and file_cacher.service is not None:
-            box_id = ((file_cacher.service.shard + 1) * 10
-                      + (IsolateSandbox.next_id % 10)) % 1000
+            box_id = ((file_cacher.service.shard + 1) * IDS_PER_SHARD
+                      + (IsolateSandbox.next_id % IDS_PER_SHARD)) % NUM_IDS
         else:
-            box_id = IsolateSandbox.next_id % 10
+            box_id = IsolateSandbox.next_id % NUM_IDS
         IsolateSandbox.next_id += 1
 
         # We create a directory "home" inside the outer temporary directory,

config/cms.sample.toml

@@ -40,6 +40,8 @@ ResourceService = [["localhost", 28000]]
 ScoringService = [["localhost", 28500]]
 Checker = [["localhost", 22000]]
 EvaluationService = [["localhost", 25000]]
+
+# NOTE: more than 64 workers on the same machine are not supported.
 Worker = [
     ["localhost", 26000],
     ["localhost", 26001],