Skip to content

Commit 26c74c1

Browse files
author
Yves Trudeau
committed
In order to automatically test the new variables, the simplest/only solution is to add them to the orchestrator-ci-system.conf.json file that is used by the docker subsystem and by jenkins.
1 parent 52f1350 commit 26c74c1

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

go/db/db.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func getMySQLURI() string {
7272
mysqlURI, _ = SetupMySQLOrchestratorTLS(mysqlURI)
7373
}
7474
if config.Config.MySQLOrchestratorMaxAllowedPacket >= 0 {
75-
mysqlURI = fmt.Sprintf("%s&maxAllowedPacket=%d",mysqlURI,config.Config.MySQLOrchestratorMaxAllowedPacket)
75+
mysqlURI = fmt.Sprintf("%s&maxAllowedPacket=%d", mysqlURI, config.Config.MySQLOrchestratorMaxAllowedPacket)
7676
}
7777
return mysqlURI
7878
}
@@ -99,7 +99,7 @@ func openTopology(host string, port int, readTimeout int) (db *sql.DB, err error
9999
)
100100

101101
if config.Config.MySQLTopologyMaxAllowedPacket >= 0 {
102-
mysqlURI = fmt.Sprintf("%s&maxAllowedPacket=%d",mysqlURI,config.Config.MySQLTopologyMaxAllowedPacket)
102+
mysqlURI = fmt.Sprintf("%s&maxAllowedPacket=%d", mysqlURI, config.Config.MySQLTopologyMaxAllowedPacket)
103103
}
104104
if config.Config.MySQLTopologyUseMutualTLS ||
105105
(config.Config.MySQLTopologyUseMixedTLS && requiresTLS(host, port, mysql_uri)) {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"ListenAddress": ":3000",
55
"MySQLTopologyUser": "ci",
66
"MySQLTopologyPassword": "ci",
7+
"MySQLTopologyMaxAllowedPacket": 67108864,
78
"BackendDB": "sqlite",
89
"SQLite3DataFile": "/tmp/orchestrator.sqlite3",
910
"MySQLConnectTimeoutSeconds": 1,
@@ -12,6 +13,7 @@
1213
"InstancePollSeconds": 1,
1314
"HostnameResolveMethod": "none",
1415
"MySQLHostnameResolveMethod": "@@report_host",
16+
"MySQLMaxAllowedPacket": 67108864,
1517
"SkipBinlogServerUnresolveCheck": true,
1618
"ExpiryHostnameResolvesMinutes": 60,
1719
"VerifyReplicationFilters": false,

0 commit comments

Comments
 (0)