Merge pull request #18 from y-trudeau/DISTMYSQL-226

Jira DISTMYSQL-226: added the parameter maxAllowedPacket=0 to force t…

Author: kamil-holubicki

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/cyberdelia/go-metrics-graphite v0.0.0-20161219230853-39f87cc3b432
 	github.com/fatih/color v1.10.0 // indirect
 	github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab
-	github.com/go-sql-driver/mysql v1.6.0
+	github.com/go-sql-driver/mysql v1.7.1
 	github.com/google/btree v1.0.0 // indirect
 	github.com/hashicorp/consul/api v1.7.0
 	github.com/hashicorp/go-cleanhttp v0.5.2-0.20190406162018-d3fcbee8e181 // indirect

go/config/config.go

@@ -103,6 +103,7 @@ type Configuration struct {
 	MySQLTopologySSLSkipVerify                 bool   // If true, do not strictly validate mutual TLS certs for Topology mysql instances
 	MySQLTopologyUseMutualTLS                  bool   // Turn on TLS authentication with the Topology MySQL instances
 	MySQLTopologyUseMixedTLS                   bool   // Mixed TLS and non-TLS authentication with the Topology MySQL instances
+	MySQLTopologyMaxAllowedPacket              int32  // max_allowed_packet value to use when connecting to the Topology mysql instance
 	TLSCacheTTLFactor                          uint   // Factor of InstancePollSeconds that we set as TLS info cache expiry
 	BackendDB                                  string // EXPERIMENTAL: type of backend db; either "mysql" or "sqlite3"
 	SQLite3DataFile                            string // when BackendDB == "sqlite3", full path to sqlite3 datafile
@@ -129,6 +130,7 @@ type Configuration struct {
 	MySQLOrchestratorUseMutualTLS              bool     // Turn on TLS authentication with the Orchestrator MySQL instance
 	MySQLOrchestratorReadTimeoutSeconds        int      // Number of seconds before backend mysql read operation is aborted (driver-side)
 	MySQLOrchestratorRejectReadOnly            bool     // Reject read only connections https://github.com/go-sql-driver/mysql#rejectreadonly
+	MySQLOrchestratorMaxAllowedPacket          int32    // max_allowed_packet to use when connecting to the Orchestrator mysql instance
 	MySQLConnectTimeoutSeconds                 int      // Number of seconds before connection is aborted (driver-side)
 	MySQLDiscoveryReadTimeoutSeconds           int      // Number of seconds before topology mysql read operation is aborted (driver-side). Used for discovery queries.
 	MySQLTopologyReadTimeoutSeconds            int      // Number of seconds before topology mysql read operation is aborted (driver-side). Used for all but discovery queries.
@@ -316,10 +318,12 @@ func newConfiguration() *Configuration {
 		MySQLOrchestratorPort:                      3306,
 		MySQLTopologyUseMutualTLS:                  false,
 		MySQLTopologyUseMixedTLS:                   true,
+		MySQLTopologyMaxAllowedPacket:              -1,
 		MySQLOrchestratorUseMutualTLS:              false,
 		MySQLConnectTimeoutSeconds:                 2,
 		MySQLOrchestratorReadTimeoutSeconds:        30,
 		MySQLOrchestratorRejectReadOnly:            false,
+		MySQLOrchestratorMaxAllowedPacket:          -1,
 		MySQLDiscoveryReadTimeoutSeconds:           10,
 		MySQLTopologyReadTimeoutSeconds:            600,
 		MySQLConnectionLifetimeSeconds:             0,

go/db/db.go

@@ -71,6 +71,9 @@ func getMySQLURI() string {
 	if config.Config.MySQLOrchestratorUseMutualTLS {
 		mysqlURI, _ = SetupMySQLOrchestratorTLS(mysqlURI)
 	}
+	if config.Config.MySQLOrchestratorMaxAllowedPacket >= 0 {
+		mysqlURI = fmt.Sprintf("%s&maxAllowedPacket=%d", mysqlURI, config.Config.MySQLOrchestratorMaxAllowedPacket)
+	}
 	return mysqlURI
 }
 
@@ -95,6 +98,9 @@ func openTopology(host string, port int, readTimeout int) (db *sql.DB, err error
 		readTimeout,
 	)
 
+	if config.Config.MySQLTopologyMaxAllowedPacket >= 0 {
+		mysqlURI = fmt.Sprintf("%s&maxAllowedPacket=%d", mysqlURI, config.Config.MySQLTopologyMaxAllowedPacket)
+	}
 	if config.Config.MySQLTopologyUseMutualTLS ||
 		(config.Config.MySQLTopologyUseMixedTLS && requiresTLS(host, port, mysql_uri)) {
 		if mysql_uri, err = SetupMySQLTopologyTLS(mysql_uri); err != nil {

tests/system/orchestrator-ci-system.conf.json

@@ -4,6 +4,7 @@
   "ListenAddress": ":3000",
   "MySQLTopologyUser": "ci",
   "MySQLTopologyPassword": "ci",
+  "MySQLTopologyMaxAllowedPacket": 67108864,
   "BackendDB": "sqlite",
   "SQLite3DataFile": "/tmp/orchestrator.sqlite3",
   "MySQLConnectTimeoutSeconds": 1,
@@ -12,6 +13,7 @@
   "InstancePollSeconds": 1,
   "HostnameResolveMethod": "none",
   "MySQLHostnameResolveMethod": "@@report_host",
+  "MySQLMaxAllowedPacket": 67108864,
   "SkipBinlogServerUnresolveCheck": true,
   "ExpiryHostnameResolvesMinutes": 60,
   "VerifyReplicationFilters": false,

vendor/modules.txt

@@ -18,7 +18,7 @@ github.com/fatih/color
 # github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab
 ## explicit
 github.com/go-martini/martini
-# github.com/go-sql-driver/mysql v1.6.0
+# github.com/go-sql-driver/mysql v1.7.1
 ## explicit
 github.com/go-sql-driver/mysql
 # github.com/google/btree v1.0.0