nix daemon: Don't open the store

edolstra · edolstra · commit 9590167290ff · 2025-03-28T19:29:50.000+01:00
This makes it behave the same as nix-daemon. Opening the store in the parent can cause a SIGBUS in libsqlite in the child: #0 0x00007f141cf6f789 in __memset_avx2_unaligned_erms () from /nix/store/wn7v2vhyyyi6clcyn0s9ixvl7d4d87ic-glibc-2.40-36/lib/libc.so.6 #1 0x00007f141c322fe8 in walIndexAppend () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0 #2 0x00007f141c3711a2 in pagerWalFrames () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0 #3 0x00007f141c38317e in sqlite3PagerCommitPhaseOne.part.0 () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0 #4 0x00007f141c383555 in sqlite3BtreeCommitPhaseOne.part.0 () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0 #5 0x00007f141c384797 in sqlite3VdbeHalt () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0 #6 0x00007f141c3b8f60 in sqlite3VdbeExec () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0 #7 0x00007f141c3bbfef in sqlite3_step () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0 #8 0x00007f141c3bd0e5 in sqlite3_exec () from /nix/store/bbd59cqw259149r2ddk4w1q0lr2fch8c-sqlite-3.46.1/lib/libsqlite3.so.0 #9 0x00007f141da140e0 in nix::SQLiteTxn::commit() () from /nix/store/1m4r8s7s1v54zq9isncvjgia02bffxlz-determinate-nix-store-3.1.0/lib/libnixstore.so #10 0x00007f141d9ce69c in nix::LocalStore::registerValidPaths(std::map<nix::StorePath, nix::ValidPathInfo, std::less<nix::StorePath>, std::allocator<std::pair<nix::StorePath const, nix::ValidPathInfo> > > const&)::{lambda()#1}::operator()() const () from /nix/store/1m4r8s7s1v54zq9isncvjgia02bffxlz-determinate-nix-store-3.1.0/lib/libnixstore.so
diff --git a/src/nix/unix/daemon.cc b/src/nix/unix/daemon.cc
@@ -546,7 +546,7 @@ static int main_nix_daemon(int argc, char * * argv)
 
 static RegisterLegacyCommand r_nix_daemon("nix-daemon", main_nix_daemon);
 
-struct CmdDaemon : StoreCommand
+struct CmdDaemon : Command
 {
     bool stdio = false;
     std::optional<TrustedFlag> isTrustedOpt = std::nullopt;
@@ -615,7 +615,7 @@ struct CmdDaemon : StoreCommand
           ;
     }
 
-    void run(ref<Store> store) override
+    void run() override
     {
         runDaemon(stdio, isTrustedOpt, processOps);
     }

Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ static int main_nix_daemon(int argc, char * * argv)`
`546`	`546`
`547`	`547`	`static RegisterLegacyCommand r_nix_daemon("nix-daemon", main_nix_daemon);`
`548`	`548`
`549`		`-struct CmdDaemon : StoreCommand`
	`549`	`+struct CmdDaemon : Command`
`550`	`550`	`{`
`551`	`551`	`bool stdio = false;`
`552`	`552`	`std::optional<TrustedFlag> isTrustedOpt = std::nullopt;`
`@@ -615,7 +615,7 @@ struct CmdDaemon : StoreCommand`
`615`	`615`	`;`
`616`	`616`	`}`
`617`	`617`
`618`		`- void run(ref<Store> store) override`
	`618`	`+ void run() override`
`619`	`619`	`{`
`620`	`620`	`runDaemon(stdio, isTrustedOpt, processOps);`
`621`	`621`	`}`