зеркало из https://github.com/microsoft/BuildXL.git
Merged PR 776939: Revert "Merged PR 776427: Enable sandbox logging if logobservedfileaccesses i...
Revert "Merged PR 776427: Enable sandbox logging if logobservedfileaccesses is enabled - Easier to debug than using piproperties when you don't know which pip to dump" Reverted commit `32704f3b`. Reverting this because it is a suspected cause of PR reliability issues
This commit is contained in:
Родитель
f5066a97b1
Коммит
72b929376d
|
@ -1981,9 +1981,7 @@ namespace BuildXL.Scheduler
|
||||||
IReadOnlyDictionary<AbsolutePath, IReadOnlyCollection<FileArtifactWithAttributes>> staleDynamicOutputs = null;
|
IReadOnlyDictionary<AbsolutePath, IReadOnlyCollection<FileArtifactWithAttributes>> staleDynamicOutputs = null;
|
||||||
|
|
||||||
// A collection of formatted semistable hashes for pips which will have verbose sandbox logging enabled.
|
// A collection of formatted semistable hashes for pips which will have verbose sandbox logging enabled.
|
||||||
var isVerboseLoggingEnabled =
|
var isVerboseLoggingEnabled = environment.PipSpecificPropertiesConfig?.PipHasProperty(PipSpecificPropertiesConfig.PipSpecificProperty.EnableVerboseProcessLogging, pip.SemiStableHash) == true;
|
||||||
environment.PipSpecificPropertiesConfig?.PipHasProperty(PipSpecificPropertiesConfig.PipSpecificProperty.EnableVerboseProcessLogging, pip.SemiStableHash) == true
|
|
||||||
|| configuration.Sandbox.LogObservedFileAccesses;
|
|
||||||
|
|
||||||
// Retry pip count up to limit if we produce result without detecting file access.
|
// Retry pip count up to limit if we produce result without detecting file access.
|
||||||
// There are very rare cases where a child process is started not Detoured and we don't observe any file accesses from such process.
|
// There are very rare cases where a child process is started not Detoured and we don't observe any file accesses from such process.
|
||||||
|
@ -1991,6 +1989,18 @@ namespace BuildXL.Scheduler
|
||||||
{
|
{
|
||||||
lastObservedMemoryCounters = default(ProcessMemoryCountersSnapshot);
|
lastObservedMemoryCounters = default(ProcessMemoryCountersSnapshot);
|
||||||
|
|
||||||
|
var verboseLogging = false;
|
||||||
|
|
||||||
|
if (isVerboseLoggingEnabled)
|
||||||
|
{
|
||||||
|
verboseLogging = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (userRetry && EngineEnvironmentSettings.VerboseModeForPipsOnRetry)
|
||||||
|
{
|
||||||
|
verboseLogging = true;
|
||||||
|
}
|
||||||
|
|
||||||
var executor = new SandboxedProcessPipExecutor(
|
var executor = new SandboxedProcessPipExecutor(
|
||||||
context,
|
context,
|
||||||
operationContext.LoggingContext,
|
operationContext.LoggingContext,
|
||||||
|
@ -2021,7 +2031,7 @@ namespace BuildXL.Scheduler
|
||||||
pipGraphFileSystemView: environment.PipGraphView,
|
pipGraphFileSystemView: environment.PipGraphView,
|
||||||
runLocation: runLocation,
|
runLocation: runLocation,
|
||||||
sandboxFileSystemView: environment.State.FileSystemView,
|
sandboxFileSystemView: environment.State.FileSystemView,
|
||||||
verboseProcessLogging: isVerboseLoggingEnabled || (userRetry && EngineEnvironmentSettings.VerboseModeForPipsOnRetry));
|
verboseProcessLogging: verboseLogging);
|
||||||
|
|
||||||
resourceScope.RegisterQueryRamUsageMb(
|
resourceScope.RegisterQueryRamUsageMb(
|
||||||
() =>
|
() =>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче