openstack
/
trove
Code Issues Proposed changes

Merge "Improve guest agent when start"

This commit is contained in:
Zuul 2021-03-25 06:54:47 +00:00 committed by Gerrit Code Review
parent b39ca8bee4 ab019378a2
commit 3bf2e73f47
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
trove/guestagent/datastore/mysql_common/service.py
View File

@ -15,12 +15,13 @@
import abc import abc
import re import re
import sqlalchemy
import urllib
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import encodeutils from oslo_utils import encodeutils
import sqlalchemy
from sqlalchemy import exc from sqlalchemy import exc
from sqlalchemy.sql.expression import text from sqlalchemy.sql.expression import text
import urllib
from trove.common import cfg from trove.common import cfg
from trove.common import exception from trove.common import exception
@ -59,6 +60,7 @@ BACKUP_LOG = re.compile(r'.*Backup successfully, checksum: (?P<checksum>.*), '
class BaseMySqlAppStatus(service.BaseDbStatus): class BaseMySqlAppStatus(service.BaseDbStatus):
def __init__(self, docker_client): def __init__(self, docker_client):
super(BaseMySqlAppStatus, self).__init__(docker_client) super(BaseMySqlAppStatus, self).__init__(docker_client)
@ -435,13 +437,13 @@ class BaseMySqlApp(service.BaseDbApp):
if ENGINE: if ENGINE:
return ENGINE return ENGINE
user = ADMIN_USER_NAME
password = ""
try: try:
user = ADMIN_USER_NAME
password = self.get_auth_password() password = self.get_auth_password()
except exception.UnprocessableEntity: except exception.UnprocessableEntity:
# os_admin user not created yet # os_admin user not created yet
user = 'root' user = 'root'
password = self.get_auth_password(file="root.cnf")
ENGINE = sqlalchemy.create_engine( ENGINE = sqlalchemy.create_engine(
CONNECTION_STR_FORMAT % (user, CONNECTION_STR_FORMAT % (user,
@ -819,6 +821,7 @@ class BaseMySqlApp(service.BaseDbApp):
class BaseMySqlRootAccess(object): class BaseMySqlRootAccess(object):
def __init__(self, mysql_app): def __init__(self, mysql_app):
self.mysql_app = mysql_app self.mysql_app = mysql_app