From 2b2a57a85d22fa0b51edd3a9d162334738eb857b Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Thu, 9 Jul 2020 17:01:50 +0530 Subject: [PATCH 01/10] fix: use subprocess instead of os to run commands * add a wrapper method run_command * remove os.system calls * use f-strings for commands Signed-off-by: Chinmay D. Pai --- build/common/commands/new.py | 28 +++----- build/common/commands/restore_backup.py | 92 +++++++++---------------- 2 files changed, 43 insertions(+), 77 deletions(-) diff --git a/build/common/commands/new.py b/build/common/commands/new.py index cab9bc61..96175e12 100644 --- a/build/common/commands/new.py +++ b/build/common/commands/new.py @@ -5,6 +5,7 @@ import semantic_version from frappe.commands.site import _new_site from frappe.installer import update_site_config from check_connection import get_config, get_site_config, COMMON_SITE_CONFIG_FILE +from restore_backup import run_command def get_password(env_var, default=None): @@ -91,31 +92,22 @@ def main(): if db_type == "mariadb": site_config = get_site_config(site_name) + db_name = site_config.get('db_name') + db_password = site_config.get('db_password') - mysql_command = 'mysql -h{db_host} -u{mariadb_root_username} -p{mariadb_root_password} -e '.format( - db_host=config.get('db_host'), - mariadb_root_username=mariadb_root_username, - mariadb_root_password=mariadb_root_password - ) + mysql_command = ["mysql", f"-h{db_host}", f"-u{mariadb_root_username}", f"-p{mariadb_root_password}", "-e"] # update User's host to '%' required to connect from any container - command = mysql_command + "\"UPDATE mysql.user SET Host = '%' where User = '{db_name}'; FLUSH PRIVILEGES;\"".format( - db_name=site_config.get('db_name') - ) - os.system(command) + command = mysql_command + [f"\"UPDATE mysql.user SET Host = '%' where User = '{db_name}'; FLUSH PRIVILEGES;\""] + run_command(command) # Set db password - command = mysql_command + "\"ALTER USER '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;\"".format( - db_name=site_config.get('db_name'), - db_password=site_config.get('db_password') - ) - os.system(command) + command = mysql_command + [f"\"ALTER USER '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;\""] + run_command(command) # Grant permission to database - command = mysql_command + "\"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%'; FLUSH PRIVILEGES;\"".format( - db_name=site_config.get('db_name') - ) - os.system(command) + command = mysql_command + [f"\"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%'; FLUSH PRIVILEGES;\""] + run_command(command) if frappe.redis_server: frappe.redis_server.connection_pool.disconnect() diff --git a/build/common/commands/restore_backup.py b/build/common/commands/restore_backup.py index efb51545..ce085bfc 100644 --- a/build/common/commands/restore_backup.py +++ b/build/common/commands/restore_backup.py @@ -1,6 +1,7 @@ import os import datetime import json +import subprocess import tarfile import hashlib import frappe @@ -13,6 +14,16 @@ from frappe.installer import make_conf, get_conf_params, make_site_dirs, update_ from check_connection import get_site_config, get_config, COMMON_SITE_CONFIG_FILE +def run_command(command): + process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + out, error = process.communicate() + if process.returncode: + print("Something went wrong:") + print(f"error code: {process.returncode}") + print(f"stdout:\n{out}") + print(f"\nstderr:\n{error}") + + def list_directories(path): directories = [] for name in os.listdir(path): @@ -30,13 +41,10 @@ def get_backup_dir(): def decompress_db(files_base, site): database_file = files_base + '-database.sql.gz' - command = 'gunzip -c {database_file} > {database_extract}'.format( - database_file=database_file, - database_extract=database_file.replace('.gz', '') - ) + command = ["gunzip", "-c", database_file, ">", database_file.replace(".gz", "")] print('Extract Database GZip for site {}'.format(site)) - os.system(command) + run_command(command) def restore_database(files_base, site_config_path, site): @@ -203,28 +211,15 @@ def restore_postgres(config, site_config, database_file): db_name = site_config.get('db_name') db_password = site_config.get('db_password') - psql_command = "psql postgres://{root_login}:{root_password}@{db_host}:{db_port}".format( - root_login=db_root_user, - root_password=db_root_password, - db_host=db_host, - db_port=db_port - ) + psql_command = ["psql", f"postgres://{db_root_user}:{db_root_password}@{db_host}:{db_port}"] print('Restoring PostgreSQL') - os.system(psql_command + ' -c "DROP DATABASE IF EXISTS \"{db_name}\""'.format(db_name=db_name)) - os.system(psql_command + ' -c "DROP USER IF EXISTS {db_name}"'.format(db_name=db_name)) - os.system(psql_command + ' -c "CREATE DATABASE \"{db_name}\""'.format(db_name=db_name)) - os.system(psql_command + ' -c "CREATE user {db_name} password \'{db_password}\'"'.format( - db_name=db_name, - db_password=db_password)) - os.system(psql_command + ' -c "GRANT ALL PRIVILEGES ON DATABASE \"{db_name}\" TO {db_name}"'.format( - db_name=db_name)) - - os.system("{psql_command}/{db_name} < {database_file}".format( - psql_command=psql_command, - database_file=database_file.replace('.gz', ''), - db_name=db_name, - )) + run_command(psql_command + ["-c", f"\"DROP DATABASE IF EXISTS \"{db_name}\"\""]) + run_command(psql_command + ["-c", f"\"DROP USER IF EXISTS {db_name}\""]) + run_command(psql_command + ["-c ", f"\"CREATE DATABASE \"{db_name}\"\""]) + run_command(psql_command + ["-c", f"\"CREATE user {db_name} password '{db_password}'\""]) + run_command(psql_command + ["-c", f"\"GRANT ALL PRIVILEGES ON DATABASE \"{db_name}\" TO {db_name}\""]) + run_command([f"{psql_command}/{db_name}", "<", database_file.replace('.gz', '')]) def restore_mariadb(config, site_config, database_file): @@ -237,53 +232,32 @@ def restore_mariadb(config, site_config, database_file): db_host = site_config.get('db_host', config.get('db_host')) db_port = site_config.get('db_port', config.get('db_port')) + db_name = site_config.get('db_name') + db_password = site_config.get('db_password') # mysql command prefix - mysql_command = 'mysql -u{db_root_user} -h{db_host} -p{db_password}'.format( - db_root_user=db_root_user, - db_host=db_host, - db_port=db_port, - db_password=db_root_password - ) + mysql_command = ["mysql", f"-u{db_root_user}", f"-h{db_host}", f"-p{db_root_password}", f"-P{db_port}"] # drop db if exists for clean restore - drop_database = "{mysql_command} -e \"DROP DATABASE IF EXISTS \`{db_name}\`;\"".format( - mysql_command=mysql_command, - db_name=site_config.get('db_name'), - ) - os.system(drop_database) + drop_database = mysql_command + ["-e", f"\"DROP DATABASE IF EXISTS \`{db_name}\`;\""] + run_command(drop_database) # create db - create_database = "{mysql_command} -e \"CREATE DATABASE IF NOT EXISTS \`{db_name}\`;\"".format( - mysql_command=mysql_command, - db_name=site_config.get('db_name'), - ) - os.system(create_database) + create_database = mysql_command + ["-e", f"\"CREATE DATABASE IF NOT EXISTS \`{db_name}\`;\""] + run_command(create_database) # create user - create_user = "{mysql_command} -e \"CREATE USER IF NOT EXISTS \'{db_name}\'@\'%\' IDENTIFIED BY \'{db_password}\'; FLUSH PRIVILEGES;\"".format( - mysql_command=mysql_command, - db_name=site_config.get('db_name'), - db_password=site_config.get('db_password'), - ) - os.system(create_user) + create_user = mysql_command + ["-e", f"\"CREATE USER IF NOT EXISTS \'{db_name}\'@\'%\' IDENTIFIED BY \'{db_password}\'; FLUSH PRIVILEGES;\""] + run_command(create_user) # grant db privileges to user - grant_privileges = "{mysql_command} -e \"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;\"".format( - mysql_command=mysql_command, - db_name=site_config.get('db_name'), - db_password=site_config.get('db_password'), - ) - os.system(grant_privileges) + grant_privileges = mysql_command + ["-e", f"\"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;\""] + run_command(grant_privileges) - command = "{mysql_command} '{db_name}' < {database_file}".format( - mysql_command=mysql_command, - db_name=site_config.get('db_name'), - database_file=database_file.replace('.gz', ''), - ) + command = mysql_command + [f"'{db_name}'", "<", database_file.replace(".gz", "")] print('Restoring MariaDB') - os.system(command) + run_command(command) def main(): From 5c57334bb61ecd44d8b6b69080dce9ff4748a806 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Thu, 9 Jul 2020 17:27:54 +0530 Subject: [PATCH 02/10] fix: move run_command to utils Signed-off-by: Chinmay D. Pai --- build/common/commands/new.py | 2 +- build/common/commands/restore_backup.py | 12 +----------- build/common/commands/utils.py | 12 ++++++++++++ 3 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 build/common/commands/utils.py diff --git a/build/common/commands/new.py b/build/common/commands/new.py index 96175e12..feba0401 100644 --- a/build/common/commands/new.py +++ b/build/common/commands/new.py @@ -5,7 +5,7 @@ import semantic_version from frappe.commands.site import _new_site from frappe.installer import update_site_config from check_connection import get_config, get_site_config, COMMON_SITE_CONFIG_FILE -from restore_backup import run_command +from utils import run_command def get_password(env_var, default=None): diff --git a/build/common/commands/restore_backup.py b/build/common/commands/restore_backup.py index ce085bfc..dc7333e0 100644 --- a/build/common/commands/restore_backup.py +++ b/build/common/commands/restore_backup.py @@ -1,7 +1,6 @@ import os import datetime import json -import subprocess import tarfile import hashlib import frappe @@ -9,21 +8,12 @@ import boto3 from new import get_password from push_backup import DATE_FORMAT, check_environment_variables +from utils import run_command from frappe.utils import get_sites, random_string from frappe.installer import make_conf, get_conf_params, make_site_dirs, update_site_config from check_connection import get_site_config, get_config, COMMON_SITE_CONFIG_FILE -def run_command(command): - process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - out, error = process.communicate() - if process.returncode: - print("Something went wrong:") - print(f"error code: {process.returncode}") - print(f"stdout:\n{out}") - print(f"\nstderr:\n{error}") - - def list_directories(path): directories = [] for name in os.listdir(path): diff --git a/build/common/commands/utils.py b/build/common/commands/utils.py new file mode 100644 index 00000000..d9535c6b --- /dev/null +++ b/build/common/commands/utils.py @@ -0,0 +1,12 @@ +import subprocess + + +def run_command(command): + process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + out, error = process.communicate() + if process.returncode: + print("Something went wrong:") + print(f"return code: {process.returncode}") + print(f"stdout:\n{out}") + print(f"\nstderr:\n{error}") + exit(process.returncode) From c67fc024521a8d822733b3de64f6f934d5afed98 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Thu, 9 Jul 2020 22:57:12 +0530 Subject: [PATCH 03/10] fix: make changes to psql restore Signed-off-by: Chinmay D. Pai --- build/common/commands/restore_backup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common/commands/restore_backup.py b/build/common/commands/restore_backup.py index dc7333e0..79d4ea0a 100644 --- a/build/common/commands/restore_backup.py +++ b/build/common/commands/restore_backup.py @@ -209,7 +209,7 @@ def restore_postgres(config, site_config, database_file): run_command(psql_command + ["-c ", f"\"CREATE DATABASE \"{db_name}\"\""]) run_command(psql_command + ["-c", f"\"CREATE user {db_name} password '{db_password}'\""]) run_command(psql_command + ["-c", f"\"GRANT ALL PRIVILEGES ON DATABASE \"{db_name}\" TO {db_name}\""]) - run_command([f"{psql_command}/{db_name}", "<", database_file.replace('.gz', '')]) + run_command(["psql", f"{psql_command[-1]}/{db_name}", "<", database_file.replace('.gz', '')]) def restore_mariadb(config, site_config, database_file): From 1d9dd966b182183f68792bb5cd4c1f194b7a3126 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Fri, 10 Jul 2020 10:07:22 +0530 Subject: [PATCH 04/10] fix: pipe uncompressed database to file Signed-off-by: Chinmay D. Pai --- build/common/commands/restore_backup.py | 13 ++++++------- build/common/commands/utils.py | 6 ++++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build/common/commands/restore_backup.py b/build/common/commands/restore_backup.py index 79d4ea0a..ecb2e24d 100644 --- a/build/common/commands/restore_backup.py +++ b/build/common/commands/restore_backup.py @@ -29,18 +29,17 @@ def get_backup_dir(): ) -def decompress_db(files_base, site): - database_file = files_base + '-database.sql.gz' - command = ["gunzip", "-c", database_file, ">", database_file.replace(".gz", "")] - - print('Extract Database GZip for site {}'.format(site)) - run_command(command) +def decompress_db(database_file, site): + command = ["gunzip", "-c", database_file] + with open(database_file.replace(".gz", ""), "w") as db_file: + print('Extract Database GZip for site {}'.format(site)) + run_command(command, stdout=db_file) def restore_database(files_base, site_config_path, site): # restore database database_file = files_base + '-database.sql.gz' - decompress_db(files_base, site) + decompress_db(database_file, site) config = get_config() # Set db_type if it exists in backup site_config.json diff --git a/build/common/commands/utils.py b/build/common/commands/utils.py index d9535c6b..d962fbd5 100644 --- a/build/common/commands/utils.py +++ b/build/common/commands/utils.py @@ -1,8 +1,10 @@ import subprocess -def run_command(command): - process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +def run_command(command, stdout=None, stderr=None): + stdout = stdout or subprocess.PIPE + stderr = stderr or subprocess.PIPE + process = subprocess.Popen(command, stdout=stdout, stderr=stderr) out, error = process.communicate() if process.returncode: print("Something went wrong:") From bafa7f65987604a6f8140d6f2c605548f25da3a3 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Fri, 10 Jul 2020 10:27:36 +0530 Subject: [PATCH 05/10] fix: remove quotes from psql db restore Signed-off-by: Chinmay D. Pai --- build/common/commands/restore_backup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/common/commands/restore_backup.py b/build/common/commands/restore_backup.py index ecb2e24d..1fe46ae5 100644 --- a/build/common/commands/restore_backup.py +++ b/build/common/commands/restore_backup.py @@ -203,9 +203,9 @@ def restore_postgres(config, site_config, database_file): psql_command = ["psql", f"postgres://{db_root_user}:{db_root_password}@{db_host}:{db_port}"] print('Restoring PostgreSQL') - run_command(psql_command + ["-c", f"\"DROP DATABASE IF EXISTS \"{db_name}\"\""]) + run_command(psql_command + ["-c", f"\"DROP DATABASE IF EXISTS {db_name}\""]) run_command(psql_command + ["-c", f"\"DROP USER IF EXISTS {db_name}\""]) - run_command(psql_command + ["-c ", f"\"CREATE DATABASE \"{db_name}\"\""]) + run_command(psql_command + ["-c ", f"\"CREATE DATABASE {db_name}\""]) run_command(psql_command + ["-c", f"\"CREATE user {db_name} password '{db_password}'\""]) run_command(psql_command + ["-c", f"\"GRANT ALL PRIVILEGES ON DATABASE \"{db_name}\" TO {db_name}\""]) run_command(["psql", f"{psql_command[-1]}/{db_name}", "<", database_file.replace('.gz', '')]) From fa2aff47df15645e9fa5792c82a4b32981a01236 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 10 Jul 2020 15:04:29 +0530 Subject: [PATCH 06/10] fix: psql command with subprocess --- build/common/commands/restore_backup.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build/common/commands/restore_backup.py b/build/common/commands/restore_backup.py index 1fe46ae5..fa8f4883 100644 --- a/build/common/commands/restore_backup.py +++ b/build/common/commands/restore_backup.py @@ -200,15 +200,16 @@ def restore_postgres(config, site_config, database_file): db_name = site_config.get('db_name') db_password = site_config.get('db_password') - psql_command = ["psql", f"postgres://{db_root_user}:{db_root_password}@{db_host}:{db_port}"] + psql_command = ["psql"] + psql_uri = f"postgres://{db_root_user}:{db_root_password}@{db_host}:{db_port}" print('Restoring PostgreSQL') - run_command(psql_command + ["-c", f"\"DROP DATABASE IF EXISTS {db_name}\""]) - run_command(psql_command + ["-c", f"\"DROP USER IF EXISTS {db_name}\""]) - run_command(psql_command + ["-c ", f"\"CREATE DATABASE {db_name}\""]) - run_command(psql_command + ["-c", f"\"CREATE user {db_name} password '{db_password}'\""]) - run_command(psql_command + ["-c", f"\"GRANT ALL PRIVILEGES ON DATABASE \"{db_name}\" TO {db_name}\""]) - run_command(["psql", f"{psql_command[-1]}/{db_name}", "<", database_file.replace('.gz', '')]) + run_command(psql_command + [psql_uri, "-c", f"DROP DATABASE IF EXISTS \"{db_name}\""]) + run_command(psql_command + [psql_uri, "-c", f"DROP USER IF EXISTS {db_name}"]) + run_command(psql_command + [psql_uri, "-c", f"CREATE DATABASE \"{db_name}\""]) + run_command(psql_command + [psql_uri, "-c", f"CREATE user {db_name} password '{db_password}'"]) + run_command(psql_command + [psql_uri, "-c", f"GRANT ALL PRIVILEGES ON DATABASE \"{db_name}\" TO {db_name}"]) + run_command(psql_command + [f"{psql_uri}/{db_name}", "<", database_file.replace('.gz', '')]) def restore_mariadb(config, site_config, database_file): From 31ff697835ef0af2be35dec43fbe9353140697f2 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 10 Jul 2020 15:42:36 +0530 Subject: [PATCH 07/10] fix: mysql command with subprocess --- build/common/commands/new.py | 6 +++--- build/common/commands/restore_backup.py | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/common/commands/new.py b/build/common/commands/new.py index feba0401..f6cc00a3 100644 --- a/build/common/commands/new.py +++ b/build/common/commands/new.py @@ -98,15 +98,15 @@ def main(): mysql_command = ["mysql", f"-h{db_host}", f"-u{mariadb_root_username}", f"-p{mariadb_root_password}", "-e"] # update User's host to '%' required to connect from any container - command = mysql_command + [f"\"UPDATE mysql.user SET Host = '%' where User = '{db_name}'; FLUSH PRIVILEGES;\""] + command = mysql_command + [f"UPDATE mysql.user SET Host = '%' where User = '{db_name}'; FLUSH PRIVILEGES;"] run_command(command) # Set db password - command = mysql_command + [f"\"ALTER USER '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;\""] + command = mysql_command + [f"ALTER USER '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;"] run_command(command) # Grant permission to database - command = mysql_command + [f"\"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%'; FLUSH PRIVILEGES;\""] + command = mysql_command + [f"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%'; FLUSH PRIVILEGES;"] run_command(command) if frappe.redis_server: diff --git a/build/common/commands/restore_backup.py b/build/common/commands/restore_backup.py index fa8f4883..d2e4f0ee 100644 --- a/build/common/commands/restore_backup.py +++ b/build/common/commands/restore_backup.py @@ -229,22 +229,22 @@ def restore_mariadb(config, site_config, database_file): mysql_command = ["mysql", f"-u{db_root_user}", f"-h{db_host}", f"-p{db_root_password}", f"-P{db_port}"] # drop db if exists for clean restore - drop_database = mysql_command + ["-e", f"\"DROP DATABASE IF EXISTS \`{db_name}\`;\""] + drop_database = mysql_command + ["-e", f"DROP DATABASE IF EXISTS \`{db_name}\`;"] run_command(drop_database) # create db - create_database = mysql_command + ["-e", f"\"CREATE DATABASE IF NOT EXISTS \`{db_name}\`;\""] + create_database = mysql_command + ["-e", f"CREATE DATABASE IF NOT EXISTS \`{db_name}\`;"] run_command(create_database) # create user - create_user = mysql_command + ["-e", f"\"CREATE USER IF NOT EXISTS \'{db_name}\'@\'%\' IDENTIFIED BY \'{db_password}\'; FLUSH PRIVILEGES;\""] + create_user = mysql_command + ["-e", f"CREATE USER IF NOT EXISTS \'{db_name}\'@\'%\' IDENTIFIED BY \'{db_password}\'; FLUSH PRIVILEGES;"] run_command(create_user) # grant db privileges to user - grant_privileges = mysql_command + ["-e", f"\"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;\""] + grant_privileges = mysql_command + ["-e", f"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;"] run_command(grant_privileges) - command = mysql_command + [f"'{db_name}'", "<", database_file.replace(".gz", "")] + command = mysql_command + [f"{db_name}", "<", database_file.replace(".gz", "")] print('Restoring MariaDB') run_command(command) From 4598cb24f4a8ccca751898c1a7cdc3e462265bb0 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 10 Jul 2020 16:18:25 +0530 Subject: [PATCH 08/10] fix: file input with subprocess --- build/common/commands/restore_backup.py | 8 ++++---- build/common/commands/utils.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/common/commands/restore_backup.py b/build/common/commands/restore_backup.py index d2e4f0ee..2ae6ca78 100644 --- a/build/common/commands/restore_backup.py +++ b/build/common/commands/restore_backup.py @@ -209,7 +209,8 @@ def restore_postgres(config, site_config, database_file): run_command(psql_command + [psql_uri, "-c", f"CREATE DATABASE \"{db_name}\""]) run_command(psql_command + [psql_uri, "-c", f"CREATE user {db_name} password '{db_password}'"]) run_command(psql_command + [psql_uri, "-c", f"GRANT ALL PRIVILEGES ON DATABASE \"{db_name}\" TO {db_name}"]) - run_command(psql_command + [f"{psql_uri}/{db_name}", "<", database_file.replace('.gz', '')]) + with open(database_file.replace('.gz', ''), 'r') as db_file: + run_command(psql_command + [f"{psql_uri}/{db_name}", "<"], stdin=db_file) def restore_mariadb(config, site_config, database_file): @@ -244,10 +245,9 @@ def restore_mariadb(config, site_config, database_file): grant_privileges = mysql_command + ["-e", f"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;"] run_command(grant_privileges) - command = mysql_command + [f"{db_name}", "<", database_file.replace(".gz", "")] - print('Restoring MariaDB') - run_command(command) + with open(database_file.replace(".gz", ""), "r") as db_file: + run_command(mysql_command + [f"{db_name}", "<"], stdin=db_file) def main(): diff --git a/build/common/commands/utils.py b/build/common/commands/utils.py index d962fbd5..8ebffb63 100644 --- a/build/common/commands/utils.py +++ b/build/common/commands/utils.py @@ -1,10 +1,10 @@ import subprocess -def run_command(command, stdout=None, stderr=None): +def run_command(command, stdout=None, stdin=None, stderr=None): stdout = stdout or subprocess.PIPE stderr = stderr or subprocess.PIPE - process = subprocess.Popen(command, stdout=stdout, stderr=stderr) + process = subprocess.Popen(command, stdout=stdout, stdin=stdin, stderr=stderr) out, error = process.communicate() if process.returncode: print("Something went wrong:") From 21e2b139556238d0ad21cb151016c1429ed34f51 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 10 Jul 2020 19:21:59 +0530 Subject: [PATCH 09/10] fix: mysql db commands with subprocess --- build/common/commands/new.py | 6 +++++- build/common/commands/restore_backup.py | 12 ++++++------ build/common/commands/utils.py | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build/common/commands/new.py b/build/common/commands/new.py index f6cc00a3..3438fa89 100644 --- a/build/common/commands/new.py +++ b/build/common/commands/new.py @@ -97,6 +97,10 @@ def main(): mysql_command = ["mysql", f"-h{db_host}", f"-u{mariadb_root_username}", f"-p{mariadb_root_password}", "-e"] + # Drop User if exists + command = mysql_command + [f"DROP USER IF EXISTS '{db_name}'@'%'; FLUSH PRIVILEGES;"] + run_command(command) + # update User's host to '%' required to connect from any container command = mysql_command + [f"UPDATE mysql.user SET Host = '%' where User = '{db_name}'; FLUSH PRIVILEGES;"] run_command(command) @@ -106,7 +110,7 @@ def main(): run_command(command) # Grant permission to database - command = mysql_command + [f"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%'; FLUSH PRIVILEGES;"] + command = mysql_command + [f"GRANT ALL PRIVILEGES ON `{db_name}`.* TO '{db_name}'@'%'; FLUSH PRIVILEGES;"] run_command(command) if frappe.redis_server: diff --git a/build/common/commands/restore_backup.py b/build/common/commands/restore_backup.py index 2ae6ca78..9fa9ef55 100644 --- a/build/common/commands/restore_backup.py +++ b/build/common/commands/restore_backup.py @@ -222,7 +222,7 @@ def restore_mariadb(config, site_config, database_file): db_root_user = os.environ.get("DB_ROOT_USER", 'root') db_host = site_config.get('db_host', config.get('db_host')) - db_port = site_config.get('db_port', config.get('db_port')) + db_port = site_config.get('db_port', config.get('db_port', 3306)) db_name = site_config.get('db_name') db_password = site_config.get('db_password') @@ -230,23 +230,23 @@ def restore_mariadb(config, site_config, database_file): mysql_command = ["mysql", f"-u{db_root_user}", f"-h{db_host}", f"-p{db_root_password}", f"-P{db_port}"] # drop db if exists for clean restore - drop_database = mysql_command + ["-e", f"DROP DATABASE IF EXISTS \`{db_name}\`;"] + drop_database = mysql_command + ["-e", f"DROP DATABASE IF EXISTS `{db_name}`;"] run_command(drop_database) # create db - create_database = mysql_command + ["-e", f"CREATE DATABASE IF NOT EXISTS \`{db_name}\`;"] + create_database = mysql_command + ["-e", f"CREATE DATABASE IF NOT EXISTS `{db_name}`;"] run_command(create_database) # create user - create_user = mysql_command + ["-e", f"CREATE USER IF NOT EXISTS \'{db_name}\'@\'%\' IDENTIFIED BY \'{db_password}\'; FLUSH PRIVILEGES;"] + create_user = mysql_command + ["-e", f"CREATE USER IF NOT EXISTS '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;"] run_command(create_user) # grant db privileges to user - grant_privileges = mysql_command + ["-e", f"GRANT ALL PRIVILEGES ON \`{db_name}\`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;"] + grant_privileges = mysql_command + ["-e", f"GRANT ALL PRIVILEGES ON `{db_name}`.* TO '{db_name}'@'%' IDENTIFIED BY '{db_password}'; FLUSH PRIVILEGES;"] run_command(grant_privileges) print('Restoring MariaDB') - with open(database_file.replace(".gz", ""), "r") as db_file: + with open(database_file.replace('.gz', ''), 'r') as db_file: run_command(mysql_command + [f"{db_name}", "<"], stdin=db_file) diff --git a/build/common/commands/utils.py b/build/common/commands/utils.py index 8ebffb63..c808132e 100644 --- a/build/common/commands/utils.py +++ b/build/common/commands/utils.py @@ -4,6 +4,7 @@ import subprocess def run_command(command, stdout=None, stdin=None, stderr=None): stdout = stdout or subprocess.PIPE stderr = stderr or subprocess.PIPE + stdin = stdin or subprocess.PIPE process = subprocess.Popen(command, stdout=stdout, stdin=stdin, stderr=stderr) out, error = process.communicate() if process.returncode: From 36f150bd95257e7ffdbc25d515b60cda7b759cb4 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Fri, 10 Jul 2020 19:45:28 +0530 Subject: [PATCH 10/10] fix: mysql restore db command with subprocess --- build/common/commands/restore_backup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common/commands/restore_backup.py b/build/common/commands/restore_backup.py index 9fa9ef55..7de34367 100644 --- a/build/common/commands/restore_backup.py +++ b/build/common/commands/restore_backup.py @@ -247,7 +247,7 @@ def restore_mariadb(config, site_config, database_file): print('Restoring MariaDB') with open(database_file.replace('.gz', ''), 'r') as db_file: - run_command(mysql_command + [f"{db_name}", "<"], stdin=db_file) + run_command(mysql_command + [f"{db_name}"], stdin=db_file) def main():