Add ability to scrub from last scrubbed txg #16301
Open
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
oshogbo
force-pushed
the
zfs_scrub_last_scrubbed_txg
branch
from
68edb6e
to
42d967f
Compare
allanjude
reviewed
Jul 11, 2024
oshogbo
force-pushed
the
zfs_scrub_last_scrubbed_txg
branch
from
42d967f
to
8d59c2c
Compare
|
I noticed a $ sudo ./zpool scrub tank && sleep 1 && sudo ./zpool scrub -p tank
$ sudo ./zpool status
pool: tank
state: ONLINE
scan: scrub paused since Tue Aug 27 16:02:26 2024
scrub started on Tue Aug 27 16:02:25 2024
14.7G / 14.7G scanned, 3.22G / 14.7G issued
0B repaired, 21.95% done
config:
NAME STATE READ WRITE CKSUM
tank ONLINE 0 0 0
vdb ONLINE 0 0 0
errors: No known data errors
$ sudo ./zpool scrub -C tank
cannot scrub tank: delegated administration is disabled on pool
$ echo $?
1
$ sudo ./zpool status
pool: tank
state: ONLINE
scan: scrub repaired 0B in 00:00:14 with 0 errors on Tue Aug 27 16:02:39 2024
config:
NAME STATE READ WRITE CKSUM
tank ONLINE 0 0 0
vdb ONLINE 0 0 0
errors: No known data errorsIt returns an error code, but then the scrub seems to complete successfully. Any thoughts? |
|
@tonyhutter This is after the applied patch, but without it, it works fine? |
Sponsored-By: Wasabi Technology, Inc. Sponsored-By: Klara Inc. Signed-off-by: Mariusz Zaborski <[email protected]>
The `last_scrubbed_txg` property indicates the transaction group (TXG) up to which the most recent scrub operation has checked and repaired the dataset. This provides administrators with insight into the data integrity status of their pool at a specific point in time. Sponsored-By: Wasabi Technology, Inc. Sponsored-By: Klara Inc. Signed-off-by: Mariusz Zaborski <[email protected]>
oshogbo
force-pushed
the
zfs_scrub_last_scrubbed_txg
branch
from
8d59c2c
to
cc72197
Compare
|
I have added another feature just to scrub "recent data". |
oshogbo
force-pushed
the
zfs_scrub_last_scrubbed_txg
branch
from
cc72197
to
4823cc2
Compare
Sponsored-By: Wasabi Technology, Inc. Sponsored-By: Klara Inc. Signed-off-by: Mariusz Zaborski <[email protected]>
amotin
reviewed
Sep 6, 2024
| cb.cb_scrub_cmd = POOL_SCRUB_PAUSE; | ||
| } else if (is_stop) { | ||
| cb.cb_type = POOL_SCAN_NONE; | ||
| } else if (is_txg_continue) { | ||
| cb.cb_scrub_cmd = POOL_SCRUB_FROM_LAST_TXG; |
There was a problem hiding this comment.
It looks like -C and -R should also be mutually exclusive.
| @@ -506,7 +506,8 @@ get_usage(zpool_help_t idx) | |||
| return (gettext("\tinitialize [-c | -s | -u] [-w] <pool> " | |||
| "[<device> ...]\n")); | |||
| case HELP_SCRUB: | |||
| return (gettext("\tscrub [-s | -p] [-w] [-e] <pool> ...\n")); | |||
| return (gettext("\tscrub [-s | -p] [-w] [-e] [-C] [-R] " | |||
There was a problem hiding this comment.
Suggested change
| return (gettext("\tscrub [-s | -p] [-w] [-e] [-C] [-R] " | |
| return (gettext("\tscrub [-e | -p | -s | -C | -R] [-w] " |
They all seem to be mutually exclusive.
| @@ -8391,11 +8392,13 @@ wait_callback(zpool_handle_t *zhp, void *data) | |||
| } | |||
|
|
|||
| /* | |||
| * zpool scrub [-s | -p] [-w] [-e] <pool> ... | |||
| * zpool scrub [-s | -p] [-w] [-e] [-C] <pool> ... | |||
There was a problem hiding this comment.
Suggested change
| * zpool scrub [-s | -p] [-w] [-e] [-C] <pool> ... | |
| * zpool scrub [-e | -p | -s | -C | -R] [-w] <pool> ... |
Comment on lines
39
to
+43
| .Op Fl s Ns | Ns Fl p | ||
| .Op Fl w | ||
| .Op Fl e | ||
| .Op Fl C | ||
| .Op Fl R |
There was a problem hiding this comment.
Suggested change
| .Op Fl s Ns | Ns Fl p | |
| .Op Fl w | |
| .Op Fl e | |
| .Op Fl C | |
| .Op Fl R | |
| .Op Ns Fl e | Ns Fl p | Fl s Ns | Fl C Ns | Fl R Ns | |
| .Op Fl w |
Comment on lines
+873
to
+874
| ASSERT(setup_sync_arg->func > POOL_SCAN_NONE && | ||
| setup_sync_arg->func < POOL_SCAN_FUNCS); |
There was a problem hiding this comment.
Just cosmetics, but I would use two ASSERT3U() instead.
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.
Motivation and Context
Sometimes it is useful to only scrub a particular range of txg. Some users might want to scrub only new data because they would like to know if the new write wasn't corrupted. This PR adds possiblity scrub only newly flushed data.
Description
Users who would like to scrub only new data, a new zpool property was introduced, that stores last scrubbed txg, so users can run scrub only from the last saved point.
We use a scn_max_txg and scn_min_txg which are already built into scrub, to accomplish that.
How Has This Been Tested?
Via test cases.
Types of changes
Checklist:
Signed-off-by.