Merge pull request #171 from Shopify/v18.0.5-shopify-2-candidate

Backport: VTCombo: Ensure VSchema exists when creating keyspace (vitessio#16094)

go/test/endtoend/vtcombo/vttest_sample_test.go

@@ -135,6 +135,8 @@ func TestStandalone(t *testing.T) {
  tmp, _ := cmd.([]any)
  require.Contains(t, tmp[0], "vtcombo")
 
+ assertVSchemaExists(t, grpcAddress)
+
  ctx := context.Background()
  conn, err := vtgateconn.Dial(ctx, grpcAddress)
  require.NoError(t, err)
@@ -165,6 +167,17 @@ func TestStandalone(t *testing.T) {
  assertTransactionalityAndRollbackObeyed(ctx, t, conn, idStart)
 }
 
+func assertVSchemaExists(t *testing.T, grpcAddress string) {
+ tmpCmd := exec.Command("vtctldclient", "--server", grpcAddress, "--compact", "GetVSchema", "routed")
+
+ log.Infof("Running vtctldclient with command: %v", tmpCmd.Args)
+
+ output, err := tmpCmd.CombinedOutput()
+ require.NoError(t, err, fmt.Sprintf("Output:\n%v", string(output)))
+
+ assert.Equal(t, "{}\n", string(output))
+}
+
 func assertInsertedRowsExist(ctx context.Context, t *testing.T, conn *vtgateconn.VTGateConn, idStart, rowCount int) {
  cur := conn.Session(ks1+":-80@rdonly", nil)
  bindVariables := map[string]*querypb.BindVariable{

go/vt/vtcombo/tablet_map.go

@@ -318,6 +318,11 @@ func CreateKs(
  return 0, fmt.Errorf("CreateKeyspace(%v) failed: %v", keyspace, err)
  }
 
+ // make sure a valid vschema has been loaded
+ if err := ts.EnsureVSchema(ctx, keyspace); err != nil {
+ return 0, fmt.Errorf("EnsureVSchema(%v) failed: %v", keyspace, err)
+ }
+
  // iterate through the shards
  for _, spb := range kpb.Shards {
  shard := spb.Name