调整成 pyproject 组织项目

Author: Neeky

bin/dbm-agent

@@ -9,8 +9,8 @@ GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gp
 
 
 import argparse
-from dbma.core.httpserver import start, stop
-from dbma.version import DBM_AGENT_VESION
+from dbmagent.core.httpserver import start, stop
+from dbmagent.version import DBM_AGENT_VESION
 
 
 def parser_cmd_args():

bin/dbm-monitor-gateway

@@ -0,0 +1,43 @@
+#!/usr/bin/evn python3
+# -*- coding: utf8 -*-
+
+"""
+(c) 2019, LeXing Jinag <[email protected] [email protected] https://www.sqlpy.com/>
+Copyright: (c) 2019, dbm Project
+GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+"""
+
+
+import argparse
+from dbmagent.core.httpserver import start, stop
+from dbmagent.version import DBM_AGENT_VESION
+
+
+def parser_cmd_args():
+    parser = argparse.ArgumentParser(
+        f"dbma-agent {DBM_AGENT_VESION}",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    )
+    parser.add_argument(
+        "action",
+        type=str,
+        default="start",
+        choices=("start", "stop", "version"),
+        help="",
+    )
+    args = parser.parse_args()
+    return args
+
+
+def main():
+    args = parser_cmd_args()
+    if args.action == "start":
+        start()
+    elif args.action == "version":
+        print(f"dbma-agent {DBM_AGENT_VESION}")
+    elif args.action == "stop":
+        stop()
+
+
+if __name__ == "__main__":
+    main()

bin/dbma-cli-init

@@ -6,8 +6,8 @@
 """
 
 import argparse
-from dbma.bil.net import get_ip_by_card_name
-from dbma.core.agent.init import init
+from dbmagent.bil.net import get_ip_by_card_name
+from dbmagent.core.agent.init import init
 
 
 def parser_cmd_args():

bin/dbma-cli-mysql

@@ -9,11 +9,11 @@ import time
 import logging
 import argparse
 from pathlib import Path
-from dbma.components.mysql.install import default_pkg
-from dbma.components.mysql.install import uninstall_mysql
-from dbma.components.mysql.source import install_mysql_source
-from dbma.components.mysql.replica import install_mysql_replica
-from dbma.components.mysql.commons import make_mysql_writable
+from dbmagent.components.mysql.install import default_pkg
+from dbmagent.components.mysql.install import uninstall_mysql
+from dbmagent.components.mysql.source import install_mysql_source
+from dbmagent.components.mysql.replica import install_mysql_replica
+from dbmagent.components.mysql.commons import make_mysql_writable
 
 
 def parser_cmd_args():

bin/dbma-cli-redis

@@ -10,15 +10,20 @@ import time
 import logging
 import argparse
 from pathlib import Path
-from dbma.components.redis.install import install_resdis_master, install_redis_replica
-from dbma.components.redis.commons import default_redis_pkg, default_redis_port
+from dbmagent.components.redis.install import (
+    install_resdis_master,
+    install_redis_replica,
+)
+from dbmagent.components.redis.commons import default_redis_pkg, default_redis_port
 
 
 def parser_cmd_args():
     """
     实现命令行参数的处理
     """
-    parser = argparse.ArgumentParser(__name__, formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    parser = argparse.ArgumentParser(
+        __name__, formatter_class=argparse.ArgumentDefaultsHelpFormatter
+    )
     parser.add_argument(
         "--pkg", default=default_redis_pkg, help="redis install pkg", type=str
     )

dbma/static/cnfs/init-5.7.x.sql

@@ -5,7 +5,7 @@
 """
 
 import subprocess
-from dbma.bil.sudos import sudo
+from dbmagent.bil.sudos import sudo
 
 
 def exe_shell_cmd(cmd: str):

dbma/static/cnfs/init-8.0.x.sql

@@ -7,8 +7,8 @@
 import os
 import pwd
 import grp
