fix masterinfo and relayinfo removing

Author: micho7

pkg/controller/controller.go

@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"math/rand"
 	"net"
-	"os"
 	"sync"
 	"time"
 
@@ -503,10 +502,10 @@ func (c *Controller) syncReadOnlyVariable(readOnlyToBeTrue bool) error {
 
 // startMariaDBService starts the mariadb service of systemd.
 func (c *Controller) startMariaDBService() error {
-	if err := os.RemoveAll(mariadb.MasterInfoFilePath); err != nil {
+	if err := c.mariaDBConnector.RemoveMasterInfo(); err != nil {
 		return err
 	}
-	if err := os.RemoveAll(mariadb.RelayInfoFilePath); err != nil {
+	if err := c.mariaDBConnector.RemoveRelayInfo(); err != nil {
 		return err
 	}
 	if err := c.systemdConnector.StartService(mariadb.SystemdSerivceName); err != nil {

pkg/mariadb/connector.go

@@ -16,6 +16,7 @@ package mariadb
 
 import (
 	"fmt"
+	"os"
 	"strings"
 	"time"
 
@@ -50,6 +51,10 @@ type Connector interface {
 	CreateIDTable(dbName string, tableName string) error
 	InsertIDRecord(dbName string, tableName string, id int) error
 	DeleteRecords(dbName string, tableName string) error
+
+	// remove master info or relay info
+	RemoveMasterInfo() error
+	RemoveRelayInfo() error
 }
 
 func NewDefaultConnector(logger *slog.Logger) Connector {
@@ -202,6 +207,30 @@ func (c *mySQLCommandConnector) runMysqlCommand(mysqlcmd string) ([]byte, error)
 	return command.RunWithTimeout(mysqlCommandTimeout, name, args...)
 }
 
+func (c *mySQLCommandConnector) RemoveMasterInfo() error {
+	_, err := os.Stat(MasterInfoFilePath)
+
+	// do nothing if file is not found
+	if err != nil {
+		return nil
+	}
+
+	// delete if file exists
+	return os.Remove(MasterInfoFilePath)
+}
+
+func (c *mySQLCommandConnector) RemoveRelayInfo() error {
+	_, err := os.Stat(RelayInfoFilePath)
+
+	// do nothing if file is not found
+	if err != nil {
+		return nil
+	}
+
+	// delete if file exists
+	return os.Remove(RelayInfoFilePath)
+}
+
 // parseShowReplicaStatusOutput parses the output of the "mysql -e 'show replica status \G'".
 func parseShowReplicaStatusOutput(out string) ReplicationStatus {
 	m := ReplicationStatus{}

pkg/mariadb/fake_connector.go

@@ -112,6 +112,14 @@ func (c *FakeMariaDBConnector) InsertIDRecord(dbName string, tableName string, i
 	return nil
 }
 
+func (c *FakeMariaDBConnector) RemoveMasterInfo() error {
+	return nil
+}
+
+func (c *FakeMariaDBConnector) RemoveRelayInfo() error {
+	return nil
+}
+
 // FakeMariaDBFailWriteTestDataConnector is the mariadb connector that fails to write testdata.
 type FakeMariaDBFailWriteTestDataConnector struct {
 }
@@ -184,3 +192,11 @@ func (*FakeMariaDBFailWriteTestDataConnector) DeleteRecords(dbName string, table
 func (*FakeMariaDBFailWriteTestDataConnector) InsertIDRecord(dbName string, tableName string, id int) error {
 	return nil
 }
+
+func (c *FakeMariaDBFailWriteTestDataConnector) RemoveMasterInfo() error {
+	return nil
+}
+
+func (c *FakeMariaDBFailWriteTestDataConnector) RemoveRelayInfo() error {
+	return nil
+}

pkg/mariadb/fake_mariadb_failed_replication_connector.go

@@ -85,3 +85,13 @@ func (*FakeMariaDBFailedReplicationConnector) DeleteRecords(dbName string, table
 func (*FakeMariaDBFailedReplicationConnector) InsertIDRecord(dbName string, tableName string, id int) error {
 	return nil
 }
+
+// RemoveMasterInfo implements mariadb.Connector
+func (*FakeMariaDBFailedReplicationConnector) RemoveMasterInfo() error {
+	return nil
+}
+
+// RemoveRelayInfo implements mariadb.Connector
+func (*FakeMariaDBFailedReplicationConnector) RemoveRelayInfo() error {
+	return nil
+}