feat: nil-check errors before printing them (vitessio#11156) (vitessi…

…o#1026) Signed-off-by: Manan Gupta <manan@planetscale.com> Signed-off-by: Manan Gupta <manan@planetscale.com> Signed-off-by: Manan Gupta <manan@planetscale.com>
planetscale · Sep 1, 2022 · 37f18dd · 37f18dd
1 parent fb39c9c
commit 37f18dd
Show file tree

Hide file tree

Showing 17 changed files with 170 additions and 57 deletions.
diff --git a/go/vt/orchestrator/app/cli.go b/go/vt/orchestrator/app/cli.go
@@ -187,7 +187,9 @@ func Cli(command string, strict bool, instance string, destination string, owner
 				log.Fatal(err)
 			} else {
 				for _, e := range errs {
-					log.Error(e)
+					if e != nil {
+						log.Error(e)
+					}
 				}
 				for _, replica := range replicas {
 					fmt.Println(replica.Key.DisplayString())
@@ -250,7 +252,9 @@ func Cli(command string, strict bool, instance string, destination string, owner
 				log.Fatal(err)
 			} else {
 				for _, e := range errs {
-					log.Error(e)
+					if e != nil {
+						log.Error(e)
+					}
 				}
 				for _, replica := range movedReplicas {
 					fmt.Println(replica.Key.DisplayString())
@@ -287,7 +291,9 @@ func Cli(command string, strict bool, instance string, destination string, owner
 				log.Fatal(err)
 			} else {
 				for _, e := range errs {
-					log.Error(e)
+					if e != nil {
+						log.Error(e)
+					}
 				}
 				for _, replica := range repointedReplicas {
 					fmt.Printf("%s<%s\n", replica.Key.DisplayString(), instanceKey.DisplayString())
@@ -370,7 +376,9 @@ func Cli(command string, strict bool, instance string, destination string, owner
 				log.Fatal(err)
 			} else {
 				for _, e := range errs {
-					log.Error(e)
+					if e != nil {
+						log.Error(e)
+					}
 				}
 				for _, replica := range movedReplicas {
 					fmt.Println(replica.Key.DisplayString())

diff --git a/go/vt/orchestrator/inst/analysis_dao.go b/go/vt/orchestrator/inst/analysis_dao.go
@@ -773,8 +773,9 @@ func auditInstanceAnalysisInChangelog(instanceKey *InstanceKey, analysisCode Ana
 	)
 	if err == nil {
 		analysisChangeWriteCounter.Inc(1)
+	} else {
+		log.Error(err)
 	}
-	log.Error(err)
 	return err
 }
 
@@ -788,7 +789,9 @@ func ExpireInstanceAnalysisChangelog() error {
 			`,
 		config.Config.UnseenInstanceForgetHours,
 	)
-	log.Error(err)
+	if err != nil {
+		log.Error(err)
+	}
 	return err
 }
 

diff --git a/go/vt/orchestrator/inst/candidate_database_instance_dao.go b/go/vt/orchestrator/inst/candidate_database_instance_dao.go
@@ -46,7 +46,9 @@ func RegisterCandidateInstance(candidate *CandidateDatabaseInstance) error {
 			`
 	writeFunc := func() error {
 		_, err := db.ExecOrchestrator(query, args...)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)
@@ -60,7 +62,9 @@ func ExpireCandidateInstances() error {
 				where last_suggested < NOW() - INTERVAL ? MINUTE
 				`, config.Config.CandidateInstanceExpireMinutes,
 		)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)

diff --git a/go/vt/orchestrator/inst/cluster_alias_dao.go b/go/vt/orchestrator/inst/cluster_alias_dao.go
@@ -90,7 +90,9 @@ func writeClusterAlias(clusterName string, alias string) error {
 					(?, ?, now())
 			`,
 			clusterName, alias)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)
@@ -106,7 +108,9 @@ func writeClusterAliasManualOverride(clusterName string, alias string) error {
 					(?, ?)
 			`,
 			clusterName, alias)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)
@@ -139,7 +143,9 @@ func UpdateClusterAliases() error {
 						read_only desc,
 						num_replica_hosts asc
 			`, DowntimeLostInRecoveryMessage)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	if err := ExecDBWriteFunc(writeFunc); err != nil {
@@ -159,7 +165,9 @@ func UpdateClusterAliases() error {
 					having
 						sum(suggested_cluster_alias = '') = count(*)
 			`)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	if err := ExecDBWriteFunc(writeFunc); err != nil {
@@ -179,7 +187,9 @@ func ReplaceAliasClusterName(oldClusterName string, newClusterName string) (err
 				where cluster_name = ?
 			`,
 				newClusterName, oldClusterName)
-			log.Error(err)
+			if err != nil {
+				log.Error(err)
+			}
 			return err
 		}
 		err = ExecDBWriteFunc(writeFunc)
@@ -192,7 +202,9 @@ func ReplaceAliasClusterName(oldClusterName string, newClusterName string) (err
 				where cluster_name = ?
 			`,
 				newClusterName, oldClusterName)
-			log.Error(err)
+			if err != nil {
+				log.Error(err)
+			}
 			return err
 		}
 		if ferr := ExecDBWriteFunc(writeFunc); ferr != nil {

diff --git a/go/vt/orchestrator/inst/cluster_domain_dao.go b/go/vt/orchestrator/inst/cluster_domain_dao.go
@@ -35,7 +35,9 @@ func WriteClusterDomainName(clusterName string, domainName string) error {
 					last_registered=values(last_registered)
 			`,
 			clusterName, domainName)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)
@@ -49,7 +51,9 @@ func ExpireClusterDomainName() error {
 				where last_registered < NOW() - INTERVAL ? MINUTE
 				`, config.Config.ExpiryHostnameResolvesMinutes,
 		)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)

diff --git a/go/vt/orchestrator/inst/instance_dao.go b/go/vt/orchestrator/inst/instance_dao.go
@@ -1884,7 +1884,9 @@ func GetClusterName(instanceKey *InstanceKey) (clusterName string, err error) {
 		instanceKeyInformativeClusterName.Set(instanceKey.StringCode(), clusterName, cache.DefaultExpiration)
 		return nil
 	})
-	log.Error(err)
+	if err != nil {
+		log.Error(err)
+	}
 	return clusterName, err
 }
 
@@ -2427,7 +2429,9 @@ func UpdateInstanceLastChecked(instanceKey *InstanceKey, partialSuccess bool) er
 			instanceKey.Hostname,
 			instanceKey.Port,
 		)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)
@@ -2454,7 +2458,9 @@ func UpdateInstanceLastAttemptedCheck(instanceKey *InstanceKey) error {
 			instanceKey.Hostname,
 			instanceKey.Port,
 		)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)
@@ -2635,7 +2641,9 @@ func RecordStaleInstanceBinlogCoordinates(instanceKey *InstanceKey, binlogCoordi
 					?, ?, ?, ?, NOW()
 				)`,
 		args...)
-	log.Error(err)
+	if err != nil {
+		log.Error(err)
+	}
 	return err
 }
 
@@ -2650,7 +2658,9 @@ func ExpireStaleInstanceBinlogCoordinates() error {
 					where first_seen < NOW() - INTERVAL ? SECOND
 					`, expireSeconds,
 		)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)
@@ -2668,7 +2678,9 @@ func ResetInstanceRelaylogCoordinatesHistory(instanceKey *InstanceKey) error {
 				hostname=? and port=?
 				`, instanceKey.Hostname, instanceKey.Port,
 		)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)

diff --git a/go/vt/orchestrator/inst/instance_topology.go b/go/vt/orchestrator/inst/instance_topology.go
@@ -1831,7 +1831,9 @@ func RegroupReplicasGTID(
 
 		movedReplicas, unmovedReplicas, _, err = MoveReplicasViaGTID(replicasToMove, candidateReplica, postponedFunctionsContainer)
 		unmovedReplicas = append(unmovedReplicas, aheadReplicas...)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	if postponedFunctionsContainer != nil && postponeAllMatchOperations != nil && postponeAllMatchOperations(candidateReplica, hasBestPromotionRule) {

diff --git a/go/vt/orchestrator/inst/instance_topology_dao.go b/go/vt/orchestrator/inst/instance_topology_dao.go
@@ -404,7 +404,9 @@ func RestartReplication(instanceKey *InstanceKey) (instance *Instance, err error
 		return instance, err
 	}
 	instance, err = StartReplication(instanceKey)
-	log.Error(err)
+	if err != nil {
+		log.Error(err)
+	}
 	return instance, err
 }
 

diff --git a/go/vt/orchestrator/inst/maintenance_dao.go b/go/vt/orchestrator/inst/maintenance_dao.go
@@ -163,7 +163,9 @@ func InMaintenance(instanceKey *InstanceKey) (inMaintenance bool, err error) {
 		return nil
 	})
 
-	log.Error(err)
+	if err != nil {
+		log.Error(err)
+	}
 	return inMaintenance, err
 }
 
@@ -189,7 +191,9 @@ func ReadMaintenanceInstanceKey(maintenanceToken int64) (*InstanceKey, error) {
 		return nil
 	})
 
-	log.Error(err)
+	if err != nil {
+		log.Error(err)
+	}
 	return res, err
 }
 

diff --git a/go/vt/orchestrator/inst/pool_dao.go b/go/vt/orchestrator/inst/pool_dao.go
@@ -131,6 +131,8 @@ func ExpirePoolInstances() error {
 			`,
 		config.Config.InstancePoolExpiryMinutes,
 	)
-	log.Error(err)
+	if err != nil {
+		log.Error(err)
+	}
 	return err
 }
diff --git a/go/vt/orchestrator/inst/resolve_dao.go b/go/vt/orchestrator/inst/resolve_dao.go
@@ -143,7 +143,9 @@ func ReadAllHostnameUnresolves() ([]HostnameUnresolve, error) {
 		return nil
 	})
 
-	log.Error(err)
+	if err != nil {
+		log.Error(err)
+	}
 	return unres, err
 }
 
@@ -213,7 +215,9 @@ func DeleteHostnameUnresolve(instanceKey *InstanceKey) error {
 				where hostname=?
 				`, instanceKey.Hostname,
 		)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)
@@ -227,7 +231,9 @@ func ExpireHostnameUnresolve() error {
 				where last_registered < NOW() - INTERVAL ? MINUTE
 				`, config.Config.ExpiryHostnameResolvesMinutes,
 		)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)
@@ -277,7 +283,9 @@ func DeleteInvalidHostnameResolves() error {
 				hostname = ?`,
 			invalidHostname,
 		)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 	}
 	return err
 }
