Embed mycnf files and init_db

Makefile

@@ -43,12 +43,17 @@ embed_static:
 	go run github.com/GeertJohan/go.rice/rice embed-go
 	go build .
 
+embed_config:
+	cd go/vt/mysqlctl
+	go run github.com/GeertJohan/go.rice/rice embed-go
+	go build .
+
 build_web:
 	echo $$(date): Building web artifacts
 	cd web/vtctld2 && ng build -prod
 	cp -f web/vtctld2/src/{favicon.ico,plotly-latest.min.js,primeui-ng-all.min.css} web/vtctld2/dist/
 
-build:
+build: embed_config
 ifndef NOBANNER
 	echo $$(date): Building source tree
 endif

examples/local/203_vertical_split.sh

@@ -27,7 +27,7 @@ script_root=$(dirname "${BASH_SOURCE}")
 source "$script_root/env.sh"
 
 # shellcheck disable=SC2086
-"$VTROOT"/bin/vtworker \
+vtworker \
     $TOPOLOGY_FLAGS \
     -cell zone1 \
     -log_dir "$VTDATAROOT"/tmp \

examples/local/303_horizontal_split.sh

@@ -27,7 +27,7 @@ script_root=$(dirname "${BASH_SOURCE}")
 source "${script_root}/env.sh"
 
 # shellcheck disable=SC2086
-"$VTROOT"/bin/vtworker \
+vtworker \
     $TOPOLOGY_FLAGS \
     -cell zone1 \
     -log_dir "$VTDATAROOT"/tmp \

examples/local/env.sh

@@ -16,7 +16,7 @@
 
 hostname=`hostname -f`
 vtctld_web_port=15000
