about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2006-02-16T13·19+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2006-02-16T13·19+0000
commit651ab439cf5b0c6ab2044257a30b0d94406d57d3 (patch)
treefafb731298c3bdf6f7b81a804864ab9e31e37d67
parentd6f586d0eaa9344a99248cc4dfb7825972f2a174 (diff)
* A simple hack to fix NIX-18: the garbage collector cannot run when
  the disk is full (because to delete something from the Nix store, we
  need a Berkeley DB transaction, which takes up disk space).  Under
  normal operation, we make sure that there exists a file
  /nix/var/nix/db/reserved of 1 MB.  When running the garbage
  collector, we delete that file before we open the Berkeley DB
  environment.

-rw-r--r--src/libstore/store.cc16
-rw-r--r--src/libstore/store.hh10
-rw-r--r--src/nix-store/main.cc2
3 files changed, 24 insertions, 4 deletions
diff --git a/src/libstore/store.cc b/src/libstore/store.cc
index 9c68c3392b4f..25e2d6e36009 100644
--- a/src/libstore/store.cc
+++ b/src/libstore/store.cc
@@ -76,11 +76,25 @@ static void upgradeStore07();
 static void upgradeStore09();
 
 
-void openDB()
+void openDB(bool reserveSpace)
 {
     if (readOnlyMode) return;
 
     try {
+        Path reservedPath = nixDBPath + "/reserved";
+        off_t reservedSize = 1024 * 1024;
+        if (reserveSpace) {
+            struct stat st;
+            if (stat(reservedPath.c_str(), &st) == -1 ||
+                st.st_size != reservedSize)
+                writeFile(reservedPath, string(1024 * 1024, 'X'));
+        }
+        else
+            deletePath(reservedPath);
+    } catch (SysError & e) { /* don't care about errors */
+    }
+
+    try {
         nixDB.open(nixDBPath);
     } catch (DbNoPermission & e) {
         printMsg(lvlTalkative, "cannot access Nix database; continuing anyway");
diff --git a/src/libstore/store.hh b/src/libstore/store.hh
index 2d8018d5fabc..c617585bab96 100644
--- a/src/libstore/store.hh
+++ b/src/libstore/store.hh
@@ -37,8 +37,14 @@ struct Substitute
 typedef list<Substitute> Substitutes;
 
 
-/* Open the database environment. */
-void openDB();
+/* Open the database environment.  If `reserveSpace' is true, make
+   sure that a big empty file exists in /nix/var/nix/db/reserved.  If
+   `reserveSpace' is false, delete this file if it exists.  The idea
+   is that on normal operation, the file exists; but when we run the
+   garbage collector, it is deleted.  This is to ensure that the
+   garbage collector has a small amount of disk space available, which
+   is required to open the Berkeley DB environment. */
+void openDB(bool reserveSpace = true);
 
 /* Create the required database tables. */
 void initDB();
diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc
index 88e6720c020a..0ee7b0a7e955 100644
--- a/src/nix-store/main.cc
+++ b/src/nix-store/main.cc
@@ -686,7 +686,7 @@ void run(Strings args)
     if (!op) throw UsageError("no operation specified");
 
     if (op != opDump && op != opRestore) /* !!! hack */
-        openDB();
+        openDB(op != opGC);
 
     op(opFlags, opArgs);
 }