Skip to content

Commit 5f0c42c

Browse files
yutaro-sakamotoyutaro-sakamoto
authored
Fix flaky indexed lock (#695)
* feat: set file status 92 when opening old files * fix: set file status 92 correctly * tests: add tests for opening old indexed files * test: fix flaky tests
1 parent f2d31fd commit 5f0c42c

File tree

11 files changed

+22
-22
lines changed

11 files changed

+22
-22
lines changed

‎tests/indexed-lock.src/access-different-record.at‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ function run_test() {
134134
rm -f playground-record-lock-*
135135

136136
if test "$OPERATION2" == "$OPERATION_WRITE"; then
137-
java ${PROGRAM_ID_TABLE1_FOR_WRITE@<:@$OPERATION1@:>@} > prog1.log &
137+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE1_FOR_WRITE@<:@$OPERATION1@:>@} > prog1.log &
138138
else
139-
java ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
139+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
140140
fi
141141
PID1=$!
142-
java ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
142+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
143143
PID2=$!
144144

145145
wait $PID1 $PID2

‎tests/indexed-lock.src/access-same-record.at‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ function run_test() {
112112

113113
rm -f playground-record-lock-*
114114

115-
java ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
115+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
116116
PID1=$!
117-
java ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
117+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
118118
PID2=$!
119119

120120
wait $PID1 $PID2

‎tests/indexed-lock.src/file-lock.at‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,12 @@ function run_test() {
189189

190190
cobj ${PROGRAM_NAME_1}.cbl ${PROGRAM_NAME_2}.cbl make_indexed_file${TEST_ID}.cbl
191191

192-
java make_indexed_file${TEST_ID}
192+
java -Xlog:perf+memops=off make_indexed_file${TEST_ID}
193193

194-
java $PROGRAM_NAME_1 &
194+
java -Xlog:perf+memops=off $PROGRAM_NAME_1 &
195195
PID1=$!
196196

197-
java $PROGRAM_NAME_2 > ${TEST_ID}.log &
197+
java -Xlog:perf+memops=off $PROGRAM_NAME_2 > ${TEST_ID}.log &
198198
PID2=$!
199199

200200
wait $PID1 $PID2

‎tests/indexed-lock.src/input-mode.at‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ function run_test() {
106106

107107
rm -f playground-record-lock-*
108108

109-
java ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
109+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
110110
PID1=$!
111-
java ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
111+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
112112
PID2=$!
113113

114114
wait $PID1 $PID2

‎tests/indexed-lock.src/lock-mode-automatic.at‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ function run_test() {
119119

120120
rm -f playground-record-lock-* f.dat pro1.log prog2.log
121121

122-
java ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
122+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
123123
PID1=$!
124-
java ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
124+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
125125
PID2=$!
126126

127127
wait $PID1 $PID2

‎tests/indexed-lock.src/lock-mode-clause.at‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ function run_test() {
120120

121121
rm -f playground-record-lock-* f.dat pro1.log prog2.log
122122

123-
java ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
123+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
124124
PID1=$!
125-
java ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
125+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
126126
PID2=$!
127127

128128
wait $PID1 $PID2

‎tests/indexed-lock.src/old-file.at‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ AT_DATA([open_file_status.at], [
4444

4545
AT_CHECK([${COBJ} open_file_status.at])
4646
AT_CHECK([cp ../../indexed-lock.src/indexed-file/old_indexed_file.dat indexed_file.dat])
47-
AT_CHECK([java open_file_status], [0],
47+
AT_CHECK([java -Xlog:perf+memops=off open_file_status], [0],
4848
[92
4949
92
5050
92

‎tests/indexed-lock.src/open-input.at‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ function run_test() {
115115

116116
rm -f playground-record-lock-* f.dat pro1.log prog2.log
117117

118-
java ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
118+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
119119
PID1=$!
120-
java ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
120+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
121121
PID2=$!
122122

123123
wait $PID1 $PID2

‎tests/indexed-lock.src/open-start-write-rewrite.at‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ function run_test() {
124124

125125
rm -f playground-record-lock-* f.dat pro1.log prog2.log
126126

127-
java ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
127+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
128128
PID1=$!
129-
java ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
129+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
130130
PID2=$!
131131

132132
wait $PID1 $PID2

‎tests/indexed-lock.src/release-lock.at‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ function run_test() {
133133

134134
rm -f playground-record-lock-* f.dat pro1.log prog2.log
135135

136-
java ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
136+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE1@<:@$OPERATION1@:>@} > prog1.log &
137137
PID1=$!
138-
java ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
138+
java -Xlog:perf+memops=off ${PROGRAM_ID_TABLE2@<:@$OPERATION2@:>@} > prog2.log &
139139
PID2=$!
140140

141141
wait $PID1 $PID2

0 commit comments

Comments
 (0)