Skip to content

Commit 219ef5d

Browse files
glukasiknurocopybara-github
authored andcommitted
Docs: Remove references to --local_resources
`--local_resources` option was removed in 7e8f86d but still is referenced in some docs, what may cause some confusion. Esp. this documentation is confusing for e.g. `--local_ram_resources`: `Note: This is a no-op if --local_resources is set.` Closes #15021. PiperOrigin-RevId: 444808696
1 parent efc9c9c commit 219ef5d

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,7 @@ public boolean shouldMaterializeParamFiles() {
305305
+ " actions executed locally. Takes an integer, or \"HOST_CPUS\", optionally followed"
306306
+ " by [-|*]<float> (eg. HOST_CPUS*.5 to use half the available CPU cores).By"
307307
+ " default, (\"HOST_CPUS\"), Bazel will query system configuration to estimate"
308-
+ " the number of CPU cores available. Note: This is a no-op if --local_resources is"
309-
+ " set.",
308+
+ " the number of CPU cores available.",
310309
converter = CpuResourceConverter.class)
311310
public float localCpuResources;
312311

@@ -320,8 +319,7 @@ public boolean shouldMaterializeParamFiles() {
320319
+ " build actions executed locally. Takes an integer, or \"HOST_RAM\", optionally"
321320
+ " followed by [-|*]<float> (eg. HOST_RAM*.5 to use half the available RAM). By"
322321
+ " default, (\"HOST_RAM*.67\"), Bazel will query system configuration to estimate"
323-
+ " the amount of RAM available and will use 67% of it. Note: This is a no-op if"
324-
+ " --local_resources is set.",
322+
+ " the amount of RAM available and will use 67% of it.",
325323
converter = RamResourceConverter.class)
326324
public float localRamResources;
327325

src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/RemoteWorkerOptions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public int checkAndLimit(int value) throws OptionsParsingException {
199199
if (value > maxValue) {
200200
logger.atWarning().log(
201201
"Flag remoteWorker \"jobs\" ('%d') was set too high. "
202-
+ "This is a result of passing large values to --local_resources or --jobs. "
202+
+ "This is a result of passing large values to --jobs. "
203203
+ "Using '%d' jobs",
204204
value, maxValue);
205205
value = maxValue;

0 commit comments

Comments
 (0)