Added quoting to the mysql exec
Removed it from sql exec(it already does quoting) Small fix in try\excpect for non existing key Change-Id: I829fb6bf8db06c1e1c980bd204a6e68710f50076
This commit is contained in:
parent
9cd4b59e37
commit
3451de421f
|
@ -146,14 +146,16 @@ def run_cmd(cmd, check_result=False):
|
||||||
|
|
||||||
def run_mysqld(available_nodes):
|
def run_mysqld(available_nodes):
|
||||||
|
|
||||||
cmd = ("mysqld --user=mysql --wsrep_cluster_name='%s'"
|
cmd = ("mysqld --user=mysql --wsrep_cluster_name=%s"
|
||||||
" --wsrep_cluster_address='gcomm://%s'"
|
" --wsrep_cluster_address=%s"
|
||||||
" --wsrep_sst_method=xtrabackup-v2"
|
" --wsrep_sst_method=xtrabackup-v2"
|
||||||
" --wsrep_sst_auth='xtrabackup:%s'"
|
" --wsrep_sst_auth=%s"
|
||||||
" --wsrep_node_address='%s'"
|
" --wsrep_node_address=%s"
|
||||||
" --pxc_strict_mode=PERMISSIVE" %
|
" --pxc_strict_mode=PERMISSIVE" %
|
||||||
(CLUSTER_NAME, available_nodes,
|
(six.moves.shlex_quote(CLUSTER_NAME),
|
||||||
XTRABACKUP_PASSWORD, IPADDR))
|
"gcomm://%s" % six.moves.shlex_quote(available_nodes),
|
||||||
|
"xtrabackup:%s" % six.moves.shlex_quote(XTRABACKUP_PASSWORD),
|
||||||
|
six.moves.shlex_quote(IPADDR)))
|
||||||
mysqld_proc = run_cmd(cmd)
|
mysqld_proc = run_cmd(cmd)
|
||||||
wait_for_mysqld_to_start(mysqld_proc, insecure=False)
|
wait_for_mysqld_to_start(mysqld_proc, insecure=False)
|
||||||
return mysqld_proc
|
return mysqld_proc
|
||||||
|
@ -175,15 +177,16 @@ def fetch_status(etcd_client, path):
|
||||||
key = os.path.join(ETCD_PATH, path)
|
key = os.path.join(ETCD_PATH, path)
|
||||||
try:
|
try:
|
||||||
root = etcd_client.get(key)
|
root = etcd_client.get(key)
|
||||||
result = [str(child.key).replace(key + "/", '')
|
|
||||||
for child in root.children
|
|
||||||
if str(child.key) != key]
|
|
||||||
LOG.debug("Current nodes in %s is: %s", key, result)
|
|
||||||
return result
|
|
||||||
except etcd.EtcdKeyNotFound:
|
except etcd.EtcdKeyNotFound:
|
||||||
LOG.debug("Current nodes in %s is: %s", key, None)
|
LOG.debug("Current nodes in %s is: %s", key, None)
|
||||||
return []
|
return []
|
||||||
|
|
||||||
|
result = [str(child.key).replace(key + "/", '')
|
||||||
|
for child in root.children
|
||||||
|
if str(child.key) != key]
|
||||||
|
LOG.debug("Current nodes in %s is: %s", key, result)
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
def fetch_wsrep_data():
|
def fetch_wsrep_data():
|
||||||
|
|
||||||
|
@ -443,16 +446,16 @@ def mysql_init():
|
||||||
|
|
||||||
LOG.info("Mysql is running, setting up the permissions")
|
LOG.info("Mysql is running, setting up the permissions")
|
||||||
sql_list = [("CREATE USER 'root'@'%%' IDENTIFIED BY %s",
|
sql_list = [("CREATE USER 'root'@'%%' IDENTIFIED BY %s",
|
||||||
six.moves.shlex_quote(MYSQL_ROOT_PASSWORD)),
|
MYSQL_ROOT_PASSWORD),
|
||||||
("GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION", None),
|
("GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION", None),
|
||||||
("ALTER USER 'root'@'localhost' IDENTIFIED BY %s",
|
("ALTER USER 'root'@'localhost' IDENTIFIED BY %s",
|
||||||
six.moves.shlex_quote(MYSQL_ROOT_PASSWORD)),
|
MYSQL_ROOT_PASSWORD),
|
||||||
("CREATE USER 'xtrabackup'@'localhost' IDENTIFIED BY %s",
|
("CREATE USER 'xtrabackup'@'localhost' IDENTIFIED BY %s",
|
||||||
six.moves.shlex_quote(XTRABACKUP_PASSWORD)),
|
XTRABACKUP_PASSWORD),
|
||||||
("GRANT RELOAD,PROCESS,LOCK TABLES,REPLICATION CLIENT ON *.*"
|
("GRANT RELOAD,PROCESS,LOCK TABLES,REPLICATION CLIENT ON *.*"
|
||||||
" TO 'xtrabackup'@'localhost'", None),
|
" TO 'xtrabackup'@'localhost'", None),
|
||||||
("GRANT REPLICATION CLIENT ON *.* TO monitor@'%%' IDENTIFIED"
|
("GRANT REPLICATION CLIENT ON *.* TO monitor@'%%' IDENTIFIED"
|
||||||
" BY %s", six.moves.shlex_quote(MONITOR_PASSWORD)),
|
" BY %s", MONITOR_PASSWORD),
|
||||||
("DROP DATABASE IF EXISTS test", None),
|
("DROP DATABASE IF EXISTS test", None),
|
||||||
("FLUSH PRIVILEGES", None)]
|
("FLUSH PRIVILEGES", None)]
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue