[FIX]v1.5 mysql fix (#371)

* add log * fix * remove useless log * remove useless log * remove useless log * fix
bytedance · Oct 20, 2020 · 97718ae · 97718ae
1 parent 3eb9b5c
commit 97718ae
Showing 1 changed file with 2 additions and 17 deletions.
diff --git a/fedlearner/common/mysql_client.py b/fedlearner/common/mysql_client.py
@@ -48,8 +48,9 @@ def __init__(self, database, addr, user, password, base_dir):
             self._addr = ''
             self._password = ''
         self._base_dir = base_dir
+        if self._base_dir[0] != '/':
+            self._base_dir = '/' + self._base_dir
         self._create_engine_inner()
-        logging.info('success to create table')
 
     def get_data(self, key):
         with self.closing(self._engine) as sess:
@@ -59,10 +60,8 @@ def get_data(self, key):
                     self._generate_key(key)).one().kv_value
                 if isinstance(value, str):
                     return value.encode()
-                logging.info('success to get data')
                 return value
             except NoResultFound:
-                logging.warning('data is not exists')
                 return None
             except Exception as e: # pylint: disable=broad-except
                 logging.error('failed to get data. msg[%s]', e)
@@ -84,7 +83,6 @@ def set_data(self, key, data):
                         kv_value=data)
                     sess.add(context)
                     sess.commit()
-                logging.info('success to set data')
                 return True
             except Exception as e: # pylint: disable=broad-except
                 logging.error('failed to set data. msg[%s]', e)
@@ -100,7 +98,6 @@ def delete(self, key):
                     self._generate_key(key)):
                     sess.delete(context)
                 sess.commit()
-                logging.info('success to delete')
                 return True
             except Exception as e: # pylint: disable=broad-except
                 logging.error('failed to delete. msg[%s]', e)
@@ -115,7 +112,6 @@ def delete_prefix(self, key):
                     like(self._generate_key(key) + '%')):
                     sess.delete(context)
                 sess.commit()
-                logging.info('success to delete prefix')
                 return True
             except Exception as e: # pylint: disable=broad-except
                 logging.error('failed to delete prefix. msg[%s]', e)
@@ -138,12 +134,9 @@ def cas(self, key, old_data, new_data):
                         self._generate_key(key)).one()
                     if context.kv_value != old_data:
                         flag = False
-                        logging.warning('old data and new data \
-                            are not the same')
                         return flag
                     context.kv_value = new_data
                     sess.commit()
-                logging.info('success to cas')
                 return flag
             except Exception as e: # pylint: disable=broad-except
                 logging.error('failed to cas. msg[%s]', e)
@@ -154,14 +147,10 @@ def get_prefix_kvs(self, prefix, ignor_prefix=False):
         kvs = []
         path = self._generate_key(prefix)
         with self.closing(self._engine) as sess:
-            logging.info('start get_prefix_kvs. prefix is [%s] [%s]',
-                prefix, path)
             try:
                 table = self._datasource_meta
                 for context in sess.query(table).filter(table.kv_key.\
                     like(path + '%')).order_by(table.kv_key):
-                    logging.info('type of kv_key is[%s]',
-                        type(context.kv_key))
                     if ignor_prefix and context.kv_key == path:
                         continue
                     nkey = self._normalize_output_key(context.kv_key,
@@ -172,7 +161,6 @@ def get_prefix_kvs(self, prefix, ignor_prefix=False):
                     if isinstance(value, str):
                         value = value.encode()
                     kvs.append((nkey, value))
-                logging.info('success to get prefix kvs')
                 return kvs
             except Exception as e: # pylint: disable=broad-except
                 logging.error('failed to get prefix kvs. msg[%s]', e)
@@ -194,8 +182,6 @@ def _normalize_input_key(key):
 
     @staticmethod
     def _normalize_output_key(key, base_dir):
-        logging.info('normalize ouput key is[%s] type[%s]', key,
-            type(key))
         if isinstance(key, str):
             assert key.startswith(base_dir)
         else:
@@ -212,7 +198,6 @@ def _create_engine_inner(self):
             if self._unix_socket:
                 sub = '?unix_socket={}'.format(self._unix_socket)
                 conn_string = conn_string + sub
-            logging.info('conn_string is [%s]', conn_string)
             self._engine = create_engine(conn_string, echo=False,
                                         pool_recycle=180)
             Base = automap_base()