From 6e6ab0764207c8a4e56930ded29774a0c747629b Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Tue, 21 May 2019 13:21:23 +0300 Subject: [PATCH 1/4] Make .ssh/id_rsa.pub default source of public keys for VMs 'build' and 'run_test' copies public ssh keys to all created VMs Legacy code takes keys from different locations, e.g. ~/build-scripts/team_keys which causes errors due to lack of such files. Now public keys goes from file defined on or if not defined from .ssh/id_rsa.pub of current host machine --- BUILD/mdbci/build.sh | 4 ++-- maxscale-system-test/mdbci/set_run_test_variables.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BUILD/mdbci/build.sh b/BUILD/mdbci/build.sh index 0b45af572..3a11f13e3 100755 --- a/BUILD/mdbci/build.sh +++ b/BUILD/mdbci/build.sh @@ -29,6 +29,7 @@ export platform=`${mdbci_dir}/mdbci show boxinfo --box-name=$box --field='platfo export platform_version=`${mdbci_dir}/mdbci show boxinfo --box-name=$box --field='platform_version' --silent` export dist_sfx="$platform"."$platform_version" export cmake_flags="${cmake_flags} -DPACKAGE=Y -DDISTRIB_SUFFIX=${dist_sfx}" +export team_keys=${team_keys:-${HOME}/.ssh/id_rsa.pub} # prerare VM export provider=`${mdbci_dir}/mdbci show provider $box --silent 2> /dev/null` @@ -73,8 +74,7 @@ $(<${script_dir}/templates/build.json.template) exit 1 fi echo "copying public keys to VM" - cp ~/build-scripts/team_keys . - ${mdbci_dir}/mdbci public_keys --key team_keys --silent $name + ${mdbci_dir}/mdbci public_keys --key ${team_keys} --silent $name fi echo "Get VM info" diff --git a/maxscale-system-test/mdbci/set_run_test_variables.sh b/maxscale-system-test/mdbci/set_run_test_variables.sh index 8a1a323c3..a58e9d7b2 100644 --- a/maxscale-system-test/mdbci/set_run_test_variables.sh +++ b/maxscale-system-test/mdbci/set_run_test_variables.sh @@ -9,7 +9,7 @@ export PATH=$PATH:$HOME/mdbci/ export JOB_NAME=${JOB_NAME:-"local_test"} export BUILD_NUMBER=${BUILD_NUMBER:-`date '+%Y%m%d%H%M'`} export BUILD_TAG=${BUILD_TAG:-jenkins-${JOB_NAME}-${BUILD_NUMBER}} -export team_keys=${team_keys:-${HOME}/team_keys} +export team_keys=${team_keys:-${HOME}/.ssh/id_rsa.pub} export do_not_destroy_vm=${do_not_destroy_vm:-"yes"} #export test_set=${test_set:-"-LE UNSTABLE"} export test_set=${test_set:-"-I 1,5"} From 387bf0ccc29115ac8a50222e497a4d35bc527fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 24 May 2019 14:28:38 +0300 Subject: [PATCH 2/4] MXS-2507: Fix avrorouter token processing The token comparison function did the comparison wrong: The token needs to be an exact match instead of a partial one. --- server/modules/routing/avrorouter/avro_schema.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/modules/routing/avrorouter/avro_schema.c b/server/modules/routing/avrorouter/avro_schema.c index 45360ae71..76c72bfd2 100644 --- a/server/modules/routing/avrorouter/avro_schema.c +++ b/server/modules/routing/avrorouter/avro_schema.c @@ -1273,7 +1273,7 @@ static bool token_is_keyword(const char* tok, int len) { for (int i = 0; keywords[i]; i++) { - if (strncasecmp(keywords[i], tok, len) == 0) + if (strncasecmp(keywords[i], tok, len) == 0 && strlen(keywords[i]) == len) { return true; } From 3721d6abf2abde17afa750a0e99e35ac05113e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Mon, 27 May 2019 15:07:35 +0300 Subject: [PATCH 3/4] MXS-2507: Check stored integer size If the avro block is smaller than the size of the stored data, the file was created with a block size that was too small. Even the reference Avro implementation can't read the file in this case. --- avro/maxavro.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/avro/maxavro.c b/avro/maxavro.c index 8523ad307..c09752acc 100644 --- a/avro/maxavro.c +++ b/avro/maxavro.c @@ -143,13 +143,20 @@ char* maxavro_read_string(MAXAVRO_FILE* file, size_t* size) if (maxavro_read_integer(file, &len)) { - key = MXS_MALLOC(len + 1); - if (key) + if (file->buffer_ptr + len < file->buffer_end) { - memcpy(key, file->buffer_ptr, len); - key[len] = '\0'; - file->buffer_ptr += len; - *size = len; + key = MXS_MALLOC(len + 1); + if (key) + { + memcpy(key, file->buffer_ptr, len); + key[len] = '\0'; + file->buffer_ptr += len; + *size = len; + } + else + { + file->last_error = MAXAVRO_ERR_MEMORY; + } } else { From edb669100db6e4883ab5cb268c29aaa13850d9aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 28 May 2019 12:43:36 +0300 Subject: [PATCH 4/4] MXS-2511: Update connector-c Updated to 3.0.10. --- cmake/BuildMariaDBConnector.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/BuildMariaDBConnector.cmake b/cmake/BuildMariaDBConnector.cmake index 3fa32ae54..badac78cb 100644 --- a/cmake/BuildMariaDBConnector.cmake +++ b/cmake/BuildMariaDBConnector.cmake @@ -9,7 +9,7 @@ set(MARIADB_CONNECTOR_C_REPO "https://github.com/MariaDB/mariadb-connector-c.git CACHE STRING "MariaDB Connector-C Git repository") # Connector-C tag to use -set(MARIADB_CONNECTOR_C_TAG "v3.0.6" +set(MARIADB_CONNECTOR_C_TAG "v3.0.10" CACHE STRING "MariaDB Connector-C Git tag") ExternalProject_Add(connector-c