Merge pull request #5978 from sysown/agent/issue-5977-uds-compression

Fix compressed fast-forward connections over Unix sockets

Author: renecannao

lib/mysql_connection.cpp

@@ -1015,7 +1015,10 @@ void MySQL_Connection::connect_start() {
 		char* host_ip = connect_start_DNS_lookup();
 		async_exit_status=mysql_real_connect_start(&ret_mysql, mysql, host_ip, userinfo->username, auth_password, userinfo->schemaname, parent->port, NULL, client_flags);
 	} else {
-		client_flags &= ~(CLIENT_COMPRESS | CLIENT_ZSTD_COMPRESSION_ALGORITHM); // disabling compression for connections made via Unix socket
+		const bool fast_forward = myds && myds->sess && myds->sess->session_fast_forward;
+		if (!fast_forward) {
+			client_flags &= ~(CLIENT_COMPRESS | CLIENT_ZSTD_COMPRESSION_ALGORITHM); // disabling compression for regular connections made via Unix socket
+		}
 		async_exit_status=mysql_real_connect_start(&ret_mysql, mysql, "localhost", userinfo->username, auth_password, userinfo->schemaname, parent->port, parent->address, client_flags);
 	}
 	fd=mysql_get_socket(mysql);

test/infra/control/proxysql-ci.cnf

@@ -20,5 +20,5 @@ pgsql_variables=
 
 sqliteserver_variables=
 {
-    mysql_ifaces="0.0.0.0:6030"
+    mysql_ifaces="0.0.0.0:6030;/tmp/proxysql_sqlite.sock"
 }

test/tap/groups/groups.json

@@ -278,6 +278,7 @@
   "reg_test_5639_stmt_execute_max_allowed_packet-t" : [ "mysql84-g6","mysql95-g1" ],
   "reg_test_5766_libconfig_escape_passthrough-t" : [ "mysql95-g4" ],
   "reg_test_5790-mariadb_collation_255-t" : [ "mariadb10-galera-g1" ],
+  "reg_test_5977_fast_forward_unix_socket_compression-t" : [ "legacy-g9" ],
   "reg_test__ssl_client_busy_wait-t" : [ "legacy-g2","mysql-auto_increment_delay_multiplex=0-g2","mysql-multiplexing=false-g2","mysql-query_digests=0-g2","mysql-query_digests_keep_comment=1-g2","mysql84-g2","mysql90-g2","mysql95-g2" ],
   "reg_test_com_change_user_malformed_packet-t" : [ "mysql84-g6","mysql95-g1" ],
   "reg_test_compression_split_packets-t" : [ "legacy-g2","mysql-auto_increment_delay_multiplex=0-g2","mysql-multiplexing=false-g2","mysql-query_digests=0-g2","mysql-query_digests_keep_comment=1-g2","mysql84-g2","mysql90-g2","mysql95-g2" ],

test/tap/tap/utils.cpp

@@ -1650,6 +1650,13 @@ int extract_sqlite3_host_port(MYSQL* admin, std::pair<std::string, int>& host_po
 		return EXIT_FAILURE;
 	}
 
