diff options
| author |  Ming Zhao <mzhao@luminatewireless.com> | 2016-04-15 07:28:21 +0000 |
|---|---|---|
| committer |  Lukacs Berki <lberki@google.com> | 2016-04-15 07:37:34 +0000 |
| commit | 0ea57e6983238cbc84ab62f8197912ccab215c93 (patch) | |
| tree | df1a9d7a88871fb48a32a11228b53f53a90be51c /src/main/java/com/google/devtools | |
| parent | b90498f7271113067d4c98404754f01e8b62431b (diff) | |
Get the current time when generating the workspace status.
The old implementation cached the timestamp when the workspace status
action is created, which may be much earlier then the action gets
executed and end up leaving stale timestamp in volatile-status.
Close #1103
--
Change-Id: I0f09ac66681a134aeb10daf2455f3c3f98d8cd8f
Reviewed-on: https://bazel-review.googlesource.com/#/c/3221/
MOS_MIGRATED_REVID=119930493
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java index 51b582cc50..dece6e0cf0 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelWorkspaceStatusModule.java @@ -71,7 +71,6 @@ public class BazelWorkspaceStatusModule extends BlazeModule { private final Options options; private final String username; private final String hostname; - private final long timestamp; private final com.google.devtools.build.lib.shell.Command getWorkspaceStatusCommand; private BazelWorkspaceStatusAction( @@ -89,7 +88,6 @@ public class BazelWorkspaceStatusModule extends BlazeModule { this.volatileStatus = volatileStatus; this.username = USER_NAME.value(); this.hostname = NetUtil.findShortHostName(); - this.timestamp = System.currentTimeMillis(); this.getWorkspaceStatusCommand = options.workspaceStatusCommand.equals(PathFragment.EMPTY_FRAGMENT) ? null @@ -139,6 +137,7 @@ public class BazelWorkspaceStatusModule extends BlazeModule { BuildInfo.BUILD_HOST + " " + hostname, BuildInfo.BUILD_USER + " " + username); FileSystemUtils.writeContent(stableStatus.getPath(), info.getBytes(StandardCharsets.UTF_8)); + long timestamp = System.currentTimeMillis(); String volatileInfo = joiner.join( BuildInfo.BUILD_TIMESTAMP + " " + timestamp, |