Add new explicit migration command #2139
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
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/broken-installation/74638/25 |
yubiuser
previously approved these changes
Dec 21, 2024
|
Tested on two virtual machines to do what it should. The latest commit ensures we log the migration process to the user so they can quickly review if everything went the way they'd expect it to. |
…d in the help output as it is solely meant to be used internally by the installer script once from v5 -> v6 Signed-off-by: DL6ER <[email protected]>
Signed-off-by: DL6ER <[email protected]>
|
The most recent commit adds code to ensure a broken (or too new) database is not used when we know that all the SQL statements against it will fail anyway |
|
Rebased on latest |
…is not available (e.g. broken or more recent than this particular FTL binary can handle (like checking out a very old branch)) Signed-off-by: DL6ER <[email protected]>
Signed-off-by: DL6ER <[email protected]>
…nly mention it when debug.config is true. Signed-off-by: DL6ER <[email protected]>
yubiuser
previously approved these changes
Jan 8, 2025
yubiuser
reviewed
Jan 8, 2025
There was a problem hiding this comment.
Maybe I was too fast. Importing v5 backups results in SQL database locked errors. It does not happen every time, so maybe it's a race collission
2025-01-08 12:12:15.997 CET [147804/T148076] INFO: import_json_table(client_by_group.json): JSON array contains 0 entries
2025-01-08 12:12:16.017 CET [147804/T148076] INFO: import_json_table(domainlist_by_group.json): JSON array contains 64 entries
2025-01-08 12:12:16.036 CET [147804/T148076] INFO: import_json_table(group.json): JSON array contains 3 entries
2025-01-08 12:12:16.050 CET [147804/T147886] ERROR: SQLite3: database is locked in "SELECT value FROM info WHERE property = 'updated';" (5)
2025-01-08 12:12:16.058 CET [147804/T148076] INFO: import_json_table(whitelist.exact.json): JSON array contains 26 entries
2025-01-08 12:12:16.083 CET [147804/T148076] INFO: import_json_table(whitelist.regex.json): JSON array contains 3 entries
2025-01-08 12:13:43.029 CET [147804/T148365] INFO: import_json_table(blacklist.regex.json): JSON array contains 27 entries
2025-01-08 12:13:43.048 CET [147804/T148365] INFO: import_json_table(client.json): JSON array contains 0 entries
2025-01-08 12:13:43.069 CET [147804/T148365] INFO: import_json_table(client_by_group.json): JSON array contains 0 entries
2025-01-08 12:13:43.082 CET [147804/T148365] ERROR: Unable to commit transaction: database is locked
2025-01-08 12:13:43.088 CET [147804/T148365] INFO: import_json_table(domainlist_by_group.json): JSON array contains 64 entries
2025-01-08 12:13:43.107 CET [147804/T148365] INFO: import_json_table(group.json): JSON array contains 3 entries
2025-01-08 12:13:43.129 CET [147804/T148365] INFO: import_json_table(whitelist.exact.json): JSON array contains 26 entries
2025-01-08 12:13:43.153 CET [147804/T148365] INFO: import_json_table(whitelist.regex.json): JSON array contains 3 entries
…st-updated timestamp from the gravity database Signed-off-by: DL6ER <[email protected]>
…ON tables to the gravity database Signed-off-by: DL6ER <[email protected]>
…in-memory Teleporter database Signed-off-by: DL6ER <[email protected]>
|
Yes, you are right with your assumption. You have found two of the three possible cases I was able to find in the code. Three commits pushed. |
yubiuser
approved these changes
Jan 9, 2025
Merged
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.
What does this implement/fix?
pihole-FTL migrate v6is intentionally not included in the help output as it is solely meant to be used internally by the installer script once from v5 -> v6Related to pi-hole/pi-hole#5830
Related issue or feature (if applicable): N/A
Pull request in docs with documentation (if applicable): N/A
By submitting this pull request, I confirm the following:
git rebase)Checklist:
developmentalbranch.