Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

when writing to local disk cache, open files later in order to avoid "too many open files" #13574

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import com.google.devtools.build.lib.remote.RemoteCache.ActionResultMetadata.DirectoryMetadata;
import com.google.devtools.build.lib.remote.RemoteCache.ActionResultMetadata.FileMetadata;
import com.google.devtools.build.lib.remote.RemoteCache.ActionResultMetadata.SymlinkMetadata;
import com.google.devtools.build.lib.remote.common.LazyFileOutputStream;
import com.google.devtools.build.lib.remote.common.OutputDigestMismatchException;
import com.google.devtools.build.lib.remote.common.RemoteActionExecutionContext;
import com.google.devtools.build.lib.remote.common.RemoteActionFileArtifactValue;
Expand Down Expand Up @@ -1099,57 +1100,6 @@ private static FailureDetail createFailureDetail(String message, Code detailedCo
.build();
}

/**
* Creates an {@link OutputStream} that isn't actually opened until the first data is written.
* This is useful to only have as many open file descriptors as necessary at a time to avoid
* running into system limits.
*/
private static class LazyFileOutputStream extends OutputStream {

private final Path path;
private OutputStream out;

public LazyFileOutputStream(Path path) {
this.path = path;
}

@Override
public void write(byte[] b) throws IOException {
ensureOpen();
out.write(b);
}

@Override
public void write(byte[] b, int off, int len) throws IOException {
ensureOpen();
out.write(b, off, len);
}

@Override
public void write(int b) throws IOException {
ensureOpen();
out.write(b);
}

@Override
public void flush() throws IOException {
ensureOpen();
out.flush();
}

@Override
public void close() throws IOException {
ensureOpen();
out.close();
}

private void ensureOpen() throws IOException {
if (out == null) {
out = path.getOutputStream();
}
}
}

/** In-memory representation of action result metadata. */
static class ActionResultMetadata {

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// Copyright 2017 The Bazel Authors. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.devtools.build.lib.remote.common;

import com.google.devtools.build.lib.vfs.Path;
import java.io.IOException;
import java.io.OutputStream;

/**
* Creates an {@link OutputStream} that isn't actually opened until the first data is written.
* This is useful to only have as many open file descriptors as necessary at a time to avoid
* running into system limits.
*/
public class LazyFileOutputStream extends OutputStream {

private final Path path;
private OutputStream out;

public LazyFileOutputStream(Path path) {
this.path = path;
}

@Override
public void write(byte[] b) throws IOException {
ensureOpen();
out.write(b);
}

@Override
public void write(byte[] b, int off, int len) throws IOException {
ensureOpen();
out.write(b, off, len);
}

@Override
public void write(int b) throws IOException {
ensureOpen();
out.write(b);
}

@Override
public void flush() throws IOException {
ensureOpen();
out.flush();
}

@Override
public void close() throws IOException {
ensureOpen();
out.close();
}

private void ensureOpen() throws IOException {
if (out == null) {
out = path.getOutputStream();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.devtools.build.lib.remote.common.LazyFileOutputStream;
import com.google.devtools.build.lib.remote.common.RemoteActionExecutionContext;
import com.google.devtools.build.lib.remote.common.RemoteCacheClient;
import com.google.devtools.build.lib.remote.options.RemoteOptions;
Expand Down Expand Up @@ -142,11 +143,7 @@ public ListenableFuture<Void> downloadBlob(

Path tempPath = newTempPath();
final OutputStream tempOut;
try {
tempOut = tempPath.getOutputStream();
} catch (IOException e) {
return Futures.immediateFailedFuture(e);
}
tempOut = new LazyFileOutputStream(tempPath);

if (!options.incompatibleRemoteResultsIgnoreDisk || options.remoteAcceptCached) {
ListenableFuture<Void> download =
Expand Down