Skip to content

Add cluster.SetSugarState #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Add cluster.SetSugarState #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bea35e0
Switch cluster.SetState to cluster.SetSugarState which reduces code c…
terwey Feb 23, 2021
77c7f51
More Sugarstate
terwey Feb 23, 2021
0a4e658
Converted the last AddStates to SetSugarState
terwey Feb 23, 2021
bc6793d
Add a unit-test for SetSugarState
terwey Feb 28, 2021
a623d97
Missing haproxy sugarstate
terwey Mar 17, 2021
6120491
Merge branch 'develop' into sugarstate
terwey Mar 2, 2022
46d82ae
Introduce AddSugarState to re-align with AddState
terwey Mar 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cluster/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"crypto/tls"
"encoding/json"
"errors"
"fmt"
"hash/crc64"
"io/ioutil"
"os"
Expand Down Expand Up @@ -853,7 +852,7 @@ func (cluster *Cluster) MonitorVariablesDiff() {
cluster.LogPrintf(LvlErr, "Encoding variables diff %s", err)
return
}
cluster.SetState("WARN0084", state.State{ErrType: "WARNING", ErrDesc: fmt.Sprintf(clusterError["WARN0084"], string(jtext)), ErrFrom: "MON", ServerUrl: cluster.GetMaster().URL})
cluster.SetSugarState("WARN0084", "MON", cluster.GetMaster().URL, string(jtext))
}
}

Expand Down
14 changes: 6 additions & 8 deletions cluster/cluster_bck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"bytes"
"encoding/json"
"errors"
"fmt"
"io"
"os"
"os/exec"
Expand All @@ -20,7 +19,6 @@ import (

"github.com/signal18/replication-manager/config"
v3 "github.com/signal18/replication-manager/repmanv3"
"github.com/signal18/replication-manager/utils/state"
)

