summaryrefslogtreecommitdiff
path: root/trove/guestagent
diff options
context:
space:
mode:
authorLingxian Kong <anlin.kong@gmail.com>2020-10-01 00:59:50 +1300
committerLingxian Kong <anlin.kong@gmail.com>2020-10-01 01:09:35 +1300
commit2f336f3eb1d146b416d39504d603640254d7ef3f (patch)
tree2f66e4c9f34e232904449504b2672ddcae7cba80 /trove/guestagent
parentb9cdf71757ed68cbac1c02e6631a151a82dd1bc4 (diff)
downloadtrove-2f336f3eb1d146b416d39504d603640254d7ef3f.tar.gz
[Postgresql] Adding config parameters
Change-Id: I578dd1ef341764d4ee002ad2cfdb3252f5695518
Diffstat (limited to 'trove/guestagent')
-rw-r--r--trove/guestagent/datastore/manager.py1
-rw-r--r--trove/guestagent/datastore/mysql_common/manager.py3
-rw-r--r--trove/guestagent/datastore/mysql_common/service.py2
-rw-r--r--trove/guestagent/datastore/postgres/manager.py5
-rw-r--r--trove/guestagent/datastore/postgres/service.py5
5 files changed, 11 insertions, 5 deletions
diff --git a/trove/guestagent/datastore/manager.py b/trove/guestagent/datastore/manager.py
index b9e86bce..9d9604dd 100644
--- a/trove/guestagent/datastore/manager.py
+++ b/trove/guestagent/datastore/manager.py
@@ -402,7 +402,6 @@ class Manager(periodic_task.PeriodicTasks):
self.app.update_overrides(overrides)
def apply_overrides(self, context, overrides):
- LOG.info(f"Applying overrides {overrides}.")
raise exception.DatastoreOperationNotSupported(
operation='apply_overrides', datastore=self.manager)
diff --git a/trove/guestagent/datastore/mysql_common/manager.py b/trove/guestagent/datastore/mysql_common/manager.py
index 854d1348..31172f20 100644
--- a/trove/guestagent/datastore/mysql_common/manager.py
+++ b/trove/guestagent/datastore/mysql_common/manager.py
@@ -184,8 +184,9 @@ class MySqlManager(manager.Manager):
return False
def apply_overrides(self, context, overrides):
- LOG.info("Applying overrides (%s).", overrides)
+ LOG.info("Applying database config.")
self.app.apply_overrides(overrides)
+ LOG.info("Finished applying database config.")
def reset_password_for_restore(self, ds_version=None,
data_dir='/var/lib/mysql/data'):
diff --git a/trove/guestagent/datastore/mysql_common/service.py b/trove/guestagent/datastore/mysql_common/service.py
index c8bd6f8b..2bba511a 100644
--- a/trove/guestagent/datastore/mysql_common/service.py
+++ b/trove/guestagent/datastore/mysql_common/service.py
@@ -537,8 +537,6 @@ class BaseMySqlApp(service.BaseDbApp):
{MySQLConfParser.SERVER_CONF_SECTION: overrides})
def apply_overrides(self, overrides):
- LOG.info("Applying overrides to running MySQL, overrides: %s",
- overrides)
with mysql_util.SqlClient(self.get_engine()) as client:
for k, v in overrides.items():
byte_value = guestagent_utils.to_bytes(v)
diff --git a/trove/guestagent/datastore/postgres/manager.py b/trove/guestagent/datastore/postgres/manager.py
index 1c0e775c..2a2da7f0 100644
--- a/trove/guestagent/datastore/postgres/manager.py
+++ b/trove/guestagent/datastore/postgres/manager.py
@@ -83,7 +83,10 @@ class PostgresManager(manager.Manager):
self.app.start_db(ds_version=ds_version, command=command)
def apply_overrides(self, context, overrides):
- pass
+ """Reload config."""
+ LOG.info("Reloading database config.")
+ self.app.apply_overrides(overrides)
+ LOG.info("Finished reloading database config.")
def get_datastore_log_defs(self):
owner = cfg.get_configuration_property('database_service_uid')
diff --git a/trove/guestagent/datastore/postgres/service.py b/trove/guestagent/datastore/postgres/service.py
index e5d3c7e0..24e818f1 100644
--- a/trove/guestagent/datastore/postgres/service.py
+++ b/trove/guestagent/datastore/postgres/service.py
@@ -150,6 +150,11 @@ class PgSqlApp(service.BaseDbApp):
def reset_configuration(self, configuration):
self.configuration_manager.save_configuration(configuration)
+ def apply_overrides(self, overrides):
+ """Reload config."""
+ cmd = "pg_ctl reload"
+ docker_util.run_command(self.docker_client, cmd)
+
def start_db(self, update_db=False, ds_version=None, command=None,
extra_volumes=None):
"""Start and wait for database service."""