@@ -147,21 +147,21 @@ func ostreeSyncTest(c cluster.TestCluster) {
147
147
version: 1.5.0
148
148
storage:
149
149
directories:
150
- - path: /var/tmp /data1
150
+ - path: /var/mnt /data1
151
151
mode: 0777
152
- - path: /var/tmp /data2
152
+ - path: /var/mnt /data2
153
153
mode: 0777
154
- - path: /var/tmp /data3
154
+ - path: /var/mnt /data3
155
155
mode: 0777
156
- - path: /var/tmp /data4
156
+ - path: /var/mnt /data4
157
157
mode: 0777
158
158
files:
159
159
- path: /etc/systemd/system.conf
160
160
overwrite: true
161
161
contents:
162
162
inline: |
163
163
[Manager]
164
- DefaultTimeoutStopSec=10s
164
+ DefaultTimeoutStopSec=30s
165
165
- path: /usr/local/bin/nfs-random-write.sh
166
166
mode: 0755
167
167
overwrite: true
@@ -170,10 +170,26 @@ storage:
170
170
#!/bin/bash
171
171
i=$1
172
172
while true; do
173
- sudo dd if=/dev/urandom of=/var/tmp/data$i/test bs=4096 count=2048 conv=notrunc oflag=append &> /dev/null
174
- sleep 0.1
175
- sudo rm -f /var/tmp/data$i/test
176
- done` )
173
+ dd if=/dev/urandom of=/var/mnt/data$i/test bs=4096 count=2048 conv=notrunc oflag=append &> /dev/null
174
+ sleep 0.5
175
+ rm -f /var/mnt/data$i/test
176
+ done
177
+ systemd:
178
+ units:
179
+
180
+ enabled: false
181
+ contents: |
182
+ [Unit]
183
+ Description=Run NFS Random Write Test %I
184
+ Before=umount.target
185
+ After=remote-fs.target
186
+ [Service]
187
+ ExecStart=/usr/local/bin/nfs-random-write.sh %I
188
+ #ExecStopPost=/bin/umount -lf /var/mnt/data%I || true
189
+ Type=simple
190
+ KillMode=control-group
191
+ [Install]
192
+ WantedBy=multi-user.target` )
177
193
opts := platform.MachineOptions {
178
194
MinMemory : 2048 ,
179
195
}
@@ -195,7 +211,7 @@ storage:
195
211
// entry point /var/nfs with fsid=0 will be root for clients
196
212
// refer to https://access.redhat.com/solutions/107793
197
213
_ = c .MustSSHf (nfs_client , `for i in $(seq 4); do
198
- sudo mount -t nfs4 %s:/share$i /var/tmp /data$i
214
+ sudo mount -t nfs4 %s:/share$i /var/mnt /data$i
199
215
done` , nfs_server .MachineAddress )
200
216
201
217
mounts := c .MustSSH (nfs_client , "sudo df -Th | grep nfs | wc -l" )
@@ -214,23 +230,20 @@ storage:
214
230
215
231
func doSyncTest (c cluster.TestCluster , client platform.Machine , m platform.Machine ) {
216
232
// Do simple touch to make sure nfs server works
217
- c .RunCmdSync (client , "sudo touch /var/tmp /data3/test" )
233
+ c .RunCmdSync (client , "sudo touch /var/mnt /data3/test" )
218
234
// Continue writing while doing test
219
235
// gets run using systemd unit
220
- for i := 1 ; i <= 4 ; i ++ {
221
- cmd := fmt .Sprintf ("sudo systemd-run --unit=nfs%d --no-block sh -c '/usr/local/bin/nfs-random-write.sh %d'" , i , i )
222
- _ , err := c .SSH (client , cmd )
223
- if err != nil {
224
- c .Fatalf ("failed to run nfs-random-write: %v" , err )
225
- }
236
+ _ , err := c .SSH (client , "sudo systemctl start --no-block nfs-random-write@{1..4}.service" )
237
+ if err != nil {
238
+ c .
Fatalf (
"failed to run [email protected] : %v" ,
err )
226
239
}
227
240
228
241
// block NFS traffic on nfs server
229
242
c .RunCmdSync (m , "sudo /usr/local/bin/block-nfs.sh" )
230
243
// Create a stage deploy using kargs while writing
231
244
c .RunCmdSync (client , "sudo rpm-ostree kargs --append=test=1" )
232
245
233
- err : = client .Reboot ()
246
+ err = client .Reboot ()
234
247
if err != nil {
235
248
c .Fatalf ("Couldn't reboot machine: %v" , err )
236
249
}
0 commit comments