feat: 1.删除归档 2.处理主键冲突的异常

Author: neekyjiang

bin/mtls-auto-fill

@@ -35,11 +35,12 @@ def parser_cmd_args():
     args.add_argument("--table",type=str,default="t",help="表名")
     args.add_argument("--rows",type=int,default=100,help="要插入的行数")
     args.add_argument("--process",type=int,default=1,help="并发的进程数")
+    args.add_argument("--ssl_disabled",type=bool, default=False, help="是否禁用 SSL")
     args.add_argument("action",choices=('review','execute'))
     return args.parse_args()
 
 
-def insert(host="127.0.0.1",port=3306,user="apuser",password="mtls@0352",database="tempdb",table="t",rows=100):
+def insert(host="127.0.0.1",port=3306,user="apuser",password="mtls@0352",ssl_disabled=False,database="tempdb",table="t",rows=100):
     """
 
     """
@@ -58,7 +59,7 @@ def insert(host="127.0.0.1",port=3306,user="apuser",password="mtls@0352",databas
     cnx = None
     start_at = datetime.now()
     try:
-        cnx = connector.connect(host=host,port=port,user=user,password=password)
+        cnx = connector.connect(host=host,port=port,user=user,password=password,ssl_disabled=ssl_disabled)
         cursor = cnx.cursor()
 
         for i in range(rows):
@@ -127,7 +128,7 @@ def main():
                     stats.append(_)
     else:
         # 单进程压力测试
-        tmp = insert(args.host,args.port,args.user,args.password,args.database,args.table,args.rows)
+        tmp = insert(args.host,args.port,args.user,args.password,args.ssl_disabled,args.database,args.table,args.rows)
         stats.append(tmp)
 
     print("\nReport:")

bin/mtls-ps-mem

@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+#-*- coding: UTF-8 -*-
+
+"""
+每秒打印一下进程的内存使用情况
+"""
+
+import os
+import datetime
+import argparse
+from mtls.ps.mem import mem_info_generator
+from mtls.ps.mem import global_connection_memory_generator
+from mtls.kits import fileformat
+
+
+name = os.path.basename(__file__)
+
+def parser_cmd_args():
+    """
+    处理命令行参数
+    """
+    args = argparse.ArgumentParser(name)
+    args.add_argument('--user',type=str,default='')
+    args.add_argument('--password',type=str,default='')
+    args.add_argument('--port',type=int,default=3306)
+    args.add_argument("pid",type=int)
+    return args.parse_args()
+
+
+def main():
+    args = parser_cmd_args()
+    pid = args.pid
+    if args.user != '':
+        for mem_info in mem_info_generator(pid):
+            print(f"{datetime.datetime.now().isoformat(' ','seconds')}  pid={pid}   vms={fileformat(mem_info.vms)}  rss={fileformat(mem_info.rss)}  dirty={fileformat(mem_info.dirty)}")
+    else:
+        g = global_connection_memory_generator()
+        next(g)
+        for mem_info in mem_info_generator(pid):
+            global_conn_mem_size = next(g)
+            print(f"{datetime.datetime.now().isoformat(' ','seconds')}  pid={pid}   vms={fileformat(mem_info.vms)}  rss={fileformat(mem_info.rss)}  global_conn_mem={fileformat(global_conn_mem_size)}")
+
+
+if __name__ == "__main__":
+    main()