Skip to content

Fix regression introduced by #5326#5704

Merged
morgo merged 1 commit intovitessio:masterfrom
planetscale:morgo-fix-5326-regression
Jan 13, 2020
Merged

Fix regression introduced by #5326#5704
morgo merged 1 commit intovitessio:masterfrom
planetscale:morgo-fix-5326-regression

Conversation

@morgo
Copy link
Copy Markdown
Contributor

@morgo morgo commented Jan 13, 2020

As part of refactoring, #5326 changed the config files so that MySQL would not overwrite a default if one was set. With the binary log enabled in MySQL 8.0, it moved the log-bin directive into the per-version config files, since this was no longer a var that needs to change in all versions.

This logic was incorrect for two reasons

  • Despite it being enabled in 8.0, it still needed to set a BinLogPath.
  • The BinLogPath was not set in any of the per-version configs.

Thus, this has been moved back to a global variable, that applies for all versions.

Signed-off-by: Morgan Tocker tocker@gmail.com

Signed-off-by: Morgan Tocker <tocker@gmail.com>
@morgo morgo requested a review from sougou as a code owner January 13, 2020 20:04
@morgo
Copy link
Copy Markdown
Contributor Author

morgo commented Jan 13, 2020

The MySQL 8.0 unit test was disabled today (due to 8.0.19 release breaking our install). Here is the result of a manual unit test (success):

