Adds CoursierWrapperProcess and JvmProcess, makes JVM executions less tenuous
#14270
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 12 commits
January 24, 2022 15:29
# Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
This reverts commit d752b3f. # Conflicts: # src/python/pants/jvm/compile.py # src/python/pants/jvm/resolve/coursier_setup.py # Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
chrisjrn
commented
Jan 26, 2022
chrisjrn
commented
Jan 26, 2022
src/python/pants/jvm/test/junit.py
Outdated
| description=f"Run JUnit 5 ConsoleLauncher against {request.field_set.address}", | ||
| level=LogLevel.DEBUG, | ||
| cache_scope=cache_scope, | ||
| # TODO: Should scalatest use nailgun? It previously wasn't. | ||
| use_nailgun=False, |
chrisjrn
commented
Jan 26, 2022
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
stuhood
approved these changes
Jan 26, 2022
| @@ -91,9 +91,9 @@ async def build_processors(bash: BashBinary, jdk_setup: JdkSetup) -> JavaParserC | |||
| # NB: We do not use nailgun for this process, since it is launched exactly once. | |||
There was a problem hiding this comment.
This process should set use_nailgun=False so that this comment remains true.
| merged_sources_digest=merged_sources_digest, | ||
| immutable_input_digests=FrozenDict(immutable_input_digests), | ||
| jdk_invoke_args=jdk_invoke_args, | ||
| extra_immutable_input_digests=FrozenDict(extra_immutable_input_digests), |
There was a problem hiding this comment.
The wrapping FrozenDict here shouldn't be necessary anymore I think.
Also, I think that these need to be nailgun keys as well: they are the classpath of the tool itself.
| description=f"Run Scalatest runner for {request.field_set.address}", | ||
| level=LogLevel.DEBUG, | ||
| cache_scope=cache_scope, | ||
| # TODO: Should scalatest use nailgun? It previously wasn't. |
There was a problem hiding this comment.
See #13871 on that topic. But for now: no.
added 2 commits
January 26, 2022 12:42
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
stuhood
approved these changes
Jan 26, 2022
src/python/pants/jvm/test/junit.py
Outdated
| description=f"Run JUnit 5 ConsoleLauncher against {request.field_set.address}", | ||
| level=LogLevel.DEBUG, | ||
| cache_scope=cache_scope, | ||
| # TODO: Should scalatest use nailgun? It previously wasn't. | ||
| use_nailgun=False, |
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
# Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels]
No, it doesn't look like it. Sorry that I didn't see this sooner. |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR, in support of #13942 simplifies the calling sites of JVM utilities through standard process requests that invoke the respective bash wrapper scripts in a standard way, including specifying standard immutable/append-only caches and environment variables where necessary.
This will make it easier to systematically amend the execution environment for JVM progress invocations, such as adding a dependency on
grep(see #13942) and should make future JVM tool additions more proactively use nailgun (nailgun support forJvmProcessis opt-out instead of opt-in).Google Java Format, scalafmt, Junit, and Scalatest now use nailgun where they previously did not.
Closes #13871