diff options
| author | Dan Engelbrecht <[email protected]> | 2022-06-17 07:06:21 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-06-17 07:06:21 -0700 |
| commit | c7e22a4ef1cce7103b9afbeec487461cb32f8dbe (patch) | |
| tree | 8b99d51bf496c96f82161c18fbdcfd5c6f8f31fd /zen/zen.cpp | |
| parent | fixed merge mistake which caused a build error (diff) | |
| download | archived-zen-c7e22a4ef1cce7103b9afbeec487461cb32f8dbe.tar.xz archived-zen-c7e22a4ef1cce7103b9afbeec487461cb32f8dbe.zip | |
Make cas storage an hidden implementation detail of CidStore (#130)v0.1.4-pre6v0.1.4-pre5
- Bumped ZEN_SCHEMA_VERSION
- CasStore no longer a public API, it is hidden behind CidStore
- Moved cas.h from public header folder
- CidStore no longer maps from Cid -> Cas, we store entries in Cas under RawHash
- CasStore now decompresses data to validate content (matching against RawHash)
- CasChunkSet renames to HashKeySet and put in separate header/cpp file
- Disabled "Chunk" command for now as it relied on CAS being exposed as a service
- Changed CAS http service to Cid http server
- Moved "Run" command completely inside ZEN_WITH_EXEC_SERVICES define
- Removed "cas.basic" test
- Uncommented ".exec.basic" test and added return-skip at start of test
- Moved ScrubContext to separate header file
- Renamed CasGC to GcManager
- Cleaned up configuration passing in cas store classes
- Removed CAS stuff from GcContext and clarified naming in class
- Remove migration code
Diffstat (limited to 'zen/zen.cpp')
| -rw-r--r-- | zen/zen.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/zen/zen.cpp b/zen/zen.cpp index 302e8496f..5abe4b04e 100644 --- a/zen/zen.cpp +++ b/zen/zen.cpp @@ -20,7 +20,6 @@ #include <zencore/scopeguard.h> #include <zencore/string.h> #include <zencore/zencore.h> -#include <zenstore/cas.h> #if ZEN_WITH_TESTS # define ZEN_TEST_WITH_RUNNER @@ -109,12 +108,13 @@ main(int argc, char** argv) auto _ = zen::MakeGuard([] { spdlog::shutdown(); }); - HashCommand HashCmd; - CopyCommand CopyCmd; - DedupCommand DedupCmd; - DropCommand DropCmd; - ChunkCommand ChunkCmd; - RunCommand RunCmd; + HashCommand HashCmd; + CopyCommand CopyCmd; + DedupCommand DedupCmd; + DropCommand DropCmd; +#if ZEN_WITH_EXEC_SERVICES + RunCommand RunCmd; +#endif StatusCommand StatusCmd; TopCommand TopCmd; PrintCommand PrintCmd; @@ -134,14 +134,16 @@ main(int argc, char** argv) const char* CmdSummary; } Commands[] = { // clang-format off - {"chunk", &ChunkCmd, "Perform chunking"}, +// {"chunk", &ChunkCmd, "Perform chunking"}, {"copy", &CopyCmd, "Copy file(s)"}, {"dedup", &DedupCmd, "Dedup files"}, {"drop", &DropCmd, "Drop cache bucket(s)"}, {"hash", &HashCmd, "Compute file hashes"}, {"print", &PrintCmd, "Print compact binary object"}, {"printpackage", &PrintPkgCmd, "Print compact binary package"}, +#if ZEN_WITH_EXEC_SERVICES {"run", &RunCmd, "Remote execution"}, +#endif // ZEN_WITH_EXEC_SERVICES {"status", &StatusCmd, "Show zen status"}, {"ps", &PsCmd, "Enumerate running zen server instances"}, {"top", &TopCmd, "Monitor zen server activity"}, |