morgo@ryzen:~/vitess$ make test
Mon Jan 13 13:05:56 MST 2020: Building source tree
Mon Jan 13 13:06:04 MST 2020: Running unit tests
ok  	vitess.io/vitess/go/acl	0.033s
ok  	vitess.io/vitess/go/bucketpool	0.257s
ok  	vitess.io/vitess/go/bytes2	0.023s
ok  	vitess.io/vitess/go/cache	0.030s
ok  	vitess.io/vitess/go/cmd/vtclient	16.888s
ok  	vitess.io/vitess/go/cmd/vtgateclienttest/grpcclienttest	0.194s
ok  	vitess.io/vitess/go/cmd/vttestserver	46.055s
ok  	vitess.io/vitess/go/event	0.043s
ok  	vitess.io/vitess/go/event/syslogger	0.035s
ok  	vitess.io/vitess/go/exit	0.007s
ok  	vitess.io/vitess/go/fileutil	0.017s
ok  	vitess.io/vitess/go/flagutil	0.026s
ok  	vitess.io/vitess/go/hack	0.040s
ok  	vitess.io/vitess/go/history	0.019s
ok  	vitess.io/vitess/go/ioutil2	0.070s
ok  	vitess.io/vitess/go/json2	0.032s
ok  	vitess.io/vitess/go/memcache	0.032s
ok  	vitess.io/vitess/go/mysql	4.978s
ok  	vitess.io/vitess/go/mysql/ldapauthserver	0.025s
ok  	vitess.io/vitess/go/netutil	0.526s
ok  	vitess.io/vitess/go/ratelimiter	0.026s
ok  	vitess.io/vitess/go/sqlescape	0.038s
ok  	vitess.io/vitess/go/sqltypes	0.034s
ok  	vitess.io/vitess/go/stats	0.035s
ok  	vitess.io/vitess/go/stats/opentsdb	0.043s
ok  	vitess.io/vitess/go/stats/prometheusbackend	0.142s
ok  	vitess.io/vitess/go/trace	0.042s
ok  	vitess.io/vitess/go/vt/automation	0.082s
ok  	vitess.io/vitess/go/vt/binlog/binlogplayer	0.085s
ok  	vitess.io/vitess/go/vt/binlog	0.077s
ok  	vitess.io/vitess/go/vt/binlog/eventtoken	0.014s
ok  	vitess.io/vitess/go/vt/binlog/grpcbinlogplayer	0.076s
ok  	vitess.io/vitess/go/vt/callerid/testsuite	0.034s
ok  	vitess.io/vitess/go/vt/dbconfigs	0.239s
ok  	vitess.io/vitess/go/vt/dtids	0.020s
ok  	vitess.io/vitess/go/vt/env	0.028s
ok  	vitess.io/vitess/go/vt/events	0.036s
ok  	vitess.io/vitess/go/vt/health	0.029s
ok  	vitess.io/vitess/go/vt/key	0.035s
ok  	vitess.io/vitess/go/vt/mysqlctl	0.101s
ok  	vitess.io/vitess/go/vt/mysqlctl/filebackupstorage	0.020s
ok  	vitess.io/vitess/go/vt/mysqlctl/tmutils	0.032s
ok  	vitess.io/vitess/go/vt/schemamanager	0.101s
ok  	vitess.io/vitess/go/vt/servenv	0.113s
ok  	vitess.io/vitess/go/vt/sqlannotation	0.015s
ok  	vitess.io/vitess/go/vt/sqlparser	2.064s
ok  	vitess.io/vitess/go/vt/srvtopo	1.424s
ok  	vitess.io/vitess/go/vt/tableacl	0.043s
ok  	vitess.io/vitess/go/vt/tableacl/simpleacl	0.065s
ok  	vitess.io/vitess/go/vt/throttler	0.099s
ok  	vitess.io/vitess/go/vt/throttler/grpcthrottlerclient	0.054s
ok  	vitess.io/vitess/go/vt/tlstest	5.653s
ok  	vitess.io/vitess/go/vt/topo	0.047s
ok  	vitess.io/vitess/go/vt/topo/etcd2topo	5.680s
ok  	vitess.io/vitess/go/vt/topo/events	0.036s
ok  	vitess.io/vitess/go/vt/topo/helpers	0.081s
ok  	vitess.io/vitess/go/vt/topo/memorytopo	0.056s
ok  	vitess.io/vitess/go/vt/topotools/events	0.040s
ok  	vitess.io/vitess/go/vt/topotools	0.114s
ok  	vitess.io/vitess/go/vt/topo/topoproto	0.034s
ok  	vitess.io/vitess/go/vt/topo/topotests	0.068s
ok  	vitess.io/vitess/go/vt/topo/zk2topo	6.364s
ok  	vitess.io/vitess/go/vt/vitessdriver	0.096s
ok  	vitess.io/vitess/go/vt/vtctld	0.078s
ok  	vitess.io/vitess/go/vt/vtctl/fakevtctlclient	0.045s
ok  	vitess.io/vitess/go/vt/vtctl/grpcvtctlclient	0.117s
ok  	vitess.io/vitess/go/vt/vtctl	0.042s
ok  	vitess.io/vitess/go/vt/vterrors	0.031s
ok  	vitess.io/vitess/go/vt/vtgate	3.893s
ok  	vitess.io/vitess/go/vt/vtgate/buffer	0.284s
ok  	vitess.io/vitess/go/vt/vtgate/engine	0.030s
ok  	vitess.io/vitess/go/vt/vtgate/gateway	0.019s
ok  	vitess.io/vitess/go/vt/vtgate/gatewaytest	0.191s
ok  	vitess.io/vitess/go/vt/vtgate/grpcvtgateconn	0.219s
ok  	vitess.io/vitess/go/vt/vtgate/grpcvtgateservice	0.037s
ok  	vitess.io/vitess/go/vt/vtgate/planbuilder	0.293s
ok  	vitess.io/vitess/go/vt/vtgate/vindexes	0.020s
ok  	vitess.io/vitess/go/vt/vtgate/vschemaacl	0.047s
ok  	vitess.io/vitess/go/vt/vtgate/vtgateconn	0.045s
ok  	vitess.io/vitess/go/vt/vttablet/customrule/filecustomrule	0.021s
ok  	vitess.io/vitess/go/vt/vttablet/customrule/topocustomrule	0.112s
ok  	vitess.io/vitess/go/vt/vttablet/filelogger	0.063s
ok  	vitess.io/vitess/go/vt/vttablet/grpctabletconn	0.163s
ok  	vitess.io/vitess/go/vt/vttablet/grpctmserver	0.138s
ok  	vitess.io/vitess/go/vt/vttablet/heartbeat	1.037s
ok  	vitess.io/vitess/go/vt/vttablet/sysloglogger	0.042s
ok  	vitess.io/vitess/go/vt/vttablet/tabletconn	0.051s
ok  	vitess.io/vitess/go/vt/vttablet/tabletmanager	0.140s
ok  	vitess.io/vitess/go/vt/vttablet/tabletserver/connpool	0.436s
ok  	vitess.io/vitess/go/vt/vttablet/tabletserver/messager	2.643s
ok  	vitess.io/vitess/go/vt/vttablet/tabletserver/planbuilder	0.088s
ok  	vitess.io/vitess/go/vt/vttablet/tabletserver/rules	0.058s
ok  	vitess.io/vitess/go/vt/vttablet/tabletserver/schema	2.811s
ok  	vitess.io/vitess/go/vt/vttablet/tabletserver/splitquery	0.046s
ok  	vitess.io/vitess/go/vt/vttablet/tabletserver/tabletenv	0.016s
ok  	vitess.io/vitess/go/vt/vttablet/tabletserver/txlimiter	0.022s
ok  	vitess.io/vitess/go/vt/vttablet/tabletserver/txserializer	0.037s
ok  	vitess.io/vitess/go/vt/vttablet/tabletserver/txthrottler	0.021s
ok  	vitess.io/vitess/go/vt/vttablet/tabletserver/vstreamer	30.711s
ok  	vitess.io/vitess/go/vt/vttime	0.012s
ok  	vitess.io/vitess/go/vt/worker/events	0.020s
ok  	vitess.io/vitess/go/vt/worker/grpcvtworkerclient	0.048s
ok  	vitess.io/vitess/go/vt/workflow	0.018s
ok  	vitess.io/vitess/go/vt/workflow/resharding	0.032s
ok  	vitess.io/vitess/go/vt/workflow/topovalidator	0.011s
ok  	vitess.io/vitess/go/vt/wrangler	2.337s
ok  	vitess.io/vitess/go/vt/zkctl	4.200s
# Flaky tests (3 attempts permitted)
ok  	vitess.io/vitess/go/pools	0.818s
ok  	vitess.io/vitess/go/proc	0.065s
ok  	vitess.io/vitess/go/streamlog	0.066s
ok  	vitess.io/vitess/go/sync2	0.279s
ok  	vitess.io/vitess/go/timer	0.684s
ok  	vitess.io/vitess/go/vt/discovery	2.539s
ok  	vitess.io/vitess/go/vt/grpcclient	0.041s
ok  	vitess.io/vitess/go/vt/logutil	0.114s
ok  	vitess.io/vitess/go/vt/topo/consultopo	1.919s
ok  	vitess.io/vitess/go/vt/vtexplain	1.863s
ok  	vitess.io/vitess/go/vt/vttablet/tabletmanager/vreplication	46.174s
ok  	vitess.io/vitess/go/vt/vttablet/tabletserver	13.804s
ok  	vitess.io/vitess/go/vt/worker	7.537s
ok  	vitess.io/vitess/go/vt/workflow/reshardingworkflowgen	0.019s
ok  	vitess.io/vitess/go/vt/wrangler/testlib	10.487s

@aquarapid
Copy link
Copy Markdown
Contributor

LGTM

Copy link
Copy Markdown
Member

@enisoc enisoc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants