Added Config variables for max_allowed_packet, by default the current behavior is used

Author: Yves Trudeau

docker/Dockerfile.system

@@ -8,7 +8,7 @@ RUN echo "ci_env_repo: $ci_env_repo"
 RUN echo "ci_env_branch: $ci_env_branch"
 
 RUN apt-get update -q -y
-RUN apt-get install -y sudo haproxy python git jq rsync libaio1 libnuma1 default-mysql-client bsdmainutils less vim
+RUN apt-get install -y sudo haproxy python git jq rsync libaio1 libnuma1 default-mysql-client bsdmainutils less vim libncurses5
 
 RUN mkdir /orchestrator
 WORKDIR /orchestrator

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

@@ -58,7 +58,7 @@ func getMySQLURI() string {
 	if mysqlURI != "" {
 		return mysqlURI
 	}
-	mysqlURI := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?maxAllowedPacket=0&timeout=%ds&readTimeout=%ds&rejectReadOnly=%t&interpolateParams=true",
+	mysqlURI := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?timeout=%ds&readTimeout=%ds&rejectReadOnly=%t&interpolateParams=true",
 		config.Config.MySQLOrchestratorUser,
 		config.Config.MySQLOrchestratorPassword,
 		config.Config.MySQLOrchestratorHost,
@@ -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 {