Cherry-pick proto_lang_toolchain Starlarkfication and proto_common module

src/main/java/com/google/devtools/build/lib/actions/ActionExecutionException.java

@@ -24,6 +24,7 @@
 import com.google.devtools.build.lib.skyframe.DetailedException;
 import com.google.devtools.build.lib.util.DetailedExitCode;
 import com.google.devtools.build.lib.util.ExitCode;
+import javax.annotation.Nullable;
 import net.starlark.java.syntax.Location;
 
 /**
@@ -115,6 +116,47 @@ private static NestedSet<Cause> rootCausesFromAction(
  detailedExitCode));
  }
 
+ public static ActionExecutionException fromExecException(ExecException exception, Action action) {
+ return fromExecException(exception, null, action);
+ }
+
+ /**
+ * Returns a new ActionExecutionException given an optional action subtask describing which part
+ * of the action failed (should be null for standard action failures). When appropriate (we use
+ * some heuristics to decide), produces an abbreviated message incorporating just the termination
+ * status if available.
+ *
+ * @param exception initial ExecException
+ * @param actionSubtask additional information about the action
+ * @param action failed action
+ * @return ActionExecutionException object describing the action failure
+ */
+ public static ActionExecutionException fromExecException(
+ ExecException exception, @Nullable String actionSubtask, Action action) {
+ // Message from ActionExecutionException will be prepended with action.describe() where
+ // necessary: because not all ActionExecutionExceptions come from this codepath, it is safer
+ // for consumers to manually prepend. We still put action.describe() in the failure detail
+ // message argument.
+ String message =
+ (actionSubtask == null ? "" : actionSubtask + ": ")
+ + exception.getMessageForActionExecutionException();
+
+ DetailedExitCode code =
+ DetailedExitCode.of(exception.getFailureDetail(action.describe() + " failed: " + message));
+
+ if (exception instanceof LostInputsExecException) {
+ return ((LostInputsExecException) exception).fromExecException(message, action, code);
+ }
+
+ return fromExecException(exception, message, action, code);
+ }
+
+ public static ActionExecutionException fromExecException(
+ ExecException exception, String message, Action action, DetailedExitCode code) {
+ return new ActionExecutionException(
+ message, exception, action, exception.isCatastrophic(), code);
+ }
+
  /** Returns the action that failed. */
  public ActionAnalysisMetadata getAction() {
  return action;

src/main/java/com/google/devtools/build/lib/actions/BUILD

@@ -297,8 +297,7 @@ java_library(
  "ResourceSetOrBuilder.java",
  ],
  deps = [
- ":artifacts",
- "//src/main/java/com/google/devtools/build/lib/collect/nestedset",
+ ":exec_exception",
  "//src/main/java/com/google/devtools/build/lib/concurrent",
  "//src/main/java/com/google/devtools/build/lib/jni",
  "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
@@ -344,3 +343,12 @@ java_library(
  "//third_party:jsr305",
  ],
 )
+
+java_library(
+ name = "exec_exception",
+ srcs = [
+ "ExecException.java",
+ "UserExecException.java",
+ ],
+ deps = ["//src/main/protobuf:failure_details_java_proto"],
+)

src/main/java/com/google/devtools/build/lib/actions/BaseSpawn.java

@@ -20,6 +20,7 @@
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.analysis.platform.PlatformInfo;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
+import com.google.devtools.build.lib.util.OS;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.util.List;
 import java.util.Map;
@@ -35,15 +36,15 @@ public class BaseSpawn implements Spawn {
  private final ImmutableMap<String, String> executionInfo;
  private final RunfilesSupplier runfilesSupplier;
  private final ActionExecutionMetadata action;
- private final ResourceSet localResources;
+ private final ResourceSetOrBuilder localResources;
 
  public BaseSpawn(
  List<String> arguments,
  Map<String, String> environment,
  Map<String, String> executionInfo,
  RunfilesSupplier runfilesSupplier,
  ActionExecutionMetadata action,
- ResourceSet localResources) {
+ ResourceSetOrBuilder localResources) {
  this.arguments = ImmutableList.copyOf(arguments);
  this.environment = ImmutableMap.copyOf(environment);
  this.executionInfo = ImmutableMap.copyOf(executionInfo);
@@ -123,8 +124,9 @@ public ActionExecutionMetadata getResourceOwner() {
  }
 
  @Override
- public ResourceSet getLocalResources() {
- return localResources;
+ public ResourceSet getLocalResources() throws ExecException {
+ return localResources.buildResourceSet(
+ OS.getCurrent(), action.getInputs().memoizedFlattenAndGetSize());
  }
 
  @Override

src/main/java/com/google/devtools/build/lib/actions/DelegateSpawn.java

@@ -84,7 +84,7 @@ public ActionExecutionMetadata getResourceOwner() {
  }
 
  @Override
- public ResourceSet getLocalResources() {
+ public ResourceSet getLocalResources() throws ExecException {
  return spawn.getLocalResources();
  }
 

src/main/java/com/google/devtools/build/lib/actions/ExecException.java

@@ -15,9 +15,6 @@
 package com.google.devtools.build.lib.actions;
 
 import com.google.devtools.build.lib.server.FailureDetails.FailureDetail;
-import com.google.devtools.build.lib.util.DetailedExitCode;
-import com.google.errorprone.annotations.ForOverride;
-import javax.annotation.Nullable;
 
 /**
  * An exception indication that the execution of an action has failed OR could not be attempted OR
@@ -82,52 +79,9 @@ public boolean isCatastrophic() {
  return catastrophe;
  }
 
- /**
- * Returns a new ActionExecutionException without a message prefix.
- *
- * @param action failed action
- * @return ActionExecutionException object describing the action failure
- */
- public final ActionExecutionException toActionExecutionException(Action action) {
- return toActionExecutionException(null, action);
- }
-
- /**
- * Returns a new ActionExecutionException given an optional action subtask describing which part
- * of the action failed (should be null for standard action failures). When appropriate (we use
- * some heuristics to decide), produces an abbreviated message incorporating just the termination
- * status if available.
- *
- * @param actionSubtask additional information about the action
- * @param action failed action
- * @return ActionExecutionException object describing the action failure
- */
- public final ActionExecutionException toActionExecutionException(
- @Nullable String actionSubtask, Action action) {
- // Message from ActionExecutionException will be prepended with action.describe() where
- // necessary: because not all ActionExecutionExceptions come from this codepath, it is safer
- // for consumers to manually prepend. We still put action.describe() in the failure detail
- // message argument.
- String message =
- (actionSubtask == null ? "" : actionSubtask + ": ")
- + getMessageForActionExecutionException();
- return toActionExecutionException(
- message,
- action,
- DetailedExitCode.of(getFailureDetail(action.describe() + " failed: " + message)));
- }
-
- @ForOverride
- protected ActionExecutionException toActionExecutionException(
- String message, Action action, DetailedExitCode code) {
- return new ActionExecutionException(message, this, action, isCatastrophic(), code);
- }
-
- @ForOverride
  protected String getMessageForActionExecutionException() {
  return getMessage();
  }
 
- @ForOverride
  protected abstract FailureDetail getFailureDetail(String message);
 }

src/main/java/com/google/devtools/build/lib/actions/LostInputsExecException.java

@@ -64,8 +64,7 @@ public ActionInputDepOwners getOwners() {
  return owners;
  }
 
- @Override
- protected ActionExecutionException toActionExecutionException(
+ protected ActionExecutionException fromExecException(
  String message, Action action, DetailedExitCode code) {
  return new LostInputsActionExecutionException(
  message, lostInputs, owners, action, /*cause=*/ this, code);

src/main/java/com/google/devtools/build/lib/actions/ResourceSet.java

@@ -16,8 +16,8 @@
 
 import com.google.common.base.Splitter;
 import com.google.common.primitives.Doubles;
-import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
+import com.google.devtools.build.lib.util.OS;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.common.options.Converter;
 import com.google.devtools.common.options.OptionsParsingException;
@@ -175,7 +175,7 @@ public String getTypeDescription() {
  }
 
  @Override
- public ResourceSet buildResourceSet(NestedSet<Artifact> inputs) {
+ public ResourceSet buildResourceSet(OS os, int inputsSize) throws ExecException {
  return this;
  }
 }

src/main/java/com/google/devtools/build/lib/actions/ResourceSetOrBuilder.java

@@ -14,7 +14,7 @@
 
 package com.google.devtools.build.lib.actions;
 
-import com.google.devtools.build.lib.collect.nestedset.NestedSet;
+import com.google.devtools.build.lib.util.OS;
 
 /** Common interface for ResourceSet and builder. */
 @FunctionalInterface
@@ -24,5 +24,5 @@ public interface ResourceSetOrBuilder {
  * will flatten NestedSet. This action could create a lot of garbagge, so use it as close as
  * possible to the execution phase,
  */
- public ResourceSet buildResourceSet(NestedSet<Artifact> inputs);
+ public ResourceSet buildResourceSet(OS os, int inputsSize) throws ExecException;
 }

src/main/java/com/google/devtools/build/lib/actions/Spawn.java

@@ -130,10 +130,8 @@ default boolean isMandatoryOutput(ActionInput output) {
  /** Returns the resource owner for local fallback. */
  ActionExecutionMetadata getResourceOwner();
 
- /**
- * Returns the amount of resources needed for local fallback.
- */
- ResourceSet getLocalResources();
+ /** Returns the amount of resources needed for local fallback. */
+ ResourceSet getLocalResources() throws ExecException;
 
  /**
  * Returns a mnemonic (string constant) for this kind of spawn.

src/main/java/com/google/devtools/build/lib/analysis/actions/AbstractFileWriteAction.java

@@ -89,16 +89,14 @@ public ActionContinuationOrResult execute()
  return this;
  }
  } catch (ExecException e) {
- throw e.toActionExecutionException(
- AbstractFileWriteAction.this);
+ throw ActionExecutionException.fromExecException(e, AbstractFileWriteAction.this);
  }
  afterWrite(actionExecutionContext);
  return ActionContinuationOrResult.of(ActionResult.create(nextContinuation.get()));
  }
  };
  } catch (ExecException e) {
- throw e.toActionExecutionException(
- this);
+ throw ActionExecutionException.fromExecException(e, this);
  }
  }
 

src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java

@@ -318,7 +318,7 @@ public final ActionContinuationOrResult beginExecution(
  beforeExecute(actionExecutionContext);
  spawn = getSpawn(actionExecutionContext);
  } catch (ExecException e) {
- throw e.toActionExecutionException(this);
+ throw ActionExecutionException.fromExecException(e, this);
  } catch (CommandLineExpansionException e) {
  throw createCommandLineException(e);
  }
@@ -590,8 +590,7 @@ private ActionSpawn(
  executionInfo,
  SpawnAction.this.getRunfilesSupplier(),
  SpawnAction.this,
- SpawnAction.this.resourceSetOrBuilder.buildResourceSet(inputs));
-
+ SpawnAction.this.resourceSetOrBuilder);
  NestedSetBuilder<ActionInput> inputsBuilder = NestedSetBuilder.stableOrder();
  ImmutableList<Artifact> manifests = getRunfilesSupplier().getManifests();
  for (Artifact input : inputs.toList()) {
@@ -1428,7 +1427,7 @@ public ActionContinuationOrResult execute()
  }
  return new SpawnActionContinuation(actionExecutionContext, nextContinuation);
  } catch (ExecException e) {
- throw e.toActionExecutionException(SpawnAction.this);
+ throw ActionExecutionException.fromExecException(e, SpawnAction.this);
  }
  }
  }

src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java

@@ -164,8 +164,7 @@ public ActionContinuationOrResult execute()
  return this;
  }
  } catch (ExecException e) {
- throw e.toActionExecutionException(
- TemplateExpansionAction.this);
+ throw ActionExecutionException.fromExecException(e, TemplateExpansionAction.this);
  }
  return ActionContinuationOrResult.of(ActionResult.create(nextContinuation.get()));
  }