Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[7.1.0] Fix a hanging issue with skymeld & --combined_report=lcov. #21271

Merged
merged 1 commit into from
Feb 12, 2024
Merged

[7.1.0] Fix a hanging issue with skymeld & --combined_report=lcov. #21271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 41 additions & 34 deletions src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ public SkyframeAnalysisResult analyzeAndExecuteTargets(
BuildFailedException,
TestExecException {
Stopwatch analysisWorkTimer = Stopwatch.createStarted();
EvaluationResult<SkyValue> evaluationResult;
EvaluationResult<SkyValue> mainEvaluationResult;

var newKeys =
ImmutableSet.<ActionLookupKey>builderWithExpectedSize(
Expand Down Expand Up @@ -663,7 +663,7 @@ public SkyframeAnalysisResult analyzeAndExecuteTargets(
Profiler.instance().profile("skyframeExecutor.evaluateBuildDriverKeys")) {
// Will be disabled later by the AnalysisOperationWatcher upon conclusion of analysis.
enableAnalysis(true);
evaluationResult =
mainEvaluationResult =
skyframeExecutor.evaluateBuildDriverKeys(
eventHandler,
buildDriverCTKeys,
Expand All @@ -689,8 +689,10 @@ public SkyframeAnalysisResult analyzeAndExecuteTargets(
}

// The exclusive tests whose analysis succeeded i.e. those that can be run.
ImmutableSet<ConfiguredTarget> exclusiveTestsToRun = getExclusiveTests(evaluationResult);
boolean continueWithExclusiveTests = !evaluationResult.hasError() || keepGoing;
ImmutableSet<ConfiguredTarget> exclusiveTestsToRun =
getExclusiveTests(mainEvaluationResult);
boolean continueWithExclusiveTests = !mainEvaluationResult.hasError() || keepGoing;
boolean hasExclusiveTestsError = false;

if (continueWithExclusiveTests && !exclusiveTestsToRun.isEmpty()) {
skyframeExecutor.getIsBuildingExclusiveArtifacts().set(true);
Expand All @@ -707,6 +709,7 @@ public SkyframeAnalysisResult analyzeAndExecuteTargets(
keepGoing,
executors.executionParallelism());
if (testRunResult.hasError()) {
hasExclusiveTestsError = true;
detailedExitCodes.add(
SkyframeErrorProcessor.processErrors(
testRunResult,
Expand All @@ -721,29 +724,33 @@ public SkyframeAnalysisResult analyzeAndExecuteTargets(
}
}
}

// Coverage report generation should only be requested after all tests have executed.
// We could generate baseline coverage artifacts earlier; it is only the timing of the
// combined report that matters.
ImmutableSet<Artifact> coverageArtifacts =
coverageReportActionsWrapperSupplier.getCoverageArtifacts(
buildResultListener.getAnalyzedTargets(), buildResultListener.getAnalyzedTests());
eventBus.post(CoverageArtifactsKnownEvent.create(coverageArtifacts));
additionalArtifactsResult =
skyframeExecutor.evaluateSkyKeys(
eventHandler, Artifact.keys(coverageArtifacts), keepGoing);
eventBus.post(new CoverageActionFinishedEvent());
if (additionalArtifactsResult.hasError()) {
detailedExitCodes.add(
SkyframeErrorProcessor.processErrors(
additionalArtifactsResult,
skyframeExecutor.getCyclesReporter(),
eventHandler,
keepGoing,
skyframeExecutor.tracksStateForIncrementality(),
eventBus,
bugReporter,
/* includeExecutionPhase= */ true)
.executionDetailedExitCode());
// When --nokeep_going and there's an earlier error, we should skip this and fail fast.
if ((!mainEvaluationResult.hasError() && !hasExclusiveTestsError) || keepGoing) {
ImmutableSet<Artifact> coverageArtifacts =
coverageReportActionsWrapperSupplier.getCoverageArtifacts(
buildResultListener.getAnalyzedTargets(), buildResultListener.getAnalyzedTests());
eventBus.post(CoverageArtifactsKnownEvent.create(coverageArtifacts));
additionalArtifactsResult =
skyframeExecutor.evaluateSkyKeys(
eventHandler, Artifact.keys(coverageArtifacts), keepGoing);
eventBus.post(new CoverageActionFinishedEvent());
if (additionalArtifactsResult.hasError()) {
detailedExitCodes.add(
SkyframeErrorProcessor.processErrors(
additionalArtifactsResult,
skyframeExecutor.getCyclesReporter(),
eventHandler,
keepGoing,
skyframeExecutor.tracksStateForIncrementality(),
eventBus,
bugReporter,
/* includeExecutionPhase= */ true)
.executionDetailedExitCode());
}
}
} finally {
// No more action execution beyond this point.
Expand All @@ -752,35 +759,35 @@ public SkyframeAnalysisResult analyzeAndExecuteTargets(
resourceManager.resetResourceUsage();
}

if (!evaluationResult.hasError() && detailedExitCodes.isEmpty()) {
if (!mainEvaluationResult.hasError() && detailedExitCodes.isEmpty()) {
ImmutableMap<AspectKey, ConfiguredAspect> successfulAspects =
getSuccessfulAspectMap(
topLevelAspectsKeys.size(),
evaluationResult,
mainEvaluationResult,
buildDriverAspectKeys,
/*topLevelActionConflictReport=*/ null);
/* topLevelActionConflictReport= */ null);
var targetsWithConfiguration =
ImmutableList.<TargetAndConfiguration>builderWithExpectedSize(ctKeys.size());
ImmutableSet<ConfiguredTarget> successfulConfiguredTargets =
getSuccessfulConfiguredTargets(
ctKeys.size(),
evaluationResult,
mainEvaluationResult,
buildDriverCTKeys,
labelTargetMap,
targetsWithConfiguration,
/* topLevelActionConflictReport= */ null);

return SkyframeAnalysisAndExecutionResult.success(
successfulConfiguredTargets,
evaluationResult.getWalkableGraph(),
mainEvaluationResult.getWalkableGraph(),
successfulAspects,
targetsWithConfiguration.build(),
/* packageRoots= */ null);
}

ErrorProcessingResult errorProcessingResult =
SkyframeErrorProcessor.processErrors(
evaluationResult,
mainEvaluationResult,
skyframeExecutor.getCyclesReporter(),
eventHandler,
keepGoing,
Expand All @@ -795,7 +802,7 @@ public SkyframeAnalysisResult analyzeAndExecuteTargets(
foundActionConflictInLatestCheck
? handleActionConflicts(
eventHandler,
evaluationResult.getWalkableGraph(),
mainEvaluationResult.getWalkableGraph(),
ctKeys,
topLevelAspectsKeys,
topLevelArtifactContext,
Expand All @@ -807,15 +814,15 @@ public SkyframeAnalysisResult analyzeAndExecuteTargets(
ImmutableMap<AspectKey, ConfiguredAspect> successfulAspects =
getSuccessfulAspectMap(
topLevelAspectsKeys.size(),
evaluationResult,
mainEvaluationResult,
buildDriverAspectKeys,
topLevelActionConflictReport);
var targetsWithConfiguration =
ImmutableList.<TargetAndConfiguration>builderWithExpectedSize(ctKeys.size());
ImmutableSet<ConfiguredTarget> successfulConfiguredTargets =
getSuccessfulConfiguredTargets(
ctKeys.size(),
evaluationResult,
mainEvaluationResult,
buildDriverCTKeys,
labelTargetMap,
targetsWithConfiguration,
Expand All @@ -826,7 +833,7 @@ public SkyframeAnalysisResult analyzeAndExecuteTargets(
/* hasAnalysisError= */ errorProcessingResult.hasAnalysisError(),
/* hasActionConflicts= */ foundActionConflictInLatestCheck,
successfulConfiguredTargets,
evaluationResult.getWalkableGraph(),
mainEvaluationResult.getWalkableGraph(),
successfulAspects,
targetsWithConfiguration.build(),
/* packageRoots= */ null,
Expand Down
Loading