Use /vt/bin for mysqlbinlog and add it to PATH

Signed-off-by: Matt Lord <[email protected]>
planetscale · May 1, 2024 · 2f7768a · 2f7768a
1 parent 573b44f
commit 2f7768a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/pkg/operator/vttablet/env_vars.go b/pkg/operator/vttablet/env_vars.go
@@ -18,10 +18,11 @@ package vttablet
 
 import (
 	"fmt"
+	"os"
 	"strings"
 
-	"planetscale.dev/vitess-operator/pkg/operator/lazy"
 	corev1 "k8s.io/api/core/v1"
+	"planetscale.dev/vitess-operator/pkg/operator/lazy"
 )
 
 func init() {
@@ -40,6 +41,10 @@ func init() {
 				Name:  "EXTRA_MY_CNF",
 				Value: strings.Join(extraMyCnf.Get(spec), ":"),
 			},
+			// The mysqlbinlog binary is NOT in the vendor mysql container images
+			// so we copy it to /mnt/vt/bin when initializing the mysqld container
+			// so that mysqlctl can find it.
+			{Name: "PATH", Value: fmt.Sprintf("%s:%s", os.Getenv("PATH"), vtBinPath)},
 		}
 	})
 

diff --git a/pkg/operator/vttablet/mysqlctld.go b/pkg/operator/vttablet/mysqlctld.go
@@ -29,7 +29,7 @@ const (
 	vtRootInitScript = `set -ex
 mkdir -p /mnt/vt/bin
 cp --no-clobber /vt/bin/mysqlctld /mnt/vt/bin/
-cp --no-clobber $(command -v mysqlbinlog) /mnt/vt/bin/ || true
+cp --no-clobber /usr/bin/mysqlbinlog /mnt/vt/bin/
 mkdir -p /mnt/vt/config
 if [[ -d /vt/config/mycnf ]]; then
   cp --no-clobber -R /vt/config/mycnf /mnt/vt/config/

diff --git a/test/endtoend/utils.sh b/test/endtoend/utils.sh
@@ -279,7 +279,9 @@ function waitForKeyspaceToBeServing() {
   nb_of_replica=$3
   for i in {1..600} ; do
     out=$(mysql --table --execute="show vitess_tablets")
+    echo "Serving output: ${out}"
     numtablets=$(echo "$out" | grep -E "$ks(.*)$shard(.*)PRIMARY(.*)SERVING|$ks(.*)$shard(.*)REPLICA(.*)SERVING" | wc -l)
+    echo "Number of serving tablets: ${numtablets}"
     if [[ $numtablets -ge $((nb_of_replica+1)) ]]; then
       echo "Shard $ks/$shard is serving"
       return