From 322cc58ab8149073e5bdd50f2034a61bdcddb681 Mon Sep 17 00:00:00 2001 From: Masayuki Ishii Date: Thu, 8 Dec 2022 06:07:33 +0000 Subject: [PATCH 1/2] Fix testcase for backup and restore Signed-off-by: Masayuki Ishii --- e2e/backup_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/backup_test.go b/e2e/backup_test.go index d328e3cc2..2058d4138 100644 --- a/e2e/backup_test.go +++ b/e2e/backup_test.go @@ -59,7 +59,7 @@ var _ = Context("backup", func() { kubectlSafe(nil, "moco", "-n", "backup", "mysql", "-u", "moco-writable", "source", "--", "-e", "CREATE DATABASE test") kubectlSafe(nil, "moco", "-n", "backup", "mysql", "-u", "moco-writable", "source", "--", - "-D", "test", "-e", "CREATE TABLE t (i INT PRIMARY KEY AUTO_INCREMENT, data TEXT NOT NULL) ENGINE=InnoDB") + "-D", "test", "-e", "CREATE TABLE t (id INT NOT NULL AUTO_INCREMENT, data VARCHAR(32) NOT NULL, PRIMARY KEY (id), KEY key1 (data), KEY key2 (data, id)) ENGINE=InnoDB") kubectlSafe(nil, "moco", "-n", "backup", "mysql", "-u", "moco-writable", "source", "--", "-D", "test", "--init_command=SET autocommit=1", "-e", "INSERT INTO t (data) VALUES ('aaa')") }) From 114cebaa24a3f6ecd21f192873474e6023f351e1 Mon Sep 17 00:00:00 2001 From: Masayuki Ishii Date: Thu, 8 Dec 2022 06:29:17 +0000 Subject: [PATCH 2/2] Donwgrade mysqlsh to 8.0.30 Signed-off-by: Masayuki Ishii --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 004219633..66a8c6656 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ FROM quay.io/cybozu/mysql:8.0.31.1 as mysql FROM quay.io/cybozu/ubuntu:20.04 LABEL org.opencontainers.image.source https://github.com/cybozu-go/moco -ARG MYSQLSH_VERSION=8.0.31-1 +ARG MYSQLSH_VERSION=8.0.30-1 COPY --from=builder /work/moco-backup /moco-backup