Skip to content

Commit cf8a474

Browse files
committed
TEST: Enable and restore frequent disk scanning for the alternative xs tests
1 parent 3c6606a commit cf8a474

2 files changed

Lines changed: 23 additions & 4 deletions

File tree

test/eos-altxs-test

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,20 @@ function check_checksums() {
9494
return 0
9595
}
9696

97+
function enable_frequent_scanning() {
98+
local time=5
99+
for fsid in $(eos -j fs ls | jq '.result[].id'); do
100+
eos fs config ${fsid} scan_disk_interval=${time}
101+
done
102+
}
103+
104+
function disable_frequent_scanning() {
105+
local time=14400
106+
for fsid in $(eos -j fs ls | jq '.result[].id'); do
107+
eos fs config ${fsid} scan_disk_interval=${time}
108+
done
109+
}
110+
97111
function enable_altxs_scan() {
98112
local time=$1
99113
for fsid in $(eos -j fs ls | jq '.result[].id'); do
@@ -106,14 +120,14 @@ function enable_altxs_sync() {
106120
for fsid in $(eos -j fs ls | jq '.result[].id'); do
107121
eos fs config ${fsid} altxs_sync=1
108122
eos fs config ${fsid} altxs_sync_interval=${time}
109-
eos fs config ${fsid} scan_disk_interval=${time}
110123
done
111124
}
112125

113126
function disable_altxs_sync() {
114127
for fsid in $(eos -j fs ls | jq '.result[].id'); do
115128
eos fs config ${fsid} altxs_sync=0
116129
eos fs config ${fsid} altxs_sync_interval=0
130+
# Put back teh default value
117131
done
118132
}
119133

@@ -144,7 +158,10 @@ dd if=/dev/urandom of=${TEST_FILE} bs=1M count=16 &> /dev/null
144158
dd if=/dev/urandom of=${TEST_FILE2} bs=1M count=64 &> /dev/null
145159

146160
# Enable debug on FSTs
147-
eos debug debug "*"
161+
#eos debug debug "*"
162+
163+
# Enable frequent disk scanning
164+
enable_frequent_scanning
148165

149166
# Test 1
150167
# Disable ScanDir thread for computing alternative checksums and
@@ -228,4 +245,7 @@ eos mkdir -p ${EOS_ALTXS_TEST}/disabled_on_upload
228245
eos attr set sys.altxs="md5" ${EOS_ALTXS_TEST}/disabled_on_upload
229246
disable_altxs_upload
230247
xrdcp -f --nopbar ${TEST_FILE} root://${EOS_MGM_HOSTNAME}/${EOS_ALTXS_TEST}/disabled_on_upload/altxs.dat
231-
fail_on_error check_checksums "${EOS_ALTXS_TEST}/disabled_on_upload/altxs.dat" "${TEST_FILE}" ""
248+
fail_on_error check_checksums "${EOS_ALTXS_TEST}/disabled_on_upload/altxs.dat" "${TEST_FILE}" ""
249+
250+
# Restore disk scanning to the default value
251+
disable_frequent_scanning

test/eos-fst-close-test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ test_read_xs_error() {
207207
echo "error: command output is \"${cp_output}\""
208208
fi
209209

210-
211210
# Read the file in reverse so that the checksum check on close gets triggered
212211
error_msg="error: close failed with retc=-1 errno=5"
213212
cp_output=$(exec_cmd eos-cli1 "xrdcpbackward ${EOS_MGM_URL}/${eos_fn} 2>&1 || true")

0 commit comments

Comments
 (0)