-from dbma.bil.cmdexecutor import exe_shell_cmd
-from dbma.bil.sudos import sudo
+from dbmagent.bil.cmdexecutor import exe_shell_cmd
+from dbmagent.bil.sudos import sudo
 
 
 def is_root() -> bool:

dbma/__init__.py renamed to dbmagent/__init__.py

@@ -0,0 +1,43 @@
+#!/usr/bin/evn python3
+# -*- coding: utf8 -*-
+
+"""
+(c) 2019, LeXing Jinag <[email protected] [email protected] https://www.sqlpy.com/>
+Copyright: (c) 2019, dbm Project
+GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+"""
+
+
+import argparse
+from dbmagent.core.httpserver import start, stop
+from dbmagent.version import DBM_AGENT_VESION
+
+
+def parser_cmd_args():
+    parser = argparse.ArgumentParser(
+        f"dbma-agent {DBM_AGENT_VESION}",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    )
+    parser.add_argument(
+        "action",
+        type=str,
+        default="start",
+        choices=("start", "stop", "version"),
+        help="",
+    )
+    args = parser.parse_args()
+    return args
+
+
+def main():
+    args = parser_cmd_args()
+    if args.action == "start":
+        start()
+    elif args.action == "version":
+        print(f"dbma-agent {DBM_AGENT_VESION}")
+    elif args.action == "stop":
+        stop()
+
+
+if __name__ == "__main__":
+    main()

dbma/bil/__init__.py renamed to dbmagent/bil/__init__.py

@@ -0,0 +1,35 @@
+#!/usr/bin/evn python3
+# -*- coding: utf8 -*-
+
+"""
+完成 dbm-agent 的初始化操作
+"""
+
+import argparse
+from dbmagent.bil.net import get_ip_by_card_name
+from dbmagent.core.agent.init import init
+
+
+def parser_cmd_args():
+    """ """
+    parser = argparse.ArgumentParser(
+        "dbma-cli-init", formatter_class=argparse.ArgumentDefaultsHelpFormatter
+    )
+    parser.add_argument("--net-card", default=None)
+    parser.add_argument("--dbm-center-url-prefix", default="http://127.0.0.1:8080")
+    return parser.parse_args()
+
+
+def main():
+    args = parser_cmd_args()
+    ip = get_ip_by_card_name(args.net_card)
+    print("net-card {}'s ip = {}".format(args.net_card, ip))
+    if ip is None:
+        print("not find any ip on {}".format(args.net_card))
+        return
+    print("going to init ...")
+    init(args.net_card, args.dbm_center_url_prefix)
+
+
+if __name__ == "__main__":
+    main()

dbma/bil/cmdexecutor.py renamed to dbmagent/bil/cmdexecutor.py

