Skip to content

Commit e58cdef

Browse files
author
Athreya Permunda
committed
Bug# 27191764 : AUTOTEST : ATRT DATABASE WRONGLY CONFIGURED TO
USE CLUSTER Description: When ATRT generates processes configuration it assumes all MySQL servers should have cluster connection options. While this might be true for MySQL servers used in testing, this is not the case for the ATRT database. Update ATRT settings generation such that it no longer treats all mysqld instances the same way and skips cluster and replication features for atrt. Additionally, for a configuration specifying just two replicated mysqld without cluster defined, update settings such that ndb-connectstring is not generated and hence, the servers don't try to connect to Cluster.
1 parent d868cde commit e58cdef

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

storage/ndb/test/run-test/setup.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -785,12 +785,16 @@ static bool pr_check_replication(Properties& props, proc_rule_ctx& ctx, int) {
785785
}
786786

787787
static bool pr_check_features(Properties& props, proc_rule_ctx& ctx, int) {
788-
int features = 0;
789788
atrt_cluster& cluster = *ctx.m_cluster;
789+
if (cluster.m_name == ".atrt"){
790+
// skip cluster and replication features for atrt
791+
return true;
792+
}
793+
794+
int features = 0;
790795
for (unsigned i = 0; i < cluster.m_processes.size(); i++) {
791796
if (cluster.m_processes[i]->m_type == atrt_process::AP_NDB_MGMD ||
792797
cluster.m_processes[i]->m_type == atrt_process::AP_NDB_API ||
793-
cluster.m_processes[i]->m_type == atrt_process::AP_MYSQLD ||
794798
cluster.m_processes[i]->m_type == atrt_process::AP_NDBD) {
795799
features |= atrt_options::AO_NDBCLUSTER;
796800
break;

0 commit comments

Comments
 (0)