/* Replaced by v3.Backup
Expand Down Expand Up @@ -49,7 +47,7 @@ func (cluster *Cluster) ResticPurgeRepo() error {
stderr := io.MultiWriter(os.Stderr, &stderrBuf)
resticcmd.Env = cluster.ResticGetEnv()
if err := resticcmd.Start(); err != nil {
cluster.SetState("WARN0096", state.State{ErrType: "WARNING", ErrDesc: fmt.Sprintf(clusterError["WARN0096"], resticcmd.Path, err, ""), ErrFrom: "BACKUP"})
cluster.SetSugarState("WARN0096", "BACKUP", "", resticcmd.Path, err)
return err
}
var wg sync.WaitGroup
Expand All @@ -64,7 +62,7 @@ func (cluster *Cluster) ResticPurgeRepo() error {

err := resticcmd.Wait()
if err != nil {
cluster.sme.AddState("WARN0094", state.State{ErrType: "WARNING", ErrDesc: fmt.Sprintf(clusterError["WARN0094"], err, string(stdoutBuf.Bytes()), string(stderrBuf.Bytes())), ErrFrom: "CHECK"})
cluster.AddSugarState("WARN0094", "CHECK", "", err, stdoutBuf.Bytes(), stderrBuf.Bytes())
return err
}
if errStdout != nil || errStderr != nil {
Expand Down Expand Up @@ -107,7 +105,7 @@ func (cluster *Cluster) ResticInitRepo() error {

resticcmd.Env = cluster.ResticGetEnv()
if err := resticcmd.Start(); err != nil {
cluster.SetState("WARN0095", state.State{ErrType: "WARNING", ErrDesc: fmt.Sprintf(clusterError["WARN0095"], resticcmd.Path, err, ""), ErrFrom: "BACKUP"})
cluster.SetSugarState("WARN0095", "BACKUP", "", resticcmd.Path, err)
return err
}
var wg sync.WaitGroup
Expand All @@ -122,7 +120,7 @@ func (cluster *Cluster) ResticInitRepo() error {

err := resticcmd.Wait()
if err != nil {
cluster.sme.AddState("WARN0095", state.State{ErrType: "WARNING", ErrDesc: fmt.Sprintf(clusterError["WARN0095"], err, string(stdoutBuf.Bytes()), string(stderrBuf.Bytes())), ErrFrom: "CHECK"})
cluster.AddSugarState("WARN0095", "CHECK", "", err, stdoutBuf.Bytes(), stderrBuf.Bytes())
}
if errStdout != nil || errStderr != nil {
return errors.New("failed to capture stdout or stderr\n")
Expand All @@ -144,7 +142,7 @@ func (cluster *Cluster) ResticFetchRepo() error {

resticcmd.Env = cluster.ResticGetEnv()
if err := resticcmd.Start(); err != nil {
cluster.SetState("WARN0094", state.State{ErrType: "WARNING", ErrDesc: fmt.Sprintf(clusterError["WARN0094"], resticcmd.Path, err, ""), ErrFrom: "BACKUP"})
cluster.SetSugarState("WARN0094", "BACKUP", "", resticcmd.Path, err)
return err
}
var wg sync.WaitGroup
Expand All @@ -159,7 +157,7 @@ func (cluster *Cluster) ResticFetchRepo() error {

err := resticcmd.Wait()
if err != nil {
cluster.sme.AddState("WARN0093", state.State{ErrType: "WARNING", ErrDesc: fmt.Sprintf(clusterError["WARN0093"], err, string(stdoutBuf.Bytes()), string(stderrBuf.Bytes())), ErrFrom: "CHECK"})
cluster.AddSugarState("WARN0093", "CHECK", "", err, stdoutBuf.Bytes(), stderrBuf.Bytes())
cluster.ResticInitRepo()
return err
}
Expand Down
38 changes: 18 additions & 20 deletions cluster/cluster_chk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"bytes"
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"net/http"
"os/exec"
Expand All @@ -27,7 +26,7 @@ import (
func (cluster *Cluster) CheckFailed() {
// Don't trigger a failover if a switchover is happening
if cluster.sme.IsInFailover() {
cluster.sme.AddState("ERR00001", state.State{ErrType: "WARNING", ErrDesc: fmt.Sprintf(clusterError["ERR00001"]), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00001", "CHECK", "")
return
}
if cluster.master == nil {
Expand Down Expand Up @@ -115,7 +114,7 @@ func (cluster *Cluster) isAutomaticFailover() bool {
if cluster.Conf.Interactive == false {
return true
}
cluster.sme.AddState("ERR00002", state.State{ErrType: "ERR00002", ErrDesc: fmt.Sprintf(clusterError["ERR00002"]), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00002", "CHECK", "")
return false
}

Expand All @@ -131,7 +130,7 @@ func (cluster *Cluster) isMaxMasterFailedCountReached() bool {
// no illimited failed count

if cluster.master.FailCount >= cluster.Conf.MaxFail {
cluster.sme.AddState("WARN0023", state.State{ErrType: "WARNING", ErrDesc: fmt.Sprintf(clusterError["WARN0023"]), ErrFrom: "CHECK"})
cluster.AddSugarState("WARN0023", "CHECK", "")
return true
} else {
// cluster.sme.AddState("ERR00023", state.State{ErrType: "ERROR", ErrDesc: fmt.Sprintf("Constraint is blocking state %s, interactive:%t, maxfail reached:%d", cluster.master.State, cluster.Conf.Interactive, cluster.Conf.MaxFail), ErrFrom: "CONF"})
Expand All @@ -146,7 +145,7 @@ func (cluster *Cluster) isMaxClusterFailoverCountNotReached() bool {
return true
}
if cluster.FailoverCtr == cluster.Conf.FailLimit {
cluster.sme.AddState("ERR00027", state.State{ErrType: LvlErr, ErrDesc: fmt.Sprintf(clusterError["ERR00027"]), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00027", "CHECK", "")
return false
}
return true
Expand All @@ -160,7 +159,7 @@ func (cluster *Cluster) isBetweenFailoverTimeValid() bool {
}
// cluster.LogPrintf("CHECK: Failover Time to short with previous failover")
if rem > 0 {
cluster.sme.AddState("ERR00029", state.State{ErrType: LvlErr, ErrDesc: fmt.Sprintf(clusterError["ERR00029"]), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00029", "CHECK", "")
return false
}
return true
Expand Down Expand Up @@ -189,7 +188,7 @@ func (cluster *Cluster) isOneSlaveHeartbeatIncreasing() bool {
cluster.LogPrintf(LvlDbg, "SLAVE_RECEIVED_HEARTBEATS %d", status2["SLAVE_RECEIVED_HEARTBEATS"])
}
if status2["SLAVE_RECEIVED_HEARTBEATS"] > saveheartbeats {
cluster.sme.AddState("ERR00028", state.State{ErrType: LvlErr, ErrDesc: fmt.Sprintf(clusterError["ERR00028"], s.URL), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00028", "CHECK", s.URL, s.URL)
return true
}
}
Expand Down Expand Up @@ -249,7 +248,7 @@ func (cluster *Cluster) isMaxscaleSupectRunning() bool {

time.Sleep(time.Duration(cluster.Conf.CheckFalsePositiveMaxscaleTimeout) * time.Second)
if strings.Contains(cluster.master.MxsServerStatus, "Running") {
cluster.sme.AddState("ERR00030", state.State{ErrType: LvlErr, ErrDesc: fmt.Sprintf(clusterError["ERR00030"], cluster.master.MxsServerStatus), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00030", "CHECK", "", cluster.master.MxsServerStatus)
return true
}
return false
Expand All @@ -259,7 +258,7 @@ func (cluster *Cluster) isFoundCandidateMaster() bool {

key := cluster.electFailoverCandidate(cluster.slaves, false)
if key == -1 {
cluster.sme.AddState("ERR00032", state.State{ErrType: LvlErr, ErrDesc: fmt.Sprintf(clusterError["ERR00032"]), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00032", "CHECK", "")
return false
}
return true
Expand All @@ -286,7 +285,7 @@ func (cluster *Cluster) isActiveArbitration() bool {
resp, err := client.Do(req)
if err != nil {
cluster.LogPrintf(LvlErr, "%s", err.Error())
cluster.sme.AddState("ERR00022", state.State{ErrType: LvlErr, ErrDesc: fmt.Sprintf(clusterError["ERR00022"]), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00022", "CHECK", "")
return false
}
defer resp.Body.Close()
Expand All @@ -300,14 +299,14 @@ func (cluster *Cluster) isActiveArbitration() bool {
err = json.Unmarshal(body, &r)
if err != nil {
cluster.LogPrintf(LvlErr, "Arbitrator sent invalid JSON")
cluster.sme.AddState("ERR00022", state.State{ErrType: LvlErr, ErrDesc: fmt.Sprintf(clusterError["ERR00022"]), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00022", "CHECK", "")
return false
}
if r.Arbitration == "winner" {
cluster.LogPrintf(LvlInfo, "Arbitrator says: winner")
return true
}
cluster.sme.AddState("ERR00022", state.State{ErrType: LvlErr, ErrDesc: fmt.Sprintf(clusterError["ERR00022"]), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00022", "CHECK", "")
return false
}

Expand All @@ -325,7 +324,7 @@ func (cluster *Cluster) isExternalOk() bool {
return false
}
if req.StatusCode == 200 {
cluster.sme.AddState("ERR00031", state.State{ErrType: LvlErr, ErrDesc: fmt.Sprintf(clusterError["ERR00031"]), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00031", "CHECK", "")
return true
}
return false
Expand All @@ -336,7 +335,7 @@ func (cluster *Cluster) isArbitratorAlive() bool {
return true
}
if cluster.IsFailedArbitrator {
cluster.sme.AddState("ERR00055", state.State{ErrType: LvlErr, ErrDesc: fmt.Sprintf(clusterError["ERR00055"], cluster.Conf.ArbitrationSasHosts), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00055", "CHECK", "", cluster.Conf.ArbitrationSasHosts)
return false
}
return true
Expand All @@ -351,7 +350,7 @@ func (cluster *Cluster) isNotFirstSlave() bool {
// - first replication-manager start on no topology
// - all cluster down
if cluster.master == nil {
cluster.sme.AddState("ERR00026", state.State{ErrType: LvlErr, ErrDesc: fmt.Sprintf(clusterError["ERR00026"]), ErrFrom: "CHECK"})
cluster.AddSugarState("ERR00026", "CHECK", "")
return false
}

Expand Down Expand Up @@ -611,7 +610,7 @@ func (cluster *Cluster) CheckTableChecksum(schema string, table string) {
if slaveSeq >= masterSeq {
break
} else {
cluster.SetState("WARN0086", state.State{ErrType: "WARNING", ErrDesc: fmt.Sprintf(clusterError["WARN0086"], s.URL), ErrFrom: "MON", ServerUrl: s.URL})
cluster.SetSugarState("WARN0086", "MON", s.URL, s.URL)
}
time.Sleep(1 * time.Second)
}
Expand Down Expand Up @@ -655,8 +654,7 @@ func (cluster *Cluster) CheckSameServerID() {
continue
}
if s.ServerID == sothers.ServerID {
cluster.SetState("WARN0087", state.State{ErrType: LvlWarn, ErrDesc: fmt.Sprintf(clusterError["WARN0087"], s.URL, sothers.URL), ErrFrom: "MON", ServerUrl: s.URL})

cluster.SetSugarState("WARN0087", "MON", s.URL, s.URL, sothers.URL)
}
}
}
Expand All @@ -675,7 +673,7 @@ func (cluster *Cluster) IsSameWsrepUUID() bool {
continue
}
if s.Status["WSREP_CLUSTER_STATE_UUID"] != sothers.Status["WSREP_CLUSTER_STATE_UUID"] {
cluster.SetState("ERR00083", state.State{ErrType: LvlWarn, ErrDesc: fmt.Sprintf(clusterError["ERR00083"], s.URL, s.Status["WSREP_CLUSTER_STATE_UUID"], sothers.URL, sothers.Status["WSREP_CLUSTER_STATE_UUID"]), ErrFrom: "MON", ServerUrl: s.URL})
cluster.SetSugarState("ERR00083", "MON", s.URL, s.URL, s.Status["WSREP_CLUSTER_STATE_UUID"], sothers.URL, sothers.Status["WSREP_CLUSTER_STATE_UUID"])
return false
}
}
Expand All @@ -693,7 +691,7 @@ func (cluster *Cluster) IsNotHavingMySQLErrantTransaction() bool {
}
hasErrantTrx, _, _ := dbhelper.HaveErrantTransactions(s.Conn, cluster.master.Variables["GTID_EXECUTED"], s.Variables["GTID_EXECUTED"])
if hasErrantTrx {
cluster.SetState("WARN0091", state.State{ErrType: LvlWarn, ErrDesc: fmt.Sprintf(clusterError["WARN0091"], s.URL), ErrFrom: "MON", ServerUrl: s.URL})
cluster.SetSugarState("WARN0091", "MON", s.URL, s.URL)
return false
}
}
Expand Down
Loading