lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Compress build logs on the fly using bzip2

Browse source
This commit is contained in:
Eelco Dolstra 2012-05-30 10:12:29 -04:00
parent 881beb170d
commit f5398d374b
2 changed files with 45 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/Makefile.am
View file

@ -10,7 +10,7 @@ pkginclude_HEADERS = \
globals.hh references.hh pathlocks.hh \ globals.hh references.hh pathlocks.hh \
worker-protocol.hh worker-protocol.hh
libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la @SQLITE3_LIBS@ libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la @SQLITE3_LIBS@ -lbz2
EXTRA_DIST = schema.sql EXTRA_DIST = schema.sql

52
src/libstore/build.cc
View file

@ -31,6 +31,8 @@
#include <pwd.h> #include <pwd.h>
#include <grp.h> #include <grp.h>
#include <bzlib.h>
/* Includes required for chroot support. */ /* Includes required for chroot support. */
#if HAVE_SYS_PARAM_H #if HAVE_SYS_PARAM_H
@ -758,7 +760,8 @@ private:
Path tmpDir; Path tmpDir;
/* File descriptor for the log file. */ /* File descriptor for the log file. */
AutoCloseFD fdLogFile; FILE * fLogFile;
BZFILE * bzLogFile;
/* Pipe for the builder's standard output/error. */ /* Pipe for the builder's standard output/error. */
Pipe builderOut; Pipe builderOut;
@ -819,6 +822,9 @@ private:
/* Open a log file and a pipe to it. */ /* Open a log file and a pipe to it. */
Path openLogFile(); Path openLogFile();
/* Close the log file. */
void closeLogFile();
/* Delete the temporary directory, if we have one. */ /* Delete the temporary directory, if we have one. */
void deleteTmpDir(bool force); void deleteTmpDir(bool force);
@ -839,6 +845,8 @@ private:
DerivationGoal::DerivationGoal(const Path & drvPath, Worker & worker) DerivationGoal::DerivationGoal(const Path & drvPath, Worker & worker)
: Goal(worker) : Goal(worker)
, fLogFile(0)
, bzLogFile(0)
, useChroot(false) , useChroot(false)
{ {
this->drvPath = drvPath; this->drvPath = drvPath;
@ -855,6 +863,7 @@ DerivationGoal::~DerivationGoal()
try { try {
killChild(); killChild();
deleteTmpDir(false); deleteTmpDir(false);
closeLogFile();
} catch (...) { } catch (...) {
ignoreException(); ignoreException();
} }
@ -1241,7 +1250,7 @@ void DerivationGoal::buildDone()
else builderOut.readSide.close(); else builderOut.readSide.close();
/* Close the log file. */ /* Close the log file. */
fdLogFile.close(); closeLogFile();
/* When running under a build user, make sure that all processes /* When running under a build user, make sure that all processes
running under that uid are gone. This is to prevent a running under that uid are gone. This is to prevent a
@ -2038,17 +2047,39 @@ Path DerivationGoal::openLogFile()
Path dir = (format("%1%/%2%") % nixLogDir % drvsLogDir).str(); Path dir = (format("%1%/%2%") % nixLogDir % drvsLogDir).str();
createDirs(dir); createDirs(dir);
Path logFileName = (format("%1%/%2%") % dir % baseNameOf(drvPath)).str(); Path logFileName = (format("%1%/%2%.bz2") % dir % baseNameOf(drvPath)).str();
fdLogFile = open(logFileName.c_str(), AutoCloseFD fd = open(logFileName.c_str(), O_CREAT | O_WRONLY | O_TRUNC, 0666);
O_CREAT | O_WRONLY | O_TRUNC, 0666); if (fd == -1)
if (fdLogFile == -1)
throw SysError(format("creating log file `%1%'") % logFileName); throw SysError(format("creating log file `%1%'") % logFileName);
closeOnExec(fdLogFile); closeOnExec(fd);
if (!(fLogFile = fdopen(fd.borrow(), "w")))
throw SysError(format("opening file `%1%'") % logFileName);
int err;
if (!(bzLogFile = BZ2_bzWriteOpen(&err, fLogFile, 9, 0, 0)))
throw Error(format("cannot open compressed log file `%1%'") % logFileName);
return logFileName; return logFileName;
} }
void DerivationGoal::closeLogFile()
{
if (bzLogFile) {
int err;
BZ2_bzWriteClose(&err, bzLogFile, 0, 0, 0);
bzLogFile = 0;
if (err != BZ_OK) throw Error(format("cannot close compressed log file (BZip2 error = %1%)") % err);
}
if (fLogFile) {
fclose(fLogFile);
fLogFile = 0;
}
}
void DerivationGoal::deleteTmpDir(bool force) void DerivationGoal::deleteTmpDir(bool force)
{ {
if (tmpDir != "") { if (tmpDir != "") {
@ -2073,8 +2104,11 @@ void DerivationGoal::handleChildOutput(int fd, const string & data)
{ {
if (verbosity >= buildVerbosity) if (verbosity >= buildVerbosity)
writeToStderr((unsigned char *) data.data(), data.size()); writeToStderr((unsigned char *) data.data(), data.size());
if (fdLogFile != -1) if (bzLogFile) {
writeFull(fdLogFile, (unsigned char *) data.data(), data.size()); int err;
BZ2_bzWrite(&err, bzLogFile, (unsigned char *) data.data(), data.size());
if (err != BZ_OK) throw Error(format("cannot write to compressed log file (BZip2 error = %1%)") % err);
}
} }
if (hook && fd == hook->fromHook.readSide) if (hook && fd == hook->fromHook.readSide)