Fix M5.7 compaction and failure recovery

This commit is contained in:
dingo
2026-09-26 19:40:16 -04:00
parent 56f533c738
commit a2a12fdc69
6 changed files with 187 additions and 29 deletions
+14 -2
View File
@@ -31,6 +31,12 @@ enum class PublicationInterruption : std::uint8_t {
after_manifest_sync,
after_manifest_publish
};
enum class PublicationFailure : std::uint8_t {
none,
payload_out_of_space,
manifest_out_of_space,
manifest_directory_sync
};
struct FileCommit {
std::uint64_t generation{}, covered_command{}, snapshot_checksum{};
bool has_journal{};
@@ -40,17 +46,21 @@ class LocalWorldFiles {
public:
[[nodiscard]] static std::expected<std::unique_ptr<LocalWorldFiles>, LocalFileError>
open(const std::filesystem::path& trusted_root, WorldIdentity identity, std::size_t byte_budget,
PublicationInterruption interrupt_once = PublicationInterruption::none);
PublicationInterruption interrupt_once = PublicationInterruption::none,
PublicationFailure fail_once = PublicationFailure::none);
LocalWorldFiles(const LocalWorldFiles&) = delete;
LocalWorldFiles& operator=(const LocalWorldFiles&) = delete;
LocalWorldFiles(LocalWorldFiles&&) = delete;
LocalWorldFiles& operator=(LocalWorldFiles&&) = delete;
~LocalWorldFiles();
// An ambiguous publication failure poisons this handle; reopen before recovery.
[[nodiscard]] std::expected<std::unique_ptr<ChunkStore>, LocalFileError> recover() const;
// While a journal is committed, compaction requires its byte-identical replay result.
[[nodiscard]] std::expected<FileCommit, LocalFileError> checkpoint(const ChunkStore& store);
[[nodiscard]] std::expected<FileCommit, LocalFileError>
publish_journal(std::span<const std::uint8_t> checkpoint,
std::span<const std::uint8_t> journal);
// Empty on an uninitialized or poisoned handle.
[[nodiscard]] std::optional<FileCommit> current() const noexcept;
private:
@@ -61,7 +71,8 @@ class LocalWorldFiles {
bool has_journal{};
};
LocalWorldFiles(std::filesystem::path directory, WorldIdentity identity, std::size_t budget,
PublicationInterruption interruption, std::unique_ptr<Lock> lock);
PublicationInterruption interruption, PublicationFailure failure,
std::unique_ptr<Lock> lock);
[[nodiscard]] std::expected<FileCommit, LocalFileError>
publish(std::span<const std::uint8_t> payload, bool journal, std::uint64_t covered,
std::uint64_t payload_checksum);
@@ -69,6 +80,7 @@ class LocalWorldFiles {
WorldIdentity identity_;
std::size_t budget_;
PublicationInterruption interruption_;
PublicationFailure failure_;
std::unique_ptr<Lock> lock_;
std::optional<Manifest> manifest_;
std::size_t active_slot_{};