Two Improvements to tools/check_format_compatible.sh (#6702)
Summary: Improve it in two ways: 1. tools/check_format_compatible.sh is not friendly to run outside FB environment. remove the hard-coded http proxy setting. Instead, move it to Legocastle configuration 2. Always disable warning as error, so that older build is more likely to pass. Pull Request resolved: https://github.com/facebook/rocksdb/pull/6702 Test Plan: Run the test and make sure at least it doesn't break. Reviewed By: riversand963 Differential Revision: D21033329 fbshipit-source-id: 88b4ec1ec49547b772790050a165466bdc4a62a0
This commit is contained in:
parent
234e2ed5b6
commit
165560fb32
@ -818,6 +818,8 @@ run_format_compatible()
|
|||||||
rm -rf /dev/shm/rocksdb
|
rm -rf /dev/shm/rocksdb
|
||||||
mkdir /dev/shm/rocksdb
|
mkdir /dev/shm/rocksdb
|
||||||
|
|
||||||
|
export https_proxy="fwdproxy:8080"
|
||||||
|
|
||||||
tools/check_format_compatible.sh
|
tools/check_format_compatible.sh
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -108,15 +108,15 @@ ingest_external_sst()
|
|||||||
# Remote add may fail if added previously (we don't cleanup).
|
# Remote add may fail if added previously (we don't cleanup).
|
||||||
git remote add github_origin "https://github.com/facebook/rocksdb.git"
|
git remote add github_origin "https://github.com/facebook/rocksdb.git"
|
||||||
set -e
|
set -e
|
||||||
https_proxy="fwdproxy:8080" git fetch github_origin
|
git fetch github_origin
|
||||||
|
|
||||||
# Compatibility test for external SST file ingestion
|
# Compatibility test for external SST file ingestion
|
||||||
for checkout_obj in "${extern_sst_ingestion_compatible_checkout_objs[@]}"
|
for checkout_obj in "${extern_sst_ingestion_compatible_checkout_objs[@]}"
|
||||||
do
|
do
|
||||||
echo == Generating DB with extern SST file in "$checkout_obj" ...
|
echo == Generating DB with extern SST file in "$checkout_obj" ...
|
||||||
https_proxy="fwdproxy:8080" git checkout github_origin/$checkout_obj -b $checkout_obj
|
git checkout github_origin/$checkout_obj -b $checkout_obj
|
||||||
make clean
|
make clean
|
||||||
make ldb -j32
|
DISABLE_WARNING_AS_ERROR=1 make ldb -j32
|
||||||
write_external_sst $input_data_path $test_dir/$checkout_obj $test_dir/$checkout_obj
|
write_external_sst $input_data_path $test_dir/$checkout_obj $test_dir/$checkout_obj
|
||||||
ingest_external_sst $test_dir/$checkout_obj $test_dir/$checkout_obj
|
ingest_external_sst $test_dir/$checkout_obj $test_dir/$checkout_obj
|
||||||
done
|
done
|
||||||
@ -124,9 +124,9 @@ done
|
|||||||
checkout_flag=${1:-"master"}
|
checkout_flag=${1:-"master"}
|
||||||
|
|
||||||
echo == Building $checkout_flag debug
|
echo == Building $checkout_flag debug
|
||||||
https_proxy="fwdproxy:8080" git checkout github_origin/$checkout_flag -b tmp-$checkout_flag
|
git checkout github_origin/$checkout_flag -b tmp-$checkout_flag
|
||||||
make clean
|
make clean
|
||||||
make ldb -j32
|
DISABLE_WARNING_AS_ERROR=1 make ldb -j32
|
||||||
compare_base_db_dir=$test_dir"/base_db_dir"
|
compare_base_db_dir=$test_dir"/base_db_dir"
|
||||||
write_external_sst $input_data_path $compare_base_db_dir $compare_base_db_dir
|
write_external_sst $input_data_path $compare_base_db_dir $compare_base_db_dir
|
||||||
ingest_external_sst $compare_base_db_dir $compare_base_db_dir
|
ingest_external_sst $compare_base_db_dir $compare_base_db_dir
|
||||||
@ -136,7 +136,7 @@ do
|
|||||||
echo == Build "$checkout_obj" and try to open DB generated using $checkout_flag
|
echo == Build "$checkout_obj" and try to open DB generated using $checkout_flag
|
||||||
git checkout $checkout_obj
|
git checkout $checkout_obj
|
||||||
make clean
|
make clean
|
||||||
make ldb -j32
|
DISABLE_WARNING_AS_ERROR=1 make ldb -j32
|
||||||
compare_db $test_dir/$checkout_obj $compare_base_db_dir db_dump.txt 1 1
|
compare_db $test_dir/$checkout_obj $compare_base_db_dir db_dump.txt 1 1
|
||||||
git checkout tmp-$checkout_flag
|
git checkout tmp-$checkout_flag
|
||||||
# Clean up
|
# Clean up
|
||||||
@ -148,9 +148,9 @@ echo == Finish compatibility test for SST ingestion.
|
|||||||
for checkout_obj in "${checkout_objs[@]}"
|
for checkout_obj in "${checkout_objs[@]}"
|
||||||
do
|
do
|
||||||
echo == Generating DB from "$checkout_obj" ...
|
echo == Generating DB from "$checkout_obj" ...
|
||||||
https_proxy="fwdproxy:8080" git checkout github_origin/$checkout_obj -b $checkout_obj
|
git checkout github_origin/$checkout_obj -b $checkout_obj
|
||||||
make clean
|
make clean
|
||||||
make ldb -j32
|
DISABLE_WARNING_AS_ERROR=1 make ldb -j32
|
||||||
generate_db $input_data_path $test_dir/$checkout_obj
|
generate_db $input_data_path $test_dir/$checkout_obj
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -159,7 +159,7 @@ checkout_flag=${1:-"master"}
|
|||||||
echo == Building $checkout_flag debug
|
echo == Building $checkout_flag debug
|
||||||
git checkout tmp-$checkout_flag
|
git checkout tmp-$checkout_flag
|
||||||
make clean
|
make clean
|
||||||
make ldb -j32
|
DISABLE_WARNING_AS_ERROR=1 make ldb -j32
|
||||||
compare_base_db_dir=$test_dir"/base_db_dir"
|
compare_base_db_dir=$test_dir"/base_db_dir"
|
||||||
echo == Generate compare base DB to $compare_base_db_dir
|
echo == Generate compare base DB to $compare_base_db_dir
|
||||||
generate_db $input_data_path $compare_base_db_dir
|
generate_db $input_data_path $compare_base_db_dir
|
||||||
@ -175,7 +175,7 @@ do
|
|||||||
echo == Build "$checkout_obj" and try to open DB generated using $checkout_flag...
|
echo == Build "$checkout_obj" and try to open DB generated using $checkout_flag...
|
||||||
git checkout $checkout_obj
|
git checkout $checkout_obj
|
||||||
make clean
|
make clean
|
||||||
make ldb -j32
|
DISABLE_WARNING_AS_ERROR=1 make ldb -j32
|
||||||
compare_db $test_dir/$checkout_obj $compare_base_db_dir forward_${checkout_obj}_dump.txt 0
|
compare_db $test_dir/$checkout_obj $compare_base_db_dir forward_${checkout_obj}_dump.txt 0
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -184,7 +184,7 @@ do
|
|||||||
echo == Build "$checkout_obj" and try to open DB generated using $checkout_flag with its options...
|
echo == Build "$checkout_obj" and try to open DB generated using $checkout_flag with its options...
|
||||||
git checkout $checkout_obj
|
git checkout $checkout_obj
|
||||||
make clean
|
make clean
|
||||||
make ldb -j32
|
DISABLE_WARNING_AS_ERROR=1 make ldb -j32
|
||||||
compare_db $test_dir/$checkout_obj $compare_base_db_dir forward_${checkout_obj}_dump.txt 1 1
|
compare_db $test_dir/$checkout_obj $compare_base_db_dir forward_${checkout_obj}_dump.txt 1 1
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user