diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-06-01T21·20+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-02T00·14+0200 |
| commit | b755752f7666441e710bee9f0c21f233808874c7 (patch) | |
| tree | 264afe2304374e2c2d951eba34f17580e647ad7e /src/libstore | |
| parent | 53dd97bb9d70d98f648d3888b806b4044ea45f4c (diff) | |
Add a ‘verifyStore’ RPC
Hello! The patch below adds a ‘verifyStore’ RPC with the same signature as the current LocalStore::verifyStore method. Thanks, Ludo’. >From aef46c03ca77eb6344f4892672eb6d9d06432041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org> Date: Mon, 1 Jun 2015 23:17:10 +0200 Subject: [PATCH] Add a 'verifyStore' remote procedure call.
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/remote-store.cc | 10 | ||||
| -rw-r--r-- | src/libstore/remote-store.hh | 1 | ||||
| -rw-r--r-- | src/libstore/store-api.hh | 4 | ||||
| -rw-r--r-- | src/libstore/worker-protocol.hh | 3 |
4 files changed, 17 insertions, 1 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 3b2825c2c74a..ab87d9d8b16f 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -587,6 +587,16 @@ void RemoteStore::optimiseStore() readInt(from); } +bool RemoteStore::verifyStore(bool checkContents, bool repair) +{ + openConnection(); + writeInt(wopVerifyStore, to); + writeInt(checkContents, to); + writeInt(repair, to); + processStderr(); + return readInt(from) != 0; +} + void RemoteStore::processStderr(Sink * sink, Source * source) { to.flush(); diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh index 14209cbfb516..030120db4067 100644 --- a/src/libstore/remote-store.hh +++ b/src/libstore/remote-store.hh @@ -85,6 +85,7 @@ public: void optimiseStore(); + bool verifyStore(bool checkContents, bool repair); private: AutoCloseFD fdSocket; FdSink to; diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 97a60a6a5cd5..3764f3e54242 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -254,6 +254,10 @@ public: /* Optimise the disk space usage of the Nix store by hard-linking files with the same contents. */ virtual void optimiseStore() = 0; + + /* Check the integrity of the Nix store. Returns true if errors + remain. */ + virtual bool verifyStore(bool checkContents, bool repair) = 0; }; diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh index 4b040b77ce63..d037d7402ede 100644 --- a/src/libstore/worker-protocol.hh +++ b/src/libstore/worker-protocol.hh @@ -42,7 +42,8 @@ typedef enum { wopQueryValidPaths = 31, wopQuerySubstitutablePaths = 32, wopQueryValidDerivers = 33, - wopOptimiseStore = 34 + wopOptimiseStore = 34, + wopVerifyStore = 35 } WorkerOp; |