Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion concourse/scripts/pr.ent.bash
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ mc rb ${minio_server_alias}/txlog-${bucket_name} --force
set -e

echo "running mono_main,mono_basic"
./mtr --clean-txlog-bucket-restart --suite=mono_main,mono_basic --testcase-timeout=30 --bootstrap-defaults-file=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap.cnf
./mtr --clean-txlog-bucket-restart --suite=mono_main,mono_basic --testcase-timeout=30 --max-connect-retries=1000 --bootstrap-defaults-file=$WORKSPACE/eloqsql_pr/concourse/scripts/mtr_bootstrap.cnf

# Clean up minio buckets
echo "cleaning minio buckets"
Expand Down
2 changes: 1 addition & 1 deletion data_substrate
Submodule data_substrate updated 41 files
+13 −2 build_tx_service.cmake
+46 −0 core/src/tx_service_init.cpp
+22 −4 store_handler/bigtable_handler.cpp
+199 −161 store_handler/data_store_service_client.cpp
+46 −5 store_handler/data_store_service_client.h
+70 −0 store_handler/data_store_service_client_closure.cpp
+176 −8 store_handler/data_store_service_client_closure.h
+27 −12 store_handler/eloq_data_store_service/eloq_store_data_store.cpp
+1 −1 store_handler/eloq_data_store_service/eloqstore
+280 −6 store_handler/rocksdb_handler.cpp
+19 −6 store_handler/rocksdb_handler.h
+6 −0 tx_service/CMakeLists.txt
+7 −7 tx_service/include/cc/catalog_cc_map.h
+71 −1 tx_service/include/cc/cc_entry.h
+109 −6 tx_service/include/cc/cc_req_misc.h
+15 −42 tx_service/include/cc/cc_request.h
+24 −12 tx_service/include/cc/cc_shard.h
+132 −16 tx_service/include/cc/local_cc_shards.h
+46 −1 tx_service/include/cc/object_cc_map.h
+1 −1 tx_service/include/cc/range_cc_map.h
+3 −1 tx_service/include/cc/range_slice.h
+198 −129 tx_service/include/cc/template_cc_map.h
+7 −3 tx_service/include/fault/log_replay_service.h
+4 −0 tx_service/include/range_record.h
+1 −0 tx_service/include/read_write_entry.h
+27 −8 tx_service/include/store/data_store_handler.h
+29 −4 tx_service/include/store/int_mem_store.h
+10 −3 tx_service/include/tx_service.h
+15 −0 tx_service/include/type.h
+119 −13 tx_service/src/cc/cc_shard.cpp
+8 −5 tx_service/src/cc/local_cc_handler.cpp
+858 −488 tx_service/src/cc/local_cc_shards.cpp
+2 −2 tx_service/src/checkpointer.cpp
+32 −22 tx_service/src/fault/log_replay_service.cpp
+24 −0 tx_service/src/tx_index_operation.cpp
+106 −76 tx_service/src/tx_operation.cpp
+1 −0 tx_service/tests/CMakeLists.txt
+37 −13 tx_service/tests/CcPage-Test.cpp
+3,684 −0 tx_service/tests/LargeObjLRU-Test.cpp
+4 −0 tx_service/tests/StartTsCollector-Test.cpp
+25 −2 tx_service/tests/include/mock/mock_catalog_factory.h
11 changes: 11 additions & 0 deletions mysql-test/mariadb-test-run.pl
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ END
our $opt_check_testcases= 1;
my $opt_mark_progress;
my $opt_max_connections;
my $opt_max_connect_retries;
our $opt_report_times= 0;

my $opt_sleep;
Expand Down Expand Up @@ -1211,6 +1212,7 @@ sub command_line_setup {
'stop-file=s' => \$opt_stop_file,
'stop-keep-alive=i' => \$opt_stop_keep_alive,
'max-connections=i' => \$opt_max_connections,
'max-connect-retries=i' => \$opt_max_connect_retries,
'report-times' => \$opt_report_times,
'result-file' => \$opt_resfile,
'stress=s' => \$opt_stress,
Expand Down Expand Up @@ -5644,6 +5646,10 @@ ($$$)
mtr_add_arg($args, "--test-file=%s", "include/check-testcase.test");
mtr_add_arg($args, "--verbose");

if ( $opt_max_connect_retries ) {
mtr_add_arg($args, "--max-connect-retries=%d", $opt_max_connect_retries);
}

if ( $mode eq "before" )
{
mtr_add_arg($args, "--record");
Expand Down Expand Up @@ -5739,6 +5745,10 @@ ($)
mtr_add_arg($args, "--max-connections=%d", $opt_max_connections);
}

if ( $opt_max_connect_retries ) {
mtr_add_arg($args, "--max-connect-retries=%d", $opt_max_connect_retries);
}

if ( $opt_embedded_server )
{

Expand Down Expand Up @@ -6106,6 +6116,7 @@ ($)
timediff With --timestamp, also print time passed since
*previous* test started
max-connections=N Max number of open connection to server in mysqltest
max-connect-retries=N Max connection attempts in mysqltest (default 500)
report-times Report how much time has been spent on different
phases of test execution.
stress=ARGS Run stress test, providing options to
Expand Down