Skip to content

Commit 7e9225c

Browse files
authored
DLPX-87531 Fix SDB test regression due to drgn API change (#339)
There were a few changes recently in drgn involving data structures used for holding pointers to type information data. These changes introduced subtle differences in the APIs behavior, one of which affected our test suite. Before when a type was looked up by name and there was no externed/global type with that name but multiple local (source file-specific ones), then one of those local ones was returned consistently. With the recent drgn changes, the behavior is that one of those local types will be randomly picked making one of our regression tests fail sometimes while other times it passed. The specific test is `ptype 'struct v'` which we expect to output: ``` struct v { uint8_t b[32]; } ``` But sometimes we get: ``` struct v { uint8_t b[64]; } ``` The reason is that there are multiple definitions of this struct in the vdev_raidz code of ZFS: ``` ~/repos/zfs$ git grep -B 5 -A 2 "struct v " ...snip... module/zfs/vdev_raidz_math_avx2.c- module/zfs/vdev_raidz_math_avx2.c-extern const uint8_t gf_clmul_mod_lt[4*256][16]; module/zfs/vdev_raidz_math_avx2.c- module/zfs/vdev_raidz_math_avx2.c-#define ELEM_SIZE 32 module/zfs/vdev_raidz_math_avx2.c- module/zfs/vdev_raidz_math_avx2.c:typedef struct v { module/zfs/vdev_raidz_math_avx2.c- uint8_t b[ELEM_SIZE] __attribute__((aligned(ELEM_SIZE))); module/zfs/vdev_raidz_math_avx2.c-} v_t; -- module/zfs/vdev_raidz_math_avx512bw.c- module/zfs/vdev_raidz_math_avx512bw.c-extern const uint8_t gf_clmul_mod_lt[4*256][16]; module/zfs/vdev_raidz_math_avx512bw.c- module/zfs/vdev_raidz_math_avx512bw.c-#define ELEM_SIZE 64 module/zfs/vdev_raidz_math_avx512bw.c- module/zfs/vdev_raidz_math_avx512bw.c:typedef struct v { module/zfs/vdev_raidz_math_avx512bw.c- uint8_t b[ELEM_SIZE] __attribute__((aligned(ELEM_SIZE))); module/zfs/vdev_raidz_math_avx512bw.c-} v_t; ...snip... ``` This patch gets rid of this regression test as it causes occassional failures AND it's not really needed as the functionality that it tests is already covered by other tests. A side-improvement of this patch is also printing in the Github test result output the differences between what we expect the output to be vs what we get from our ref crash dumps.
1 parent e7e1f49 commit 7e9225c

File tree

6 files changed

+22
-15
lines changed

6 files changed

+22
-15
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
union thread_union {
2+
struct task_struct task;
3+
unsigned long stack[2048];
4+
}
5+
@#$ EXIT CODE $#@
6+
0
Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,5 @@ enum zfs_case {
33
ZFS_CASE_INSENSITIVE = 1,
44
ZFS_CASE_MIXED = 2,
55
}
6-
struct v {
7-
uint8_t b[16];
8-
}
9-
union thread_union {
10-
struct task_struct task;
11-
unsigned long stack[2048];
12-
}
136
@#$ EXIT CODE $#@
147
0
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
union thread_union {
2+
struct task_struct task;
3+
unsigned long stack[2048];
4+
}
5+
@#$ EXIT CODE $#@
6+
0
Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,5 @@ enum zfs_case {
33
ZFS_CASE_INSENSITIVE = 1,
44
ZFS_CASE_MIXED = 2,
55
}
6-
struct v {
7-
uint8_t b[32];
8-
}
9-
union thread_union {
10-
struct task_struct task;
11-
unsigned long stack[2048];
12-
}
136
@#$ EXIT CODE $#@
147
0

tests/integration/infra.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,14 @@ def verify_cmd_output_and_code(self,
281281
assert self.repl_invoke(cmd) == ref_code
282282
captured = capsys.readouterr()
283283
if not stripped:
284+
with capsys.disabled():
285+
if captured.out != ref_output:
286+
#
287+
# If we are about to fail the assertion print the
288+
# actual mismatch in the logs before failing.
289+
#
290+
print("expected:\n" + ref_output)
291+
print("got:\n" + captured.out)
284292
assert captured.out == ref_output
285293
else:
286294
for i, n in enumerate(captured.out):

tests/integration/test_core_generic.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@
125125
# ptype
126126
"ptype spa_t",
127127
"ptype spa vdev",
128-
"ptype zfs_case 'struct v' thread_union",
128+
"ptype zfs_case",
129+
"ptype thread_union",
129130
"ptype 'struct spa'",
130131

131132
# sizeof

0 commit comments

Comments
 (0)