Skip to content

Commit 9425e71

Browse files
craig[bot]RaduBerinde
andcommitted
Merge #158292
158292: roachtest: don't uninstall snapd in disk stall tests r=RaduBerinde a=RaduBerinde Instead of uninstalling snapd and later re-installing during cleanup (which can take a while), we temporarily disable the autoimport udev rules. Informs: #158189 Release note: None Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
2 parents 8ebc521 + a786d0d commit 9425e71

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

pkg/roachprod/failureinjection/failures/disk_stall.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,12 @@ func (s *DmsetupDiskStaller) Setup(ctx context.Context, l *logger.Logger, args F
457457

458458
// snapd will run "snapd auto-import /dev/dm-0" via udev triggers when
459459
// /dev/dm-0 is created. This possibly interferes with the dmsetup create
460-
// reload, so uninstall snapd.
461-
if err = s.Run(ctx, l, s.c.Nodes, `sudo apt-get purge -y snapd`); err != nil {
460+
// reload, so we disable snapd auto-import udev rules by creating an empty
461+
// /etc/udev/rules.d/66-snapd-autoimport.rules file (which takes precedence
462+
// over the corresponding file in /lib/udev/rules.d/).
463+
if err = s.Run(ctx, l, s.c.Nodes, `echo '# disabled during tests' | sudo tee /etc/udev/rules.d/66-snapd-autoimport.rules >/dev/null; \
464+
sudo udevadm control --reload; \
465+
sudo udevadm settle`); err != nil {
462466
return err
463467
}
464468
if err = s.Run(ctx, l, s.c.Nodes, `sudo umount -f /mnt/data1 || true`); err != nil {
@@ -578,8 +582,9 @@ func (s *DmsetupDiskStaller) Cleanup(
578582
if err := s.Run(ctx, l, s.c.Nodes, `sudo mount /mnt/data1`); err != nil {
579583
return err
580584
}
581-
// Reinstall snapd.
582-
if err := s.Run(ctx, l, s.c.Nodes, `sudo apt-get install -y snapd`); err != nil {
585+
// Reenable snapd autoimport udev rules.
586+
if err := s.Run(ctx, l, s.c.Nodes, `sudo rm -f /etc/udev/rules.d/66-snapd-autoimport.rules; \
587+
sudo udevadm control --reload`); err != nil {
583588
return err
584589
}
585590

0 commit comments

Comments
 (0)