* [PATCH] src/fssum: skip subvolumes when building a sum
@ 2019-12-17 15:25 Josef Bacik
2019-12-17 16:19 ` Filipe Manana
0 siblings, 1 reply; 2+ messages in thread
From: Josef Bacik @ 2019-12-17 15:25 UTC (permalink / raw)
To: fstests, linux-btrfs, kernel-team
With the snapshot/subvolume support added to fsstress I've been seeing
random failures with our send/receive related tests. This is because
fssum is summing the path with the subvolumes for our test fs'es that
are generated by fsstress. But with send/receive it skips subvolumes,
which makes the sums mismatch. Fix this by skipping directories that do
not match our st_dev, which is how we differentiate subvolumes in btrfs.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
src/fssum.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/fssum.c b/src/fssum.c
index 6ba0a95c..a243839a 100644
--- a/src/fssum.c
+++ b/src/fssum.c
@@ -517,6 +517,12 @@ sum(int dirfd, int level, sum_t *dircs, char *path_prefix, char *path_in)
int excl;
sum_file_data_t sum_file_data = flags[FLAG_STRUCTURE] ?
sum_file_data_strict : sum_file_data_permissive;
+ struct stat64 dir_st;
+
+ if (fstat64(dirfd, &dir_st)) {
+ perror("fstat");
+ exit(-1);
+ }
d = fdopendir(dirfd);
if (!d) {
@@ -570,6 +576,11 @@ sum(int dirfd, int level, sum_t *dircs, char *path_prefix, char *path_in)
path_prefix, path, strerror(errno));
exit(-1);
}
+
+ /* We are crossing into a different subvol, skip this subtree. */
+ if (st.st_dev != dir_st.st_dev)
+ goto next;
+
sum_add_u64(&meta, level);
sum_add(&meta, namelist[i], strlen(namelist[i]));
if (!S_ISDIR(st.st_mode))
--
2.23.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] src/fssum: skip subvolumes when building a sum
2019-12-17 15:25 [PATCH] src/fssum: skip subvolumes when building a sum Josef Bacik
@ 2019-12-17 16:19 ` Filipe Manana
0 siblings, 0 replies; 2+ messages in thread
From: Filipe Manana @ 2019-12-17 16:19 UTC (permalink / raw)
To: Josef Bacik; +Cc: fstests, linux-btrfs, kernel-team
On Tue, Dec 17, 2019 at 3:25 PM Josef Bacik <josef@toxicpanda.com> wrote:
>
> With the snapshot/subvolume support added to fsstress I've been seeing
> random failures with our send/receive related tests. This is because
> fssum is summing the path with the subvolumes for our test fs'es that
> are generated by fsstress. But with send/receive it skips subvolumes,
> which makes the sums mismatch. Fix this by skipping directories that do
> not match our st_dev, which is how we differentiate subvolumes in btrfs.
>
> Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Looks good, thanks.
Reviewed-by: Filipe Manana <fdmanana@suse.com>
> ---
> src/fssum.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/src/fssum.c b/src/fssum.c
> index 6ba0a95c..a243839a 100644
> --- a/src/fssum.c
> +++ b/src/fssum.c
> @@ -517,6 +517,12 @@ sum(int dirfd, int level, sum_t *dircs, char *path_prefix, char *path_in)
> int excl;
> sum_file_data_t sum_file_data = flags[FLAG_STRUCTURE] ?
> sum_file_data_strict : sum_file_data_permissive;
> + struct stat64 dir_st;
> +
> + if (fstat64(dirfd, &dir_st)) {
> + perror("fstat");
> + exit(-1);
> + }
>
> d = fdopendir(dirfd);
> if (!d) {
> @@ -570,6 +576,11 @@ sum(int dirfd, int level, sum_t *dircs, char *path_prefix, char *path_in)
> path_prefix, path, strerror(errno));
> exit(-1);
> }
> +
> + /* We are crossing into a different subvol, skip this subtree. */
> + if (st.st_dev != dir_st.st_dev)
> + goto next;
> +
> sum_add_u64(&meta, level);
> sum_add(&meta, namelist[i], strlen(namelist[i]));
> if (!S_ISDIR(st.st_mode))
> --
> 2.23.0
>
--
Filipe David Manana,
“Whether you think you can, or you think you can't — you're right.”
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-17 16:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-17 15:25 [PATCH] src/fssum: skip subvolumes when building a sum Josef Bacik
2019-12-17 16:19 ` Filipe Manana
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).