src/Pure/Tools/build_process.scala

       List.from(
         for (session <- sessions1.iterator if !old_pending(session.name))
           yield Build_Process.Task(session.name, session.deps, JSON.Object.empty, build_uuid))
     val pending1 = new_pending ::: state.pending
 
-    state.copy(
-      numa_nodes = Host.numa_nodes(enabled = build_context.numa_shuffling),
-      sessions = sessions1,
-      pending = pending1)
+    state.copy(sessions = sessions1, pending = pending1)
   }
 
   protected def next_jobs(state: Build_Process.State): List[String] = {
     val limit = {
       if (progress.stopped) { if (build_context.master) Int.MaxValue else 0 }

 
 
   /* run */
 
   def run(): Build.Results = {
-    if (build_context.master) {
-      _build_cluster.init()
-      synchronized_database("Build_Process.init") { _state = init_state(_state) }
+    synchronized_database("Build_Process.init") {
+      if (build_context.master) {
+        _build_cluster.init()
+        _state = init_state(_state)
+      }
+      _state = _state.copy(numa_nodes = Host.numa_nodes(enabled = build_context.numa_shuffling))
     }
 
     def finished(): Boolean = synchronized_database("Build_Process.test") {
       if (!build_context.master && progress.stopped) _state.build_running.isEmpty
       else _state.pending.isEmpty