Skip to content

Commit 92e0280

Browse files
committed
tests: fix failed ostree.sync on c10s/rhcos10.1
Move the continuous writing to service instead of systemd-run. Fixes openshift/os#1751
1 parent 81ddb30 commit 92e0280

File tree

1 file changed

+31
-18
lines changed

1 file changed

+31
-18
lines changed

mantle/kola/tests/ostree/sync.go

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -150,21 +150,21 @@ func ostreeSyncTest(c cluster.TestCluster) {
150150
version: 1.5.0
151151
storage:
152152
directories:
153-
- path: /var/tmp/data1
153+
- path: /var/mnt/data1
154154
mode: 0777
155-
- path: /var/tmp/data2
155+
- path: /var/mnt/data2
156156
mode: 0777
157-
- path: /var/tmp/data3
157+
- path: /var/mnt/data3
158158
mode: 0777
159-
- path: /var/tmp/data4
159+
- path: /var/mnt/data4
160160
mode: 0777
161161
files:
162162
- path: /etc/systemd/system.conf
163163
overwrite: true
164164
contents:
165165
inline: |
166166
[Manager]
167-
DefaultTimeoutStopSec=10s
167+
DefaultTimeoutStopSec=30s
168168
- path: /usr/local/bin/nfs-random-write.sh
169169
mode: 0755
170170
overwrite: true
@@ -173,10 +173,26 @@ storage:
173173
#!/bin/bash
174174
i=$1
175175
while true; do
176-
sudo dd if=/dev/urandom of=/var/tmp/data$i/test bs=4096 count=2048 conv=notrunc oflag=append &> /dev/null
177-
sleep 0.1
178-
sudo rm -f /var/tmp/data$i/test
179-
done`)
176+
dd if=/dev/urandom of=/var/mnt/data$i/test bs=4096 count=2048 conv=notrunc oflag=append &> /dev/null
177+
sleep 0.5
178+
rm -f /var/mnt/data$i/test
179+
done
180+
systemd:
181+
units:
182+
- name: nfs-random-write@.service
183+
enabled: false
184+
contents: |
185+
[Unit]
186+
Description=Run NFS Random Write Test %I
187+
Before=umount.target
188+
After=remote-fs.target
189+
[Service]
190+
ExecStart=/usr/local/bin/nfs-random-write.sh %I
191+
#ExecStopPost=/bin/umount -lf /var/mnt/data%I || true
192+
Type=simple
193+
KillMode=control-group
194+
[Install]
195+
WantedBy=multi-user.target`)
180196
opts := platform.MachineOptions{
181197
MinMemory: 2048,
182198
}
@@ -198,7 +214,7 @@ storage:
198214
// entry point /var/nfs with fsid=0 will be root for clients
199215
// refer to https://access.redhat.com/solutions/107793
200216
_ = c.MustSSHf(nfs_client, `for i in $(seq 4); do
201-
sudo mount -t nfs4 %s:/share$i /var/tmp/data$i
217+
sudo mount -t nfs4 %s:/share$i /var/mnt/data$i
202218
done`, nfs_server.MachineAddress)
203219

204220
mounts := c.MustSSH(nfs_client, "sudo df -Th | grep nfs | wc -l")
@@ -217,23 +233,20 @@ storage:
217233

218234
func doSyncTest(c cluster.TestCluster, client platform.Machine, m platform.Machine) {
219235
// Do simple touch to make sure nfs server works
220-
c.RunCmdSync(client, "sudo touch /var/tmp/data3/test")
236+
c.RunCmdSync(client, "sudo touch /var/mnt/data3/test")
221237
// Continue writing while doing test
222238
// gets run using systemd unit
223-
for i := 1; i <= 4; i++ {
224-
cmd := fmt.Sprintf("sudo systemd-run --unit=nfs%d --no-block sh -c '/usr/local/bin/nfs-random-write.sh %d'", i, i)
225-
_, err := c.SSH(client, cmd)
226-
if err != nil {
227-
c.Fatalf("failed to run nfs-random-write: %v", err)
228-
}
239+
_, err := c.SSH(client, "sudo systemctl start --no-block nfs-random-write@{1..4}.service")
240+
if err != nil {
241+
c.Fatalf("failed to run nfs-random-write@.service: %v", err)
229242
}
230243

231244
// block NFS traffic on nfs server
232245
c.RunCmdSync(m, "sudo /usr/local/bin/block-nfs.sh")
233246
// Create a stage deploy using kargs while writing
234247
c.RunCmdSync(client, "sudo rpm-ostree kargs --append=test=1")
235248

236-
err := client.Reboot()
249+
err = client.Reboot()
237250
if err != nil {
238251
c.Fatalf("Couldn't reboot machine: %v", err)
239252
}

0 commit comments

Comments
 (0)