Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/proxysql' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
caffeinated92 committed Sep 14, 2024
2 parents 8727a00 + d80a302 commit 8000736
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions cluster/srv_del.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,5 @@ func (server *ServerMonitor) DelBackupTypeCookie(backtype string) error {

func (server *ServerMonitor) DelMaintenance() {
server.IsMaintenance = false
server.ClusterGroup.SetProxyServerMaintenance(server.ServerID)
}
1 change: 1 addition & 0 deletions cluster/srv_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ func (server *ServerMonitor) SetReadWrite() error {

func (server *ServerMonitor) SetMaintenance() {
server.IsMaintenance = true
server.ClusterGroup.SetProxyServerMaintenance(server.ServerID)
}

func (server *ServerMonitor) SetDSN() {
Expand Down
2 changes: 0 additions & 2 deletions server/api_database.go
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,6 @@ func (repman *ReplicationManager) handlerMuxServerSetMaintenance(w http.Response
node := mycluster.GetServerFromName(vars["serverName"])
if node != nil {
node.SetMaintenance()
mycluster.SetProxyServerMaintenance(node.ServerID)
} else {
http.Error(w, "Server Not Found", 500)
return
Expand All @@ -788,7 +787,6 @@ func (repman *ReplicationManager) handlerMuxServerDelMaintenance(w http.Response
node := mycluster.GetServerFromName(vars["serverName"])
if node != nil {
node.DelMaintenance()
mycluster.SetProxyServerMaintenance(node.ServerID)
} else {
http.Error(w, "Server Not Found", 500)
return
Expand Down

0 comments on commit 8000736

Please sign in to comment.