Skip to content

Commit dca1403

Browse files
committed
Merged PR 742074: Remove unused experimental Windows container related code
Related work items: #2108981
1 parent 6b98a79 commit dca1403

File tree

76 files changed

+218
-3487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+218
-3487
lines changed

Documentation/Wiki/Flags.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ This page lists flags that can be used to configure BuildXL.
201201
| ReuseEngineState | Reuse engine state between client sessions if /server and /cacheGraph are enabled. Defaults to on. |
202202
| ReuseOutputsOnDisk | Reuse outputs on disk for checking up-to-dateness during cache look-up and for file materialization |
203203
| RootMap | Specifies a drive mapping applied during this build. Paths under specified letters will be mapped to the corresponding paths at the system level for the build process and the tools launched as a part of the build. (short form: /rm) |
204-
| RunInContainerAndAllowDoubleWrites | Configures the default for all scheduled pips to run in a container with output isolation, allowing double writes to occur. Individual pips can override this setting. This is an unsafe option. |
205204
| RunInSubst | Improves path stability across potentially heterogeneous machines by internally mapping a source path (typically the source of the repo to build) into a drive letter. If the source path is not explicitly provided with /substSource, the location of the main config file is used. Only effective on Windows, in other platforms the option is ignored. Useful for dev cache. |
206205
| SandboxKind | Specifies the sandbox kind. Allowed values are 'None' (no sandboxing), 'Default' (default sandboxing), 'WinDetours', 'MacOsKext'. Default is 'Default'. |
207206
| ScanChangeJournal | Scans volume change journals to determine spec file changes for graph reuse check. Defaults to on. |

Public/Src/App/Bxl/Args.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2181,11 +2181,6 @@ private void HandleExperimentalOption(
21812181
case "CREATEHANDLEWITHSEQUENTIALSCANONHASHINGOUTPUTFILES":
21822182
scheduleConfiguration.CreateHandleWithSequentialScanOnHashingOutputFiles = experimentalOptionAndValue.Item2;
21832183
break;
2184-
case "RUNINCONTAINERANDALLOWDOUBLEWRITES":
2185-
sandboxConfiguration.ContainerConfiguration.RunInContainer = experimentalOptionAndValue.Item2;
2186-
sandboxConfiguration.ContainerConfiguration.ContainerIsolationLevel = ContainerIsolationLevel.IsolateAllOutputs;
2187-
sandboxConfiguration.UnsafeSandboxConfigurationMutable.DoubleWritePolicy = RewritePolicy.UnsafeFirstDoubleWriteWins;
2188-
break;
21892184
case "LAZYSODELETION":
21902185
scheduleConfiguration.UnsafeLazySODeletion = experimentalOptionAndValue.Item2;
21912186
break;

Public/Src/App/Bxl/HelpText.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,6 @@ private static IEnumerable<string> GetExperimentalFlagOptions()
13951395
"UseGraphPatching",
13961396
"ConstructAndSaveBindingFingerprint",
13971397
"UseSpecPublicFacadeAndAstWhenAvailable",
1398-
"RunInContainerAndAllowDoubleWrites"
13991398
};
14001399
}
14011400
}

Public/Src/App/Bxl/Strings.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,9 +1000,6 @@ Example: ad2d42d2ec5d2ca0c0b7ad65402d07c7ef40b91e</value>
10001000
<data name="Args_ProfileRedirectEnabled_NoPathProvided" xml:space="preserve">
10011001
<value>User profile redirect was enabled (/enableProfileRedirect+) but the path to the redirected user profile was not set. Please use /RedirectedUserProfileJunctionRoot:&lt;path&gt; to set the path under which a junction to the real user profile will be created.</value>
10021002
</data>
1003-
<data name="HelpText_DisplayHelp_RunInContainerAndAllowDoubleWrites" xml:space="preserve">
1004-
<value>Configures the default for all scheduled pips to run in a container with output isolation, allowing double writes to occur. Individual pips can override this setting. This is an unsafe option.</value>
1005-
</data>
10061003
<data name="HelpText_DisplayHelp_AdminRequiredProcessExecutionMode" xml:space="preserve">
10071004
<value>Mode for running processes that required admin privilege. Allowed values are 'Internal' (BuildXL starts the process as an immediate child process), 'ExternalTool' (BuildXL starts a sandboxed process executor tool as a child process, and in turn the tool starts the admin-required process as its child process), 'ExternalVM' (BuildXL sends command to VM to execute a sandboxed process executor tool in VM, and in turn the tool starts the admin-required process as its child process) . For Internal and ExternalTool, the process will be run with the same elevation level as BuildXL. For ExternalVM, the process will be run with the elevation level in the VM. Defaults to 'Internal'.</value>
10081005
</data>

Public/Src/Cache/ContentStore/DistributedTest/StorageDeploymentIngesterTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
using BuildXL.Cache.Host.Service;
3232
using BuildXL.Cache.Host.Service.Deployment;
3333
using BuildXL.Launcher.Server;
34-
using BuildXL.Processes.Containers;
3534
using BuildXL.Utilities;
3635
using BuildXL.Utilities.Collections;
3736
using ContentStoreTest.Distributed.Redis;

Public/Src/Demos/BlockAccesses/BlockingEnumerator.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
using System.IO;
77
using System.Threading.Tasks;
88
using BuildXL.Processes;
9-
using BuildXL.Processes.Containers;
10-
using BuildXL.ProcessPipExecutor;
119
using BuildXL.Utilities.Core;
1210
using BuildXL.Utilities.Instrumentation.Common;
1311

@@ -55,7 +53,6 @@ public Task<SandboxedProcessResult> EnumerateWithBlockedDirectories(AbsolutePath
5553
pathToProcess,
5654
CreateManifest(AbsolutePath.Create(m_pathTable, pathToProcess), directoriesToBlock),
5755
disableConHostSharing: false,
58-
containerConfiguration: ContainerConfiguration.DisabledIsolation,
5956
loggingContext: m_loggingContext)
6057
{
6158
Arguments = arguments,

Public/Src/Demos/ReportAccesses/FileAccessReporter.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
using System.IO;
66
using System.Threading.Tasks;
77
using BuildXL.Processes;
8-
using BuildXL.Processes.Containers;
9-
using BuildXL.ProcessPipExecutor;
108
using BuildXL.Utilities.Core;
119
using BuildXL.Utilities.Instrumentation.Common;
1210

@@ -40,7 +38,6 @@ public Task<SandboxedProcessResult> RunProcessUnderSandbox(string pathToProcess,
4038
pathToProcess,
4139
CreateManifestToAllowAllAccesses(PathTable),
4240
disableConHostSharing: false,
43-
containerConfiguration: ContainerConfiguration.DisabledIsolation,
4441
loggingContext: m_loggingContext)
4542
{
4643
Arguments = arguments,

Public/Src/Demos/ReportProcesses/ProcessReporter.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
using System.Collections.Generic;
55
using System.IO;
66
using BuildXL.Processes;
7-
using BuildXL.Processes.Containers;
8-
using BuildXL.ProcessPipExecutor;
97
using BuildXL.Utilities.Core;
108
using BuildXL.Utilities.Instrumentation.Common;
119

@@ -51,7 +49,6 @@ private SandboxedProcessResult RunProcessUnderSandbox(string pathToProcess, stri
5149
pathToProcess,
5250
CreateManifestToLogProcessData(m_pathTable),
5351
disableConHostSharing: false,
54-
containerConfiguration: ContainerConfiguration.DisabledIsolation,
5552
loggingContext: m_loggingContext)
5653
{
5754
Arguments = arguments,

0 commit comments

Comments
 (0)