Avoid bind-mounts for docker environments on macOS

src/python/pants/engine/internals/scheduler.py

@@ -209,6 +209,7 @@ def __init__(
             local_parallelism=execution_options.process_execution_local_parallelism,
             local_enable_nailgun=execution_options.process_execution_local_enable_nailgun,
             remote_parallelism=execution_options.process_execution_remote_parallelism,
+            docker_strategy=execution_options.docker_strategy.value,
             child_max_memory=execution_options.process_total_child_memory_usage or 0,
             child_default_memory=execution_options.process_per_child_memory_usage,
             graceful_shutdown_timeout=execution_options.process_execution_graceful_shutdown_timeout,

src/python/pants/engine/internals/scheduler_test_base.py

@@ -2,12 +2,17 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 import os
+from dataclasses import replace
 from pathlib import Path
 
 from pants.engine.internals.native_engine import PyExecutor
 from pants.engine.internals.scheduler import Scheduler, SchedulerSession
 from pants.engine.unions import UnionMembership
-from pants.option.global_options import DEFAULT_EXECUTION_OPTIONS, DEFAULT_LOCAL_STORE_OPTIONS
+from pants.option.global_options import (
+    DEFAULT_EXECUTION_OPTIONS,
+    DEFAULT_LOCAL_STORE_OPTIONS,
+    DockerStrategy,
+)
 from pants.util.contextutil import temporary_file_path
 from pants.util.dirutil import safe_mkdtemp
 from pants.util.logging import LogLevel
@@ -35,6 +40,7 @@ def mk_scheduler(
 
         local_execution_root_dir = os.path.realpath(safe_mkdtemp())
         named_caches_dir = os.path.realpath(safe_mkdtemp())
+        execution_options = replace(DEFAULT_EXECUTION_OPTIONS, docker_strategy=DockerStrategy.mount)
         scheduler = Scheduler(
             ignore_patterns=[],
             use_gitignore=False,
@@ -45,7 +51,7 @@ def mk_scheduler(
             rules=rules,
             union_membership=UnionMembership({}),
             executor=self._executor,
-            execution_options=DEFAULT_EXECUTION_OPTIONS,
+            execution_options=execution_options,
             local_store_options=DEFAULT_LOCAL_STORE_OPTIONS,
             include_trace_on_error=include_trace_on_error,
         )

src/python/pants/engine/rules_test.py

@@ -2,7 +2,7 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 import re
-from dataclasses import dataclass
+from dataclasses import dataclass, replace
 from enum import Enum
 from pathlib import Path
 from textwrap import dedent
@@ -28,14 +28,19 @@
     rule_helper,
 )
 from pants.engine.unions import UnionMembership
-from pants.option.global_options import DEFAULT_EXECUTION_OPTIONS, DEFAULT_LOCAL_STORE_OPTIONS
+from pants.option.global_options import (
+    DEFAULT_EXECUTION_OPTIONS,
+    DEFAULT_LOCAL_STORE_OPTIONS,
+    DockerStrategy,
+)
 from pants.testutil.rule_runner import MockGet, run_rule_with_mocks
 from pants.util.enums import match
 from pants.util.logging import LogLevel
 
 
 def create_scheduler(rules, validate=True):
     """Create a Scheduler."""
+    execution_options = replace(DEFAULT_EXECUTION_OPTIONS, docker_strategy=DockerStrategy.mount)
     return Scheduler(
         ignore_patterns=[],
         use_gitignore=False,
@@ -46,7 +51,7 @@ def create_scheduler(rules, validate=True):
         rules=rules,
         union_membership=UnionMembership({}),
         executor=PyExecutor(core_threads=2, max_threads=4),
-        execution_options=DEFAULT_EXECUTION_OPTIONS,
+        execution_options=execution_options,
         local_store_options=DEFAULT_LOCAL_STORE_OPTIONS,
         validate_reachability=validate,
     )

src/python/pants/init/engine_initializer.py

@@ -42,7 +42,6 @@
 from pants.init import specs_calculator
 from pants.init.bootstrap_scheduler import BootstrapStatus
 from pants.option.global_options import (
-    DEFAULT_EXECUTION_OPTIONS,
     DynamicRemoteOptions,
     ExecutionOptions,
     GlobalOptions,
@@ -237,8 +236,6 @@ def setup_graph_extended(
         union_membership: UnionMembership
         registered_target_types = RegisteredTargetTypes.create(build_configuration.target_types)
 
-        execution_options = execution_options or DEFAULT_EXECUTION_OPTIONS
-
         @rule
         def parser_singleton() -> Parser:
             return Parser(

src/python/pants/option/global_options.py

@@ -27,6 +27,7 @@
 from pants.engine.env_vars import CompleteEnvironmentVars
 from pants.engine.fs import FileContent
 from pants.engine.internals.native_engine import PyExecutor
+from pants.engine.platform import Platform
 from pants.option.custom_types import memory_size
 from pants.option.errors import OptionsError
 from pants.option.option_types import (
@@ -130,6 +131,14 @@ class KeepSandboxes(Enum):
     never = "never"
 
 
+class DockerStrategy(Enum):
+    """An enum for the global option `docker_strategy`."""
+
+    auto = "auto"
+    mount = "mount"
+    pipe = "pipe"
+
+
 @enum.unique
 class AuthPluginState(Enum):
     OK = "ok"
@@ -491,6 +500,8 @@ class ExecutionOptions:
     process_execution_graceful_shutdown_timeout: int
     cache_content_behavior: CacheContentBehavior
 
+    docker_strategy: DockerStrategy
+
     process_total_child_memory_usage: int | None
     process_per_child_memory_usage: int
 
@@ -535,6 +546,7 @@ def from_options(
             process_execution_cache_namespace=bootstrap_options.process_execution_cache_namespace,
             process_execution_graceful_shutdown_timeout=bootstrap_options.process_execution_graceful_shutdown_timeout,
             process_execution_local_enable_nailgun=bootstrap_options.process_execution_local_enable_nailgun,
+            docker_strategy=GlobalOptions.resolve_docker_strategy(bootstrap_options),
             cache_content_behavior=bootstrap_options.cache_content_behavior,
             process_total_child_memory_usage=bootstrap_options.process_total_child_memory_usage,
             process_per_child_memory_usage=bootstrap_options.process_per_child_memory_usage,
@@ -620,6 +632,7 @@ def from_options(cls, options: OptionValueContainer) -> LocalStoreOptions:
     keep_sandboxes=KeepSandboxes.never,
     local_cache=True,
     cache_content_behavior=CacheContentBehavior.fetch,
+    docker_strategy=DockerStrategy.auto,
     process_execution_local_enable_nailgun=True,
     process_execution_graceful_shutdown_timeout=3,
     # Remote store setup.
@@ -1042,7 +1055,11 @@ class BootstrapOptions:
         help=softwrap(
             """
             The maximum number of threads to use to execute `@rule` logic. Defaults to
-            a small multiple of `--rule-threads-core`.
+            `16 * --rule-threads-core`.
+
+            Note that setting too low a `--rule-threads-max` value can lead to deadlocks: Pants
+            uses blocking operations internally for a few use cases, and if the pool of blocking
+            threads is exhausted, those use cases will wait.
             """
         ),
     )
@@ -1185,6 +1202,24 @@ class BootstrapOptions:
             """
         ),
     )
+    process_execution_docker_strategy = EnumOption(
+        default=DEFAULT_EXECUTION_OPTIONS.docker_strategy,
+        help=softwrap(
+            """
+            The strategy used to provide inputs to Docker containers when the `docker_environment`
+            target is in use.
+
+            The `mount` strategy provides inputs via bind mounts. The `pipe` strategy provides
+            inputs by tar-pipe'ing them into the container.
+
+            The default value of `auto` will choose the fastest known-consistent strategy for the
+            platform that Pants is running on, which generally means using the `pipe` strategy when
+            Docker is implemented via virtualization (on macOS and Windows in particular). See
+            https://github.com/docker/roadmap/issues/7 for more information on macOS filesystem
+            virtualization status.
+            """
+        ),
+    )
     cache_content_behavior = EnumOption(
         advanced=True,
         default=DEFAULT_EXECUTION_OPTIONS.cache_content_behavior,
@@ -1823,10 +1858,22 @@ def validate_remote_headers(opt_name: str) -> None:
 
     @staticmethod
     def create_py_executor(bootstrap_options: OptionValueContainer) -> PyExecutor:
+        # NB: See the `--rule-threads-max` option help for a warning on setting this too low.
+        #
+        # This value is chosen somewhat arbitrarily, but has a few concerns at play:
+        # * When set too low, tasks using `Executor::spawn_blocking` on the Rust side can deadlock
+        #   when too many blocking operations already running.
+        # * Higher thread counts mean less bounded access to the LMDB store (which is the primary user
+        #   of blocking tasks), which is good up to a point, but then begins to increase kernel time
+        #   as many threads are blocked waiting for IO and locks.
+        #
+        # The value 16 was chosen to avoid deadlocks with all current `spawn_blocking` calls, and based
+        # on the observation that performance drops off by 2-3% points (on my machine!) when multiples
+        # of 32 and 64.
         rule_threads_max = (
             bootstrap_options.rule_threads_max
             if bootstrap_options.rule_threads_max
-            else 4 * bootstrap_options.rule_threads_core
+            else 16 * bootstrap_options.rule_threads_core
         )
         return PyExecutor(
             core_threads=bootstrap_options.rule_threads_core, max_threads=rule_threads_max
@@ -1853,6 +1900,19 @@ def resolve_keep_sandboxes(
         else:
             raise TypeError(f"Unexpected option value for `keep_sandboxes`: {resolved_value}")
 
+    @staticmethod
+    def resolve_docker_strategy(
+        bootstrap_options: OptionValueContainer,
+    ) -> DockerStrategy:
+        strategy = cast(DockerStrategy, bootstrap_options.process_execution_docker_strategy)
+        if strategy == DockerStrategy.auto:
+            return (
+                DockerStrategy.pipe
+                if Platform.create_for_localhost().is_macos
+                else DockerStrategy.mount
+            )
+        return strategy
+
     @staticmethod
     def compute_pants_ignore(buildroot, global_options):
         """Computes the merged value of the `--pants-ignore` flag.

src/rust/engine/fs/store/Cargo.toml

@@ -32,6 +32,7 @@ prost-types = "0.9"
 serde = "1.0"
 serde_derive = "1.0"
 sharded_lmdb = { path = "../../sharded_lmdb" }
+tar = { version = "0.4", default-features = false }
 task_executor = { path = "../../task_executor" }
 tempfile = "3"
 tokio-rustls = "0.23"