Fix the conflict config files shared by VersionedKvStore and NamespacedKvStore - #182
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Two prollytree store types — VersionedKvStore and NamespacedKvStore — currently share a single on-disk config file (prolly_config_tree_config) when both are opened against the same dataset directory. Each store writes its own root hash to that file on commit; the last writer wins. A process opening the other store afterwards reads a root hash that points at a tree it can't reconstruct, silently falls back to an empty tree, and every subsequent read returns None.
This PR splits the config file by owner: NamespacedKvStore writes its inner store's TreeConfig to prolly_config_namespaced_root; VersionedKvStore keeps prolly_config_tree_config unchanged. Also fixes NamespacedKvStore::init to be idempotent — it currently appends an "Initial namespaced store" commit to history on every call, even for already-initialized stores.