[jsondb] Restore zero byte files from backup #2155
Merged
Conversation
This file contains 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
Signed-off-by: Mike Major <mike_j_major@hotmail.com>
cweitkamp
reviewed
Jan 25, 2021
...nhab.core.storage.json/src/main/java/org/openhab/core/storage/json/internal/JsonStorage.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Mike Major <mike_j_major@hotmail.com>
cweitkamp
approved these changes
Jan 26, 2021
There was a problem hiding this comment.
LGTM. Thanks.
This small path is a nice improvement to cover unexpected loss if data (e.g. due to a power loss).
As the JSON storage is a very important OHC bundle we might harden its implementation by some additional unit/itests to avoid future regressions. We can do that in a follow-up PR.
|
This pull request has been mentioned on openHAB Community. There might be relevant details there: https://community.openhab.org/t/great-problem-after-update-to-openhab3/115746/6 |
splatch
pushed a commit
to ConnectorIO/copybara-hab-core
that referenced
this pull request
Jul 11, 2023
* Restore zero byte files from backup * Also handle zero byte backup files Signed-off-by: Mike Major <mike_j_major@hotmail.com> GitOrigin-RevId: 86a447c
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #2136
A file which has legitimately had all items removed, e.g. deleting all things from the UI, results in a 2 byte file containing just
{}, so there should be no problem with unintentionally restoring a file from backup.Here's an example of the output with a zero byte Things DB and a couple of zero byte backups:
Signed-off-by: Mike Major mike_j_major@hotmail.com