Skip to content

Commit dc7f948

Browse files
author
Ricky Stewart
committedAug 25, 2020
Bug 1660614 - Upgrade sccache to pick up more resilient behavior in the presence of cache read failures r=froydnj
This avoids a set of intermittent issues related to `zstd` decompression failures, which in the absence of these changes break the entire build. This also requires [updating an environment variable](mozilla/sccache#822), which we do in `client.mk` as well as documentation. Differential Revision: https://phabricator.services.mozilla.com/D88184
1 parent ca332b0 commit dc7f948

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed
 

‎build/docs/sccache-dist.rst

+11-4
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,12 @@ must read::
135135
* When attempting to get your client running, the output of ``sccache -s`` should
136136
be consulted to confirm compilations are being distributed. To receive helpful
137137
logging from the local daemon in case they aren't, run
138-
``SCCACHE_NO_DAEMON=1 RUST_LOG=sccache=trace path/to/sccache --start-server``
139-
in a terminal window separate from your build prior to building.
138+
``SCCACHE_NO_DAEMON=1 SCCACHE_LOG=sccache=trace path/to/sccache --start-server``
139+
in a terminal window separate from your build prior to building. *NOTE* use
140+
``RUST_LOG`` instead of ``SCCACHE_LOG`` if your build of ``sccache`` does not
141+
include `pull request 822
142+
<https://github.com/mozilla/sccache/pull/822>`_. (``sccache`` binaries from
143+
``mach bootstrap`` do include this PR.)
140144

141145
* Run ``./mach build -j<value>`` with an appropriately large ``<value>``.
142146
``sccache --dist-status`` should provide the number of cores available to you
@@ -179,9 +183,12 @@ similar.
179183

180184
Extra logging may be helpful when setting up a server. To enable logging,
181185
run your server with
182-
``sudo env RUST_LOG=sccache=trace ~/.mozbuild/sccache/sccache-dist server --config ~/.config/sccache/server.conf``
186+
``sudo env SCCACHE_LOG=sccache=trace ~/.mozbuild/sccache/sccache-dist server --config ~/.config/sccache/server.conf``
183187
(or similar). *NOTE* ``sudo`` *must* come before setting environment variables
184-
for this to work.
188+
for this to work. *NOTE* use ``RUST_LOG`` instead of ``SCCACHE_LOG`` if your
189+
build of ``sccache`` does not include `pull request 822
190+
<https://github.com/mozilla/sccache/pull/822>`_. (``sccache`` binaries from
191+
``mach bootstrap`` do include this PR.)
185192

186193
As when configuring a client, the scheduler url to use is:
187194
``https://sccache1.corpdmz.<OFFICE>.mozilla.com``, where <OFFICE> is an

‎client.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ build::
8383
# from make (but don't use the + prefix when make -n is used, so that
8484
# the command doesn't run in that case)
8585
mkdir -p $(UPLOAD_PATH)
86-
$(if $(findstring n,$(filter-out --%, $(MAKEFLAGS))),,+)env RUST_LOG=sccache=debug SCCACHE_ERROR_LOG=$(UPLOAD_PATH)/sccache.log $(MOZBUILD_MANAGE_SCCACHE_DAEMON) --start-server
86+
$(if $(findstring n,$(filter-out --%, $(MAKEFLAGS))),,+)env SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(UPLOAD_PATH)/sccache.log $(MOZBUILD_MANAGE_SCCACHE_DAEMON) --start-server
8787
endif
8888

8989
####################################

‎taskcluster/ci/fetch/toolchains.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ sccache:
352352
type: git
353353
repo: https://github.com/mozilla/sccache
354354
# 0.2.13 release + various changes
355-
revision: d172e77c1bfd08714e71fe80f80cc149eeae1749
355+
revision: 030c80a15e0b1aba0e61df264b320a21bb21fb15
356356

357357
fxc2:
358358
description: fxc2 source code

0 commit comments

Comments
 (0)
Failed to load comments.