@@ -0,0 +1,96 @@
+#!/usr/bin/env python3
+# -*- coding: utf8 -*-
+
+"""
+实例单实例架构下的 MySQL 安装与卸载
+"""
+
+import time
+import logging
+import argparse
+from pathlib import Path
+from dbmagent.components.mysql.install import default_pkg
+from dbmagent.components.mysql.install import uninstall_mysql
+from dbmagent.components.mysql.source import install_mysql_source
+from dbmagent.components.mysql.replica import install_mysql_replica
+from dbmagent.components.mysql.commons import make_mysql_writable
+
+
+def parser_cmd_args():
+    """
+    实现命令行参数的处理
+    """
+    parser = argparse.ArgumentParser(
+        __name__, formatter_class=argparse.ArgumentDefaultsHelpFormatter
+    )
+    parser.add_argument("--port", type=int, default=3306, help="instance port")
+    parser.add_argument(
+        "--pkg-name",
+        type=str,
+        default=default_pkg.name,
+        help="mysql install package name ",
+    )
+    parser.add_argument(
+        "--ibps",
+        type=str,
+        default="128M",
+        help="innodb-buffer-pool-size  et: 128M , 512M, 1G, 2G",
+    )
+    parser.add_argument(
+        "--source",
+        type=str,
+        default="",
+        help="mysql source instance. et: '127.0.0.1:3306' ",
+    )
+    parser.add_argument(
+        "action",
+        type=str,
+        choices=["master", "slave", "source", "replica", "uninstall"],
+    )
+    args = parser.parse_args()
+    return args
+
+
+def main():
+    #
+    args = parser_cmd_args()
+    pkg = Path("/usr/local/dbm-agent/pkgs/") / args.pkg_name
+    port = args.port
+    innodb_buffer_pool_size = args.ibps
+    source = args.source
+    logging.basicConfig(
+        level=logging.INFO,
+        format="[%(asctime)s %(levelname)s] - [%(threadName)s] - [%(pathname)s %(lineno)d line]  ~  %(message)s",
+    )
+
+    if args.action in ("master", "source"):
+        # 安装
+        install_mysql_source(
+            port=port, pkg=pkg, innodb_buffer_pool_size=innodb_buffer_pool_size
+        )
+    elif args.action in ("slave", "replica"):
+        if source == "":
+            logging.error(
+                "--source is missing , can't find master|source mysql instance ."
+            )
+            return
+
+        if ":" not in source:
+            logging.error("format error --source shuild be ip:port format. ")
+            return
+
+        # 解析出 master 实例的地址
+        source_ip, source_port = source.split(":")
+        source_port = int(source_port)
+
+        # 配置 replica 实例
+        install_mysql_replica(
+            port, pkg, innodb_buffer_pool_size, source_ip, source_port
+        )
+
+    elif args.action == "uninstall":
+        uninstall_mysql(args.port)
+
+
+if __name__ == "__main__":
+    main()

dbma/bil/daemon.py renamed to dbmagent/bil/daemon.py

@@ -4,8 +4,8 @@
 """
 
 from pathlib import Path
-from dbma.core.configs import dbm_agent_config
-from dbma.components.mysql.exceptions import (
+from dbmagent.core.configs import dbm_agent_config
+from dbmagent.components.mysql.exceptions import (
     MySQLPkgFileNotExistsException,
     MySQLDataDirectoryExists,
     MySQLSystemdFileExists,

dbma/bil/fs.py renamed to dbmagent/bil/fs.py

@@ -23,12 +23,12 @@
 from datetime import datetime
 from collections import deque
 from dataclasses import dataclass
-from dbma.bil.fun import fname
-from dbma.bil.fs import truncate_or_delete_file, get_file_size
-from dbma.core import messages
-from dbma.core.configs import dbm_agent_config
-from dbma.core.threads.backends import threads, keep_threads_running
-from dbma.bil.osuser import sudo
+from dbmagent.bil.fun import fname
+from dbmagent.bil.fs import truncate_or_delete_file, get_file_size
+from dbmagent.core import messages
+from dbmagent.core.configs import dbm_agent_config
+from dbmagent.core.threads.backends import threads, keep_threads_running
+from dbmagent.bil.osuser import sudo
 
 
 clear_tasks = deque(maxlen=1024)

dbma/bil/fun.py renamed to dbmagent/bil/fun.py

@@ -10,11 +10,11 @@
 import logging
 from pathlib import Path
 from datetime import datetime
-from dbma.core import messages
-from dbma.bil.fun import fname
-from dbma.bil.osuser import MySQLUser
-from dbma.core.configs import dbm_agent_config
-from dbma.components.mysql.commons import dbma_mysql_cnx
+from dbmagent.core import messages
+from dbmagent.bil.fun import fname
+from dbmagent.bil.osuser import MySQLUser
+from dbmagent.core.configs import dbm_agent_config
+from dbmagent.components.mysql.commons import dbma_mysql_cnx
 
 
 def backup_format(backup_type: str = None):