Small conceptual simplification in new_run().

Author: vdbergh

server/fishtest/rundb.py

@@ -501,6 +501,7 @@ def new_run(
         if tc_base:
             tc_base = float(tc_base.group(1))
         new_run = {
+            "_id": ObjectId(),
             "version": RUN_VERSION,
             "args": run_args,
             "start_time": start_time,
@@ -566,12 +567,11 @@ def new_run(
             print(message, flush=True)
             raise Exception(message)
 
-        # We cannot use self.buffer since new_run does not have an id yet.
-        run_id = str(self.runs.insert_one(new_run).inserted_id)
+        self.buffer(new_run, True)
 
+        run_id = str(new_run["_id"])
         with self.unfinished_runs_lock:
             self.unfinished_runs.add(run_id)
-
         return run_id
 
     def is_primary_instance(self):
@@ -725,7 +725,7 @@ def buffer(self, run, flush):
                 }
         if flush:
             with self.active_run_lock(r_id):
-                self.runs.replace_one({"_id": ObjectId(r_id)}, run)
+                self.runs.replace_one({"_id": ObjectId(r_id)}, run, upsert=True)
 
     def stop(self):
         self.flush_all()

server/fishtest/schemas.py

@@ -640,11 +640,11 @@ def flags_must_match(run):
 # about non-validation of runs created with the prior
 # schema.
 
-RUN_VERSION = 4
+RUN_VERSION = 5
 
 runs_schema = intersect(
     {
-        "_id?": ObjectId,
+        "_id": ObjectId,
         "version": uint,
         "start_time": datetime_utc,
         "last_updated": datetime_utc,