Fix failed tests due to mismatch traces on ARM builds.

This patch makes sure that arguments are called in order to maintain
build traces order consistency.

Change-Id: I1f701e1ca7d1c689ec5fe728f85f6eef692fc48d

Author: joaosigma

modules/adminapi/cluster/add_instance.cc

@@ -431,19 +431,24 @@ void Add_instance::prepare(checks::Check_type check_type,
       current_console()->print_info(
           "* Checking connectivity and SSL configuration...");
 
-      std::string cert_issuer =
-          m_cluster_impl->query_cluster_auth_cert_issuer();
+      auto cert_issuer = m_cluster_impl->query_cluster_auth_cert_issuer();
+      auto instance_cert_subject =
+          m_cluster_impl->query_cluster_instance_auth_cert_subject(
+              m_primary_instance->get_uuid());
+
+      auto gr_local_address =
+          m_primary_instance
+              ->get_sysvar_string("group_replication_local_address")
+              .value_or("");
+
       mysqlshdk::mysql::Set_variable disable_sro(
           *m_target_instance, "super_read_only", false, true);
+
       test_peer_connection(
           *m_target_instance, m_gr_opts.local_address.value_or(""),
-          m_options.cert_subject, *m_primary_instance,
-          m_primary_instance
-              ->get_sysvar_string("group_replication_local_address")
-              .value_or(""),
-          m_cluster_impl->query_cluster_instance_auth_cert_subject(
-              m_primary_instance->get_uuid()),
-          m_gr_opts.ssl_mode, auth_type, cert_issuer, m_comm_stack);
+          m_options.cert_subject, *m_primary_instance, gr_local_address,
+          instance_cert_subject, m_gr_opts.ssl_mode, auth_type, cert_issuer,
+          m_comm_stack);
 
       current_console()->print_info();
     }

modules/adminapi/cluster_set/cluster_set_impl.cc

@@ -276,8 +276,6 @@ Cluster_set_impl::refresh_cluster_replication_user(Cluster_impl *cluster,
   std::tie(repl_user, repl_user_host) = get_cluster_repl_account(cluster);
 
   try {
-    auto console = mysqlsh::current_console();
-
     log_info("Resetting password for %s@%s at %s", repl_user.c_str(),
              repl_user_host.c_str(), primary->descr().c_str());
     // re-create replication with a new generated password
@@ -639,7 +637,11 @@ void ensure_no_router_uses_cluster(const std::vector<Router_metadata> &routers,
 
 Cluster_global_status Cluster_set_impl::get_cluster_global_status(
     Cluster_impl *cluster) const {
-  assert(cluster->is_cluster_set_member());
+  {
+    auto cluster_set_member = cluster->is_cluster_set_member();
+    assert(cluster_set_member);
+    if (!cluster_set_member) return Cluster_global_status::UNKNOWN;
+  }
 
   if (cluster->is_invalidated()) return Cluster_global_status::INVALIDATED;
 
@@ -1865,7 +1867,6 @@ void Cluster_set_impl::update_replica(
     bool dry_run) {
   log_info("Updating replication source at %s", replica->descr().c_str());
 
-  auto console = current_console();
   auto repl_options = ar_options;
 
   try {
@@ -1883,8 +1884,9 @@ void Cluster_set_impl::update_replica(
     log_info("Replication source changed for %sinstance %s",
              (primary_instance ? "primary " : ""), replica->descr().c_str());
   } catch (...) {
-    console->print_error("Error updating replication source for " +
-                         replica->descr() + ": " + format_active_exception());
+    current_console()->print_error("Error updating replication source for " +
+                                   replica->descr() + ": " +
+                                   format_active_exception());
 
     throw shcore::Exception(
         "Could not update replication source of " + replica->descr(),