Skip to content

Commit b711215

Browse files
committed
chore: fix compat test
1 parent 0e19030 commit b711215

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

src/meta/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ TODO: xx is the version in which semaphore is added. update it when merged.
9191
| [1.1.32, 1.2.63) | |||||
9292
| [1.2.63, 1.2.226) | |||||
9393
| [1.2.226, 1.2.258) | |||||
94-
| [1.2.258, 1.2.663) | |||| |
95-
| [1.2.663, 1.2.677) | |||| |
96-
| [1.2.677, +∞) | || | ||
94+
| [1.2.258, 1.2.663) | |||| |
95+
| [1.2.663, 1.2.677) | |||| |
96+
| [1.2.677, +∞) | || | ||
9797

9898
History versions that are not included in the above chart:
9999

tests/compat/meta_meta/test_meta_meta.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ echo " === Bring up leader meta service, ver: $leader_meta_ver"
100100
bring_up_databend_meta "$leader_meta_ver" "1" --single
101101

102102
echo " === Feed data to leader"
103-
./bins/current/bin/databend-metabench \
103+
./bins/$leader_meta_ver/bin/databend-metabench \
104104
--rpc 'table_copy_file:{"file_cnt":5,"ttl_ms":86400999}' \
105105
--client 1 \
106106
--number 100 \
@@ -116,7 +116,7 @@ echo " === Leader status should contains snapshot state"
116116
curl -qs $(admin_addr 1)/v1/cluster/status
117117

118118
echo " === Feed more data to leader"
119-
./bins/current/bin/databend-metabench \
119+
./bins/$leader_meta_ver/bin/databend-metabench \
120120
--rpc 'table_copy_file:{"file_cnt":5,"ttl_ms":86400999}' \
121121
--client 1 \
122122
--number 100 \

tests/compat_fuse/util.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ run_test() {
125125
local query_old="./bins/$query_old_ver/bin/databend-query"
126126
local query_new="./bins/current/databend-query"
127127
local metasrv_old="./bins/$meta_ver/bin/databend-meta"
128+
local metasrv_current="./bins/current/bin/databend-meta"
128129
local sqllogictests="./bins/current/databend-sqllogictests"
129130

130131

@@ -174,19 +175,23 @@ run_test() {
174175
# run_logictest new_logictest/$query_new_ver fuse_compat_write
175176
$sqllogictests --handlers mysql --suites "$logictest_path" --run_file fuse_compat_write
176177

178+
# Always kill databend-meta and bring up the current version of databend-meta.
179+
# Because the current version query may not be compatible with the old version databend-meta.
180+
177181
kill_proc databend-query
182+
kill_proc databend-meta
178183

179184
if [ "$forward" == 'forward' ]
180185
then
181186
echo " === Start old databend-meta and databend-query..."
182187
log="query-old.log"
183-
start "" "$query_old" "$old_config_path" $log
188+
start "$metasrv_current" "$query_old" "$old_config_path" $log
184189
echo " === Run test: fuse_compat_read with old query"
185190
else
186191
echo ' === Start new databend-meta and databend-query...'
187192
config_path="scripts/ci/deploy/config/databend-query-node-1.toml"
188193
log="query-current.log"
189-
start "" $query_new $config_path $log
194+
start "$metasrv_current" $query_new $config_path $log
190195
echo " === Run test: fuse_compat_read with current query"
191196
fi
192197

0 commit comments

Comments
 (0)