CherryPick(vitessio#13198): Temporarily disable panic in mysqld when …

…socket files are directly used (vitessio#2310) * cherry pick of 13198 * Fix conflicts Signed-off-by: Rohit Nayak <[email protected]> --------- Signed-off-by: Rohit Nayak <[email protected]> Co-authored-by: Rohit Nayak <[email protected]>
planetscale · Jun 8, 2023 · 1dcfd61 · 1dcfd61
1 parent de15a99
commit 1dcfd61
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/go/vt/mysqlctl/mysqld.go b/go/vt/mysqlctl/mysqld.go
@@ -1294,10 +1294,10 @@ func (mysqld *Mysqld) ApplyBinlogFile(ctx context.Context, binlogFile string, re
 // remote through mysqlctl.
 func noSocketFile() {
 	if socketFile != "" {
-		// We log an error for now until we fix the issue with ApplySchema,
-		// see https://github.com/vitessio/vitess/pull/13178
+		// We log an error for now until we fix the issue with ApplySchema surfacing in MoveTables.
+		// See https://github.com/vitessio/vitess/issues/13203 and https://github.com/vitessio/vitess/pull/13178
 		//panic("Running remotely through mysqlctl, socketFile must not be set")
-		log.Error("Running remotely through mysqlctl, socketFile must not be set")
+		log.Warning("Running remotely through mysqlctl and thus socketFile should not be set")
 	}
 }