Skip to content

Upload memory optimization #780

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.

Sign up for GitHub

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

Merged
ekharkunov merged 2 commits into from
Aug 27, 2025
Merged

Upload memory optimization #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f552a30
Remove debug logs
ekharkunov Aug 26, 2025
dde11e3
Fix memory consumption in case of remote building
ekharkunov Aug 27, 2025
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
6 changes: 5 additions & 1 deletion server/src/main/java/com/defold/extender/ExtenderUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,8 +919,12 @@ public static String calculateSHA256(InputStream input) throws NoSuchAlgorithmEx
return hexString.toString();
}

public static String generateRandomFileName() {
return RandomStringUtils.insecure().nextAlphanumeric(30);
}

public static File writeSourceFilesListToTmpFile(File targetDir, Set<String> fileList) throws IOException {
File resultFile = new File(targetDir, String.format("%s.sourcelist", RandomStringUtils.insecure().nextAlphanumeric(30)));
File resultFile = new File(targetDir, String.format("%s.sourcelist", generateRandomFileName()));
Set<String> escapedList = new HashSet<>();
fileList.forEach((elem) -> {
escapedList.add(StringEscapeUtils.escapeXSI(elem));
Expand Down
56 changes: 37 additions & 19 deletions server/src/main/java/com/defold/extender/remote/RemoteEngineBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.defold.extender.BuilderConstants;
import com.defold.extender.ExtenderConst;
import com.defold.extender.ExtenderException;
import com.defold.extender.ExtenderUtil;
import com.defold.extender.metrics.MetricsWriter;
import com.defold.extender.services.DataCacheService;
import com.defold.extender.services.GCPInstanceService;
Expand All @@ -22,8 +23,10 @@
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.entity.mime.content.ByteArrayBody;
import org.apache.http.entity.mime.content.FileBody;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
Expand All @@ -40,6 +43,7 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
Expand Down Expand Up @@ -94,9 +98,15 @@ public void buildAsync(final RemoteInstanceConfig remoteInstanceConfig,
Timer buildTimer = new Timer();
buildTimer.start();

File tmpDirectory = new File(jobDirectory, "tmp");
tmpDirectory.mkdir();

File tmpUploadArchive = new File(tmpDirectory, String.format("__remote_upload_%s.zip", ExtenderUtil.generateRandomFileName()));
tmpUploadArchive.createNewFile();
try {
httpEntity = buildHttpEntity(projectDirectory);
httpEntity = buildHttpEntity(projectDirectory, tmpUploadArchive);
} catch(IllegalStateException | IOException | ExtenderException e) {
tmpUploadArchive.delete();
throw new RemoteBuildException("Failed to add files to multipart request", e);
}

Expand Down Expand Up @@ -167,6 +177,7 @@ public void buildAsync(final RemoteInstanceConfig remoteInstanceConfig,
e.printStackTrace(writer);
writer.close();
} finally {
tmpUploadArchive.delete();
metricsWriter.measureRemoteEngineBuild(buildTimer.start(), platform);
// Delete temporary upload directory
if (!keepJobDirectory) {
Expand All @@ -181,33 +192,40 @@ public void buildAsync(final RemoteInstanceConfig remoteInstanceConfig,
}
}

HttpEntity buildHttpEntity(final File projectDirectory) throws IOException, ExtenderException {
HttpEntity buildHttpEntity(final File projectDirectory, File tmpUploadArchive) throws IOException, ExtenderException {
MultipartEntityBuilder entityBuilder = MultipartEntityBuilder.create();
entityBuilder.setStrictMode();

ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
try (ZipOutputStream zipStream = new ZipOutputStream(byteStream)) {
try (OutputStream fileOut = Files.newOutputStream(tmpUploadArchive.toPath()); ZipOutputStream zipStream = new ZipOutputStream(fileOut)) {
Path projectDirectoryPath = projectDirectory.toPath();
Files.walk(projectDirectoryPath)
.filter(Files::isRegularFile)
.filter(path -> { return !path.getFileName().toString().equals(ExtenderConst.SOURCE_CODE_ARCHIVE_MAGIC_NAME); })
.filter(path -> { return !path.getFileName().toString().equals(DataCacheService.FILE_CACHE_INFO_FILE); })
.forEach(res -> {
Path path = projectDirectoryPath.relativize(res);
LOGGER.warn(path.toString());
try {
ZipEntry entry = new ZipEntry(path.toString());
zipStream.putNextEntry(entry);
zipStream.write(Files.readAllBytes(res));
zipStream.closeEntry();
} catch (IOException e) {
LOGGER.warn("Exception during add entry to source code archive", e);
}
.filter(Files::isRegularFile)
.filter(path -> !path.getFileName().toString().equals(ExtenderConst.SOURCE_CODE_ARCHIVE_MAGIC_NAME))
.filter(path -> !path.getFileName().toString().equals(DataCacheService.FILE_CACHE_INFO_FILE))
.forEach(res -> {
Path relativePath = projectDirectoryPath.relativize(res);
try (InputStream in = Files.newInputStream(res)) {
ZipEntry entry = new ZipEntry(relativePath.toString());
zipStream.putNextEntry(entry);
byte[] buffer = new byte[8192]; // stream in chunks
int len;
while ((len = in.read(buffer)) != -1) {
zipStream.write(buffer, 0, len);
}
zipStream.closeEntry();
} catch (IOException e) {
LOGGER.warn("Exception during add entry to source code archive", e);
}
});
} catch (IOException exc) {
throw new ExtenderException(exc, "Failed to create source code archive");
}
entityBuilder.addPart(ExtenderConst.SOURCE_CODE_ARCHIVE_MAGIC_NAME, new ByteArrayBody(byteStream.toByteArray(), ExtenderConst.SOURCE_CODE_ARCHIVE_MAGIC_NAME));

entityBuilder.addPart(
ExtenderConst.SOURCE_CODE_ARCHIVE_MAGIC_NAME,
new FileBody(tmpUploadArchive, ContentType.DEFAULT_BINARY, ExtenderConst.SOURCE_CODE_ARCHIVE_MAGIC_NAME)
);

return entityBuilder.build();
}

Expand Down