[refactor]

Author: skywalker-jpg

ydb/core/fq/libs/actors/database_resolver.cpp

@@ -468,43 +468,43 @@ class TDatabaseResolver: public TActor<TDatabaseResolver>
             NYql::IMdbEndpointGenerator::TEndpoint endpoint;
             TVector<TString> aliveHosts;
 
-            for (const auto& host : databaseInfo.GetMap().at("hosts").GetArraySafe()) {
-                const auto& hostMap = host.GetMap();
 
-                if (!hostMap.contains("services")) {
-                    // indicates that cluster is down
-                    continue;
-                }
-
-                // all services of a particular host must be alive
-                bool alive = true;
+        for (const auto& host : databaseInfo.GetMap().at("hosts").GetArraySafe()) {
+            const auto& hostMap = host.GetMap();
 
-                for (const auto& service: hostMap.at("services").GetArraySafe()) {
-                    if (service["health"].GetString() != "ALIVE") {
-                        alive = false;
-                        break;
-                    }
-                }
+            if (!hostMap.contains("services")) {
+                // indicates that cluster is down
+                continue;
+            }
 
-                if (alive) {
-                    aliveHosts.push_back(host["name"].GetString());
-                }
+            // check if all services of a particular host are alive
+            bool alive = std::all_of(
+            hostMap.at("services").GetArraySafe().begin(),
+            hostMap.at("services").GetArraySafe().end(),
+            [](const auto& service) {
+                return service["health"].GetString() == "ALIVE";
             }
-            
-            if (aliveHosts.empty()) {
-                ythrow TCodeLineException(TIssuesIds::INTERNAL_ERROR) << "No ALIVE MySQL hosts found";
+            );
+
+            if (alive) {
+                aliveHosts.push_back(host["name"].GetString());
             }
+        }
 
-            NYql::IMdbEndpointGenerator::TParams params = {
-                .DatabaseType = NYql::EDatabaseType::MySQL,
-                .MdbHost = aliveHosts[std::rand() % static_cast<int>(aliveHosts.size())],
-                .UseTls = useTls,
-                .Protocol = protocol,
-            };
+        if (aliveHosts.empty()) {
+            ythrow TCodeLineException(TIssuesIds::INTERNAL_ERROR) << "No ALIVE MySQL hosts found";
+        }
 
-            endpoint = mdbEndpointGenerator->ToEndpoint(params);
+        NYql::IMdbEndpointGenerator::TParams params = {
+        .DatabaseType = NYql::EDatabaseType::MySQL,
+        .MdbHost = aliveHosts[std::rand() % static_cast<int>(aliveHosts.size())],
+        .UseTls = useTls,
+        .Protocol = protocol,
+        };
 
-            return TDatabaseDescription{"", endpoint.first, endpoint.second, "", useTls};
+        endpoint = mdbEndpointGenerator->ToEndpoint(params);
+
+        return TDatabaseDescription{"", endpoint.first, endpoint.second, "", useTls};
         };
     }
 

ydb/core/fq/libs/actors/ut/database_resolver_ut.cpp

@@ -567,7 +567,7 @@ Y_UNIT_TEST_SUITE(TDatabaseResolverTests) {
             NYql::TDatabaseResolverResponse::TDatabaseDescription{
                 TString{""},
                 TString{"rc1b-eyt6dtobu96rwydq.db.yandex.net"},
-                6432,
+                3306,
                 TString(""),
                 true
                 },
@@ -583,7 +583,7 @@ Y_UNIT_TEST_SUITE(TDatabaseResolverTests) {
                     "/managed-mysql/v1/clusters/etn021us5r9rhld1vgbh/hosts",
                     "etn021us5r9rhld1vgbh",
                     NYql::EDatabaseType::MySQL
-                ) << NoPermissionStr << " Please check that your service account has role `managed-mysql.viewer`."
+                ) << NoPermissionStr
             )
         };