Skip to content

Commit

Permalink
Revert "log aquiring target lock (#3177)" (#3187)
Browse files Browse the repository at this point in the history
This reverts commit 5b52e7b.
  • Loading branch information
peterebden authored Jul 1, 2024
1 parent d76609c commit 3ed2c9a
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/remote/remote.go
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ func (c *Client) Build(target *core.BuildTarget) (*core.BuildMetadata, error) {
c.setOutputsFromMetadata(target, metadata)

if c.state.ShouldDownload(target) {
c.state.LogBuildResult(target, core.TargetBuilding, "Downloading")
if err := c.Download(target); err != nil {
return metadata, err
}
Expand All @@ -359,7 +360,6 @@ func (c *Client) Build(target *core.BuildTarget) (*core.BuildMetadata, error) {

// downloadData downloads all the runtime data for a target, recursively.
func (c *Client) downloadData(target *core.BuildTarget) error {
c.state.LogBuildResult(target, core.TargetBuilding, "Downloading...")
var g errgroup.Group
for _, datum := range target.AllData() {
if l, ok := datum.Label(); ok {
Expand Down Expand Up @@ -433,7 +433,6 @@ func (c *Client) Download(target *core.BuildTarget) error {
if target.Local {
return nil // No download needed since this target was built locally
}
c.state.LogBuildResult(target, core.TargetBuilding, "Acquiring target lock...")
return c.download(target, func() error {
buildAction := c.unstampedBuildActionDigests.Get(target.Label)
file := core.AcquireExclusiveFileLock(target.BuildLockFile())
Expand Down Expand Up @@ -461,7 +460,6 @@ func (c *Client) Download(target *core.BuildTarget) error {
if ar == nil {
return fmt.Errorf("Failed to retrieve action result for %s", target)
}
c.state.LogBuildResult(target, core.TargetBuilding, "Downloading...")
return c.reallyDownload(target, buildAction, ar)
})
}
Expand Down

0 comments on commit 3ed2c9a

Please sign in to comment.