DISTMYSQL-421: Remove master-slave terminologies in Orchestrator

Addressed review comments.

Author: kamil-holubicki

go/db/tls.go

@@ -81,20 +81,22 @@ var query_whitelist = []string{
 }
 
 func (logger SqlUtilsLogger) ValidateQuery(query string) {
-	if !logger.backend_connection {
-		// check if whitelisted
-		for i := 0; i < len(query_whitelist); i++ {
-			if strings.Contains(query, query_whitelist[i]) {
-				return
-			}
-		}
+	if logger.backend_connection {
+		return
+	}
 
-		lquery := strings.ToLower(query)
-		if strings.Contains(lquery, "master") || strings.Contains(lquery, "slave") {
-			log.Error("QUERY CONTAINS MASTER / SLAVE: ")
-			// panic("Query contains master/slave: " + query)
+	// check if whitelisted
+	for i := 0; i < len(query_whitelist); i++ {
+		if strings.Contains(query, query_whitelist[i]) {
+			return
 		}
 	}
+
+	lquery := strings.ToLower(query)
+	if strings.Contains(lquery, "master") || strings.Contains(lquery, "slave") {
+		log.Error("QUERY CONTAINS MASTER / SLAVE: ")
+		// panic("Query contains master/slave: " + query)
+	}
 }
 
 func requiresTLS(host string, port int, mysql_uri string) bool {

go/golib/sqlutils/sqlutils.go

@@ -175,9 +175,8 @@ func validateQuery(query string, db *sql.DB) {
 	return
 
 	knownDBsMutex.RLock()
-	defer func() {
-		knownDBsMutex.RUnlock()
-	}()
+	defer knownDBsMutex.RUnlock()
+
 	if logger, exists := DB2logger[db]; exists && logger != nil {
 		logger.ValidateQuery((query))
 	}
@@ -283,9 +282,7 @@ func ScanRowsToMaps(rows *sql.Rows, on_row func(RowMap) error) error {
 func logErrorInternal(context string, db *sql.DB, query string, err error) error {
 	// find logger registered by the client
 	knownDBsMutex.RLock()
-	defer func() {
-		knownDBsMutex.RUnlock()
-	}()
+	defer knownDBsMutex.RUnlock()
 
 	if logger, exists := DB2logger[db]; exists && logger != nil {
 		return logger.OnError(context, query, err)