-export VTDATAROOT="${VTDATAROOT:-${VTROOT}/vtdataroot}"
+export VTDATAROOT="${VTDATAROOT:-${PWD}/vtdataroot}"
 
 function fail() {
   echo "ERROR: $1"
@@ -33,10 +33,6 @@ for binary in mysqld etcd etcdctl curl vtctlclient vttablet vtgate vtctld mysqlc
   command -v "$binary" > /dev/null || fail "${binary} is not installed in PATH. See https://vitess.io/docs/get-started/local/ for install instructions."
 done;
 
-if [ -z "$VTROOT" ]; then
-  fail "VTROOT is not set. See https://vitess.io/docs/get-started/local/ for install instructions."
-fi
-
 if [ "${TOPO}" = "zk2" ]; then
     # Each ZooKeeper server needs a list of all servers in the quorum.
     # Since we're running them all locally, we need to give them unique ports.

examples/local/etcd-up.sh

@@ -46,7 +46,7 @@ etcdctl --endpoints "http://${ETCD_SERVER}" mkdir /vitess/$cell &
 echo "add $cell CellInfo"
 set +e
 # shellcheck disable=SC2086
-"${VTROOT}"/bin/vtctl $TOPOLOGY_FLAGS AddCellInfo \
+vtctl $TOPOLOGY_FLAGS AddCellInfo \
   -root /vitess/$cell \
   -server_address "${ETCD_SERVER}" \
   $cell

examples/local/vtctld-up.sh

@@ -33,7 +33,7 @@ fi
 
 echo "Starting vtctld..."
 # shellcheck disable=SC2086
-$VTROOT/bin/vtctld \
+vtctld \
   $TOPOLOGY_FLAGS \
   -cell $cell \
   -workflow_manager_init \

examples/local/vtgate-up.sh

@@ -70,7 +70,7 @@ fi
 
 # Start vtgate.
 # shellcheck disable=SC2086
-$VTROOT/bin/vtgate \
+vtgate \
   $TOPOLOGY_FLAGS \
   -log_dir $VTDATAROOT/tmp \
   -log_queries_to_file $VTDATAROOT/tmp/vtgate_querylog.txt \

examples/local/vttablet-down.sh

@@ -40,7 +40,7 @@ for uid_index in $uids; do
   wait_pids="$wait_pids $pid"
 
   echo "Stopping MySQL for tablet $alias..."
-  $VTROOT/bin/mysqlctl \
+  mysqlctl \
     -tablet_uid $uid \
     shutdown &
 done

examples/local/vttablet-up.sh

@@ -36,8 +36,6 @@ fi
 script_root=`dirname "${BASH_SOURCE}"`
 source $script_root/env.sh
 
-init_db_sql_file="$VTROOT/config/init_db.sql"
-
 mkdir -p $VTDATAROOT/backups
 
 # Start 3 vttablets by default.
@@ -65,7 +63,7 @@ for uid_index in $uids; do
   export TABLET_TYPE=$tablet_type
 
   echo "Starting MySQL for tablet $alias..."
-  action="init -init_db_sql_file $init_db_sql_file"
+  action="init"
   if [ -d $VTDATAROOT/$tablet_dir ]; then
     echo "Resuming from existing vttablet dir:"
     echo "    $VTDATAROOT/$tablet_dir"
@@ -74,7 +72,7 @@ for uid_index in $uids; do
 
   set +e
 
-  $VTROOT/bin/mysqlctl \
+  mysqlctl \
     -log_dir $VTDATAROOT/tmp \
     -tablet_uid $uid \
     -mysql_port $mysql_port \
@@ -119,7 +117,7 @@ for uid_index in $uids; do
 
   echo "Starting vttablet for $alias..."
   # shellcheck disable=SC2086
-  $VTROOT/bin/vttablet \
+  vttablet \
     $TOPOLOGY_FLAGS \
     -log_dir $VTDATAROOT/tmp \
     -log_queries_to_file $VTDATAROOT/tmp/$tablet_logfile \

examples/local/vtworker-up.sh

@@ -23,7 +23,7 @@ script_root=`dirname "${BASH_SOURCE}"`
 source $script_root/env.sh
 
 echo "Starting vtworker..."
-exec $VTROOT/bin/vtworker \
+vtworker \
   $TOPOLOGY_FLAGS \
   -cell $cell \
   -log_dir $VTDATAROOT/tmp \

examples/local/zk-down.sh

@@ -24,6 +24,6 @@ source $script_root/env.sh
 # Stop ZooKeeper servers.
 echo "Stopping zk servers..."
 for zkid in $zkids; do
-  $VTROOT/bin/zkctl -zk.myid $zkid -zk.cfg $zkcfg -log_dir $VTDATAROOT/tmp shutdown
+  zkctl -zk.myid $zkid -zk.cfg $zkcfg -log_dir $VTDATAROOT/tmp shutdown
 done
 

examples/local/zk-up.sh

@@ -35,7 +35,7 @@ for zkid in $zkids; do
     echo "    $VTDATAROOT/$zkdir"
     action='start'
   fi
-  $VTROOT/bin/zkctl -zk.myid $zkid -zk.cfg $zkcfg -log_dir $VTDATAROOT/tmp $action \
+  zkctl -zk.myid $zkid -zk.cfg $zkcfg -log_dir $VTDATAROOT/tmp $action \
     > $VTDATAROOT/tmp/zkctl_$zkid.out 2>&1 &
   pids[$zkid]=$!
 done
@@ -56,7 +56,7 @@ echo "Started zk servers."
 # If the node already exists, it's fine, means we used existing data.
 set +e
 # shellcheck disable=SC2086
-$VTROOT/bin/vtctl $TOPOLOGY_FLAGS AddCellInfo \
+vtctl $TOPOLOGY_FLAGS AddCellInfo \
   -root /vitess/$cell \
   -server_address $ZK_SERVER \
   $cell

go/vt/env/env.go

@@ -29,6 +29,8 @@ import (
 const (
 	// DefaultVtDataRoot is the default value for VTROOT environment variable
 	DefaultVtDataRoot = "/vt"
+	// DefaultVtRoot is only required for hooks
+	DefaultVtRoot = "/usr/local/vitess"
 )
 
 // VtRoot returns $VTROOT or tries to guess its value if it's not set.
@@ -47,8 +49,7 @@ func VtRoot() (root string, err error) {
 	if strings.HasSuffix(dir, "/bin") {
 		return path.Dir(dir), nil
 	}
-	err = errors.New("VTROOT could not be guessed from the executable location. Please set $VTROOT")
-	return
+	return DefaultVtRoot, nil
 }
 
 // VtDataRoot returns $VTDATAROOT or the default if $VTDATAROOT is not

go/vt/mysqlctl/mycnf_gen.go

@@ -22,7 +22,6 @@ import (
 	"bytes"
 	"crypto/rand"
 	"fmt"
-	"io/ioutil"
 	"math/big"
 	"path"
 	"text/template"
@@ -121,19 +120,9 @@ func (cnf *Mycnf) directoryList() []string {
 	}
 }
 
-// makeMycnf will join cnf files cnfPaths and substitute in the right values.
-func (cnf *Mycnf) makeMycnf(cnfFiles []string) (string, error) {
-	myTemplateSource := new(bytes.Buffer)
-	myTemplateSource.WriteString("[mysqld]\n")
-	for _, path := range cnfFiles {
-		data, dataErr := ioutil.ReadFile(path)
-		if dataErr != nil {
-			return "", dataErr
-		}
-		myTemplateSource.WriteString("## " + path + "\n")
-		myTemplateSource.Write(data)
-	}
-	return cnf.fillMycnfTemplate(myTemplateSource.String())
+// makeMycnf will substitute values
+func (cnf *Mycnf) makeMycnf(partialcnf string) (string, error) {
+	return cnf.fillMycnfTemplate(partialcnf)
 }
 
 // fillMycnfTemplate will fill in the passed in template with the values

go/vt/mysqlctl/mycnf_test.go

@@ -17,34 +17,29 @@ limitations under the License.
 package mysqlctl
 
 import (
+	"bytes"
 	"io/ioutil"
 	"os"
-	"path"
 	"strings"
 	"testing"
 
 	"vitess.io/vitess/go/vt/dbconfigs"
-	"vitess.io/vitess/go/vt/env"
 	"vitess.io/vitess/go/vt/servenv"
 )
 
 var MycnfPath = "/tmp/my.cnf"
 
 func TestMycnf(t *testing.T) {
-	os.Setenv("MYSQL_FLAVOR", "MariaDB")
 	uid := uint32(11111)
 	cnf := NewMycnf(uid, 6802)
+	myTemplateSource := new(bytes.Buffer)
+	myTemplateSource.WriteString("[mysqld]\n")
 	// Assigning ServerID to be different from tablet UID to make sure that there are no
 	// assumptions in the code that those IDs are the same.
 	cnf.ServerID = 22222
-	root, err := env.VtRoot()
-	if err != nil {
-		t.Errorf("err: %v", err)
-	}
-	cnfTemplatePaths := []string{
-		path.Join(root, "config/mycnf/default.cnf"),
-	}
-	data, err := cnf.makeMycnf(cnfTemplatePaths)
+	f, _ := ioutil.ReadFile("../../../config/mycnf/default.cnf")
+	myTemplateSource.Write(f)
+	data, err := cnf.makeMycnf(myTemplateSource.String())
 	if err != nil {
 		t.Errorf("err: %v", err)
 	} else {
@@ -85,7 +80,6 @@ func TestMycnf(t *testing.T) {
 // 4. \rm $VTROOT/vthook/make_mycnf
 // 5. Add No Prefix back
 func NoTestMycnfHook(t *testing.T) {
-	os.Setenv("MYSQL_FLAVOR", "MariaDB")
 	uid := uint32(11111)
 	cnf := NewMycnf(uid, 6802)
 	// Assigning ServerID to be different from tablet UID to make sure that there are no