@@ -308,7 +316,9 @@ func writeHostnameIPs(hostname string, ipv4String string, ipv6String string) err
 			ipv4String,
 			ipv6String,
 		)
-		log.Error(err)
+		if err != nil {
+			log.Error(err)
+		}
 		return err
 	}
 	return ExecDBWriteFunc(writeFunc)

diff --git a/go/vt/orchestrator/inst/tag_dao.go b/go/vt/orchestrator/inst/tag_dao.go
@@ -125,7 +125,9 @@ func ReadInstanceTag(instanceKey *InstanceKey, tag *Tag) (tagExists bool, err er
 		return nil
 	})
 
-	log.Error(err)
+	if err != nil {
+		log.Error(err)
+	}
 	return tagExists, err
 }
 
@@ -151,7 +153,9 @@ func ReadInstanceTags(instanceKey *InstanceKey) (tags [](*Tag), err error) {
 		return nil
 	})
 
-	log.Error(err)
+	if err != nil {
+		log.Error(err)
+	}
 	return tags, err
 }
 
@@ -196,6 +200,8 @@ func GetInstanceKeysByTag(tag *Tag) (tagged *InstanceKeyMap, err error) {
 		tagged.AddKey(*key)
 		return nil
 	})
-	log.Error(err)
+	if err != nil {
+		log.Error(err)
+	}
 	return tagged, err
 }