+	// The SQLite3 server may expose multiple listeners. Existing tests using
+	// this helper connect to the first TCP listener.
+	const std::string::size_type first_iface_end = sqlite3_ifaces.find(";");
+	if (first_iface_end != std::string::npos) {
+		sqlite3_ifaces.erase(first_iface_end);
+	}
+
 	// Extract the correct port to connect to SQLite server
 	std::string::size_type colon_pos = sqlite3_ifaces.find(":");
 	if (colon_pos == std::string::npos) {

test/tap/tests/modules_server_test.h

@@ -79,6 +79,13 @@ int extract_module_host_port(MYSQL* proxysql_admin, const std::string varname, s
 		return res;
 	}
 
+	// Module interfaces may contain multiple listeners. Existing tests using
+	// this helper connect to the first TCP listener.
+	const std::string::size_type first_iface_end = module_ifaces.find(";");
+	if (first_iface_end != std::string::npos) {
+		module_ifaces.erase(first_iface_end);
+	}
+
 	// Extract the correct port to connect to MODULE server
 	std::string::size_type colon_pos = module_ifaces.find(":");
 	if (colon_pos == std::string::npos) {

test/tap/tests/reg_test_5977_fast_forward_unix_socket_compression-t.cpp

@@ -0,0 +1,97 @@
+/**
+ * @file reg_test_5977_fast_forward_unix_socket_compression-t.cpp
+ * @brief Regression test for compressed fast-forward sessions using a Unix socket backend.
+ */
+
+#include <string>
+
+#include "mysql.h"
+
+#include "tap.h"
+#include "command_line.h"
+
+namespace {
+
+constexpr const char* TEST_USER = "issue5977";
+constexpr const char* TEST_PASSWORD = "issue5977";
+
+bool query(MYSQL* mysql, const std::string& sql) {
+	return mysql_query(mysql, sql.c_str()) == 0;
+}
+
+bool configure(MYSQL* admin) {
+	return
+		query(admin, "DELETE FROM mysql_servers WHERE hostgroup_id=5977") &&
+		query(admin,
+			"INSERT INTO mysql_servers "
+			"(hostgroup_id,hostname,port,status,compression,max_connections,comment) VALUES "
+			"(5977,'/tmp/proxysql_sqlite.sock',0,'ONLINE',0,10,'reg_test_5977')") &&
+		query(admin, "DELETE FROM mysql_users WHERE username='issue5977'") &&
+		query(admin,
+			"INSERT INTO mysql_users "
+			"(username,password,active,default_hostgroup,fast_forward,backend,frontend,comment) VALUES "
+			"('issue5977','issue5977',1,5977,1,1,1,'reg_test_5977')") &&
+		query(admin, "LOAD MYSQL SERVERS TO RUNTIME") &&
+		query(admin, "LOAD MYSQL USERS TO RUNTIME");
+}
+
+void cleanup(MYSQL* admin) {
+	query(admin, "DELETE FROM mysql_servers WHERE hostgroup_id=5977");
+	query(admin, "DELETE FROM mysql_users WHERE username='issue5977'");
+	query(admin, "LOAD MYSQL SERVERS TO RUNTIME");
+	query(admin, "LOAD MYSQL USERS TO RUNTIME");
+}
+
+} // namespace
+
+int main(int argc, char** argv) {
+	CommandLine cl;
+
+	if (cl.getEnv()) {
+		diag("Failed to get the required environmental variables.");
+		return EXIT_FAILURE;
+	}
+
+	plan(3);
+
+	MYSQL* admin = mysql_init(nullptr);
+	const bool admin_connected = admin && mysql_real_connect(
+		admin, cl.host, cl.admin_username, cl.admin_password, nullptr, cl.admin_port, nullptr, 0
+	);
+	ok(admin_connected, "ProxySQL Admin connection succeeds");
+
+	bool configured = false;
+	if (admin_connected) {
+		configured = configure(admin);
+	}
+	ok(configured, "SQLite3 Unix-socket backend and fast-forward user are configured");
+
+	MYSQL* proxy = mysql_init(nullptr);
+	const bool compression_enabled = proxy && mysql_options(proxy, MYSQL_OPT_COMPRESS, nullptr) == 0;
+	MYSQL* connected = (configured && compression_enabled)
+		? mysql_real_connect(proxy, cl.host, TEST_USER, TEST_PASSWORD, nullptr, cl.port, nullptr, CLIENT_COMPRESS)
+		: nullptr;
+
+	bool query_ok = false;
+	if (connected && mysql_query(proxy, "SELECT 'fast-forward-unix-socket-compression'") == 0) {
+		MYSQL_RES* result = mysql_store_result(proxy);
+		MYSQL_ROW row = result ? mysql_fetch_row(result) : nullptr;
+		query_ok = row && row[0] && std::string(row[0]) == "fast-forward-unix-socket-compression";
+		if (result) {
+			mysql_free_result(result);
+		}
+	}
+	ok(query_ok, "compressed fast-forward query returns the SQLite3 backend result");
+
+	if (proxy) {
+		mysql_close(proxy);
+	}
+	if (admin_connected) {
+		cleanup(admin);
+	}
+	if (admin) {
+		mysql_close(admin);
+	}
+
+	return exit_status();
+}