Merge pull request #800 from github/check-and-recover-random-order

Check and recover random order
openark · Feb 10, 2019 · dda3a33 · dda3a33
2 parents 03b6a6d + a93dd41
commit dda3a33
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/go/inst/instance_dao.go b/go/inst/instance_dao.go
@@ -1089,7 +1089,7 @@ func readInstanceRow(m sqlutils.RowMap) *Instance {
 		instance.Problems = append(instance.Problems, "not_recently_checked")
 	} else if instance.ReplicationThreadsExist() && !instance.ReplicaRunning() {
 		instance.Problems = append(instance.Problems, "not_replicating")
-	} else if instance.SlaveLagSeconds.Valid && instance.SlaveLagSeconds.Int64 > int64(config.Config.ReasonableReplicationLagSeconds) {
+	} else if instance.SlaveLagSeconds.Valid && math.AbsInt64(instance.SlaveLagSeconds.Int64-int64(instance.SQLDelay)) > int64(config.Config.ReasonableReplicationLagSeconds) {
 		instance.Problems = append(instance.Problems, "replication_lag")
 	}
 	if instance.GtidErrant != "" {

diff --git a/go/logic/topology_recovery.go b/go/logic/topology_recovery.go
@@ -1604,8 +1604,8 @@ func CheckAndRecover(specificInstance *inst.InstanceKey, candidateInstanceKey *i
 		skipProcesses = true
 	}
 	// intentionally iterating entries in random order
-	for i := range rand.Perm(len(replicationAnalysis)) {
-		analysisEntry := replicationAnalysis[i]
+	for _, j := range rand.Perm(len(replicationAnalysis)) {
+		analysisEntry := replicationAnalysis[j]
 		if specificInstance != nil {
 			// We are looking for a specific instance; if this is not the one, skip!
 			if !specificInstance.Equals(&analysisEntry.AnalyzedInstanceKey) {

diff --git a/resources/public/js/cluster.js b/resources/public/js/cluster.js
@@ -1386,11 +1386,7 @@ function Cluster() {
       content = '<hr/>' + content
     }
     wrappedContent = '<div data-tag="'+tag+'">' + content + '<div style="clear: both;"></div></div>';
-    if (tag === "analysis") {
-      $("#cluster_info").append(wrappedContent)
-    } else {
-      $("#cluster_info").append(wrappedContent)
-    }
+    $("#cluster_info").append(wrappedContent)
   }
 
   function populateSidebar(clusterInfo) {