3.0 move code (#617)

* move code

* move code

* move code

* move code

* move code

* move code

.devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": "OBDIAG",
-  "dockerFile": "Dockerfile",
+  "dockerFile": "Dockerfile.dev",
   "postAttachCommand": "bash",
   "customizations": {
     "vscode": {

.github/workflows/build_base_docker.yml

@@ -29,7 +29,7 @@ jobs:
         with:
           context: .
           platforms: linux/amd64
-          file: build/DockerFile
+          file: build/DockerFile.helper
           push: true
           tags: |
             ${{ vars.DOCKER_PUSH_BASE }}/obdiag-builder:latest

build_rpm.sh

@@ -9,4 +9,4 @@ cat ./rpm/oceanbase-diagnostic-tool.spec
 yum install rpm-build -y
 rpmbuild -bb ./rpm/oceanbase-diagnostic-tool.spec
 # 展示对应的包路径
-find / -name oceanbase-diagnostic-tool-*.rpm 
+find ~/ -name oceanbase-diagnostic-tool-*.rpm

dev_init.sh

@@ -41,36 +41,20 @@ copy_file(){
     mkdir -p ${OBDIAG_HOME}/check
     mkdir -p ${OBDIAG_HOME}/gather
     mkdir -p ${OBDIAG_HOME}/display
-    if [ -d "${WORK_DIR}/handler/checker/tasks" ]; then
-        cp -rf ${WORK_DIR}/handler/checker/tasks  ${OBDIAG_HOME}/check/
-        cp -rf ${WORK_DIR}/handler/checker/tasks/obproxy_check_package.yaml  ${OBDIAG_HOME}/check/
-        cp -rf ${WORK_DIR}/handler/checker/tasks/observer_check_package.yaml  ${OBDIAG_HOME}/check/
-    fi
-    if [ -d "${WORK_DIR}/handler/gather/tasks" ]; then
-        cp -rf ${WORK_DIR}/handler/gather/tasks  ${OBDIAG_HOME}/gather/
-    fi
-
-    if [ -d "${WORK_DIR}/handler/display/tasks" ]; then
-        cp -rf ${WORK_DIR}/handler/display/tasks  ${OBDIAG_HOME}/display/
-    fi
-
+    cp -rf ${WORK_DIR}/plugins/* ${OBDIAG_HOME}/
     if [ -d "${WORK_DIR}/example" ]; then
         cp -rf ${WORK_DIR}/example  ${OBDIAG_HOME}/
     fi
 
-    if [ -d "${WORK_DIR}/handler/rca/scene" ]; then
-        cp -rf ${WORK_DIR}/handler/rca/scene  ${OBDIAG_HOME}/rca
-    fi
-
 }
 copy_file
 echo "File initialization completed"
 
 check_python_version
 
-source  ${WORK_DIR}/init_obdiag_cmd.sh
+source  ${WORK_DIR}/rpm/init_obdiag_cmd.sh
 
-echo "Creating or updating alias 'obdiag' to run 'python3 ${PROJECT_PATH}/main.py'"
-echo "alias obdiag='python3 ${PROJECT_PATH}/main.py'" >> ~/.bashrc
+echo "Creating or updating alias 'obdiag' to run 'python3 ${PROJECT_PATH}/src/main.py'"
+echo "alias obdiag='python3 ${PROJECT_PATH}/src/main.py'" >> ~/.bashrc
 source ~/.bashrc
 echo "Initialization completed successfully!"

handler/gather/tasks/observer/cpu_high.py → plugins/gather/tasks/observer/cpu_high.py

@@ -17,11 +17,11 @@
 """
 import os
 
-from common.ssh_client.ssh import SshClient
-from handler.gather.gather_component_log import GatherComponentLogHandler
-from stdio import SafeStdio
-from handler.gather.gather_obstack2 import GatherObstack2Handler
-from handler.gather.gather_perf import GatherPerfHandler
+from src.common.ssh_client.ssh import SshClient
+from src.handler.gather.gather_component_log import GatherComponentLogHandler
+from src.common.stdio import SafeStdio
+from src.handler.gather.gather_obstack2 import GatherObstack2Handler
+from src.handler.gather.gather_perf import GatherPerfHandler
 
 
 class CPUHigh(SafeStdio):

handler/gather/tasks/observer/px_collect_log.py → plugins/gather/tasks/observer/px_collect_log.py

@@ -15,12 +15,11 @@
 @file: px_collect_log.py
 @desc:
 """
-import os
 import shutil
 
-from common.ssh_client.ssh import SshClient
-from handler.gather.gather_component_log import GatherComponentLogHandler
-from common.command import uzip_dir_local, analyze_log_get_sqc_addr, find_home_path_by_port
+from src.common.ssh_client.ssh import SshClient
+from src.handler.gather.gather_component_log import GatherComponentLogHandler
+from src.common.command import uzip_dir_local, analyze_log_get_sqc_addr, find_home_path_by_port
 import datetime
 
 

handler/gather/tasks/observer/sql_problem.py → plugins/gather/tasks/observer/sql_problem.py

@@ -15,12 +15,12 @@
 @file: sql_problem.py
 @desc:
 """
-from handler.gather.gather_component_log import GatherComponentLogHandler
-from stdio import SafeStdio
-from handler.gather.gather_plan_monitor import GatherPlanMonitorHandler
-from common.tool import StringUtils
-from common.ssh_client.ssh import SshClient
-from common.command import find_home_path_by_port
+from src.handler.gather.gather_component_log import GatherComponentLogHandler
+from src.common.stdio import SafeStdio
+from src.handler.gather.gather_plan_monitor import GatherPlanMonitorHandler
+from src.common.tool import StringUtils
+from src.common.ssh_client.ssh import SshClient
+from src.common.command import find_home_path_by_port
 
 
 class SQLProblem(SafeStdio):

handler/rca/scene/clog_disk_full.py → plugins/rca/clog_disk_full.py

@@ -19,9 +19,9 @@
 import os
 import re
 
-from handler.rca.rca_exception import RCAInitException, RCAExecuteException, RCANotNeedExecuteException
-from handler.rca.rca_handler import RcaScene, RCA_ResultRecord
-from common.tool import StringUtils
+from src.handler.rca.rca_exception import RCAInitException, RCAExecuteException, RCANotNeedExecuteException
+from src.handler.rca.rca_handler import RcaScene, RCA_ResultRecord
+from src.common.tool import StringUtils
 
 
 class ClogDiskFullScene(RcaScene):

handler/rca/scene/ddl_disk_full.py → plugins/rca/ddl_disk_full.py

@@ -16,9 +16,9 @@
 @desc:
 """
 
-from handler.rca.rca_exception import RCAInitException, RCAExecuteException
-from handler.rca.rca_handler import RcaScene
-from common.tool import StringUtils
+from src.handler.rca.rca_exception import RCAInitException, RCAExecuteException
+from src.handler.rca.rca_handler import RcaScene
+from src.common.tool import StringUtils
 
 
 def translate_byte(B):

handler/rca/scene/ddl_failure.py → plugins/rca/ddl_failure.py

@@ -15,13 +15,11 @@
 @file: ddl_failure_scene.py
 @desc:
 """
-import datetime
 import os
-import re
 
-from handler.rca.rca_exception import RCAInitException, RCAExecuteException, RCANotNeedExecuteException
-from handler.rca.rca_handler import RcaScene, RCA_ResultRecord
-from common.tool import StringUtils
+from src.handler.rca.rca_exception import RCAInitException, RCAExecuteException, RCANotNeedExecuteException
+from src.handler.rca.rca_handler import RcaScene, RCA_ResultRecord
+from src.common.tool import StringUtils
 
 
 class DDLFailureScene(RcaScene):

handler/rca/scene/disconnection.py → plugins/rca/disconnection.py

@@ -16,8 +16,8 @@
 @desc:
 """
 import re
-from handler.rca.rca_handler import RcaScene, RCA_ResultRecord
-from common.tool import StringUtils
+from src.handler.rca.rca_handler import RcaScene, RCA_ResultRecord
+from src.common.tool import StringUtils
 
 
 class DisconnectionScene(RcaScene):

handler/rca/scene/index_ddl_error.py → plugins/rca/index_ddl_error.py

@@ -15,11 +15,10 @@
 @file: index_ddl_error_scene.py
 @desc:
 """
-import re
 
-from handler.rca.rca_exception import RCAInitException, RCAExecuteException
-from handler.rca.rca_handler import RcaScene, RCA_ResultRecord
-from common.tool import StringUtils
+from src.handler.rca.rca_exception import RCAInitException, RCAExecuteException
+from src.handler.rca.rca_handler import RcaScene, RCA_ResultRecord
+from src.common.tool import StringUtils
 
 
 class IndexDDLErrorScene(RcaScene):

handler/rca/scene/lock_conflict.py → plugins/rca/lock_conflict.py

@@ -16,9 +16,9 @@
 @desc:
 """
 import json
-from handler.rca.rca_exception import RCAInitException, RCANotNeedExecuteException
-from handler.rca.rca_handler import RcaScene, RCA_ResultRecord
-from common.tool import StringUtils, DateTimeEncoder
+from src.handler.rca.rca_exception import RCAInitException, RCANotNeedExecuteException
+from src.handler.rca.rca_handler import RcaScene, RCA_ResultRecord
+from src.common.tool import StringUtils, DateTimeEncoder
 
 
 class LockConflictScene(RcaScene):

handler/rca/scene/log_error.py → plugins/rca/log_error.py

@@ -18,9 +18,9 @@
 import os
 import re
 
-from handler.rca.rca_exception import RCAInitException, RCAExecuteException
-from handler.rca.rca_handler import RcaScene, RCA_ResultRecord
-from common.tool import StringUtils
+from src.handler.rca.rca_exception import RCAInitException, RCAExecuteException
+from src.handler.rca.rca_handler import RcaScene, RCA_ResultRecord
+from src.common.tool import StringUtils
 
 
 class LogErrorScene(RcaScene):

handler/rca/scene/major_hold.py → plugins/rca/major_hold.py

@@ -18,14 +18,14 @@
 import json
 import os.path
 import re
-from handler.rca.rca_exception import (
+from src.handler.rca.rca_exception import (
     RCAInitException,
     RCAExecuteException,
     RCANotNeedExecuteException,
 )
-from handler.rca.rca_handler import RcaScene, RCA_ResultRecord
-from common.tool import DateTimeEncoder
-from common.tool import StringUtils
+from src.handler.rca.rca_handler import RcaScene, RCA_ResultRecord
+from src.common.tool import DateTimeEncoder
+from src.common.tool import StringUtils
 
 
 class MajorHoldScene(RcaScene):

handler/rca/scene/oms_full_trans.py → plugins/rca/oms_full_trans.py

@@ -17,11 +17,11 @@
 """
 import os.path
 
-from handler.rca.rca_exception import (
+from src.handler.rca.rca_exception import (
     RCAInitException,
     RCAExecuteException,
 )
-from handler.rca.rca_handler import RcaScene
+from src.handler.rca.rca_handler import RcaScene
 
 
 class OMSFullTransScene(RcaScene):

handler/rca/scene/transaction_disconnection.py → plugins/rca/transaction_disconnection.py

@@ -18,9 +18,9 @@
 import os
 import re
 
-from handler.rca.rca_exception import RCAInitException
-from handler.rca.rca_handler import RcaScene, RCA_ResultRecord
-from common.tool import StringUtils
+from src.handler.rca.rca_exception import RCAInitException
+from src.handler.rca.rca_handler import RcaScene
+from src.common.tool import StringUtils
 
 
 class TransactionDisconnectionScene(RcaScene):

handler/rca/scene/transaction_execute_timeout.py → plugins/rca/transaction_execute_timeout.py

@@ -15,17 +15,15 @@
 @file: transaction_execute_timeout_scene.py
 @desc:
 """
-import datetime
 import os
 import re
 
-from handler.rca.rca_exception import (
+from src.handler.rca.rca_exception import (
     RCAInitException,
     RCAExecuteException,
-    RCANotNeedExecuteException,
 )
-from handler.rca.rca_handler import RcaScene, RCA_ResultRecord
-from common.tool import StringUtils
+from src.handler.rca.rca_handler import RcaScene
+from src.common.tool import StringUtils
 
 
 class TransactionExecuteTimeoutScene(RcaScene):

handler/rca/scene/transaction_not_ending.py → plugins/rca/transaction_not_ending.py

@@ -15,17 +15,15 @@
 @file: transaction_not_ending_scene.py
 @desc:
 """
-import datetime
 import os
-import re
 
-from handler.rca.rca_exception import (
+from src.handler.rca.rca_exception import (
     RCAInitException,
     RCAExecuteException,
     RCANotNeedExecuteException,
 )
-from handler.rca.rca_handler import RcaScene, RCA_ResultRecord
-from common.tool import StringUtils
+from src.handler.rca.rca_handler import RcaScene
+from src.common.tool import StringUtils
 
 
 class TransactionNotEndingScene(RcaScene):

handler/rca/scene/transaction_other_error.py → plugins/rca/transaction_other_error.py

@@ -17,13 +17,13 @@
 """
 import os
 
-from handler.rca.rca_exception import (
+from src.handler.rca.rca_exception import (
     RCAInitException,
     RCAExecuteException,
     RCANotNeedExecuteException,
 )
-from handler.rca.rca_handler import RcaScene
-from common.tool import StringUtils
+from src.handler.rca.rca_handler import RcaScene
+from src.common.tool import StringUtils
 
 
 class TransactionOtherErrorScene(RcaScene):

handler/rca/scene/transaction_rollback.py → plugins/rca/transaction_rollback.py

@@ -19,13 +19,12 @@
 import os
 import re
 
-from handler.rca.rca_exception import (
+from src.handler.rca.rca_exception import (
     RCAInitException,
     RCAExecuteException,
-    RCANotNeedExecuteException,
 )
-from handler.rca.rca_handler import RcaScene, RCA_ResultRecord
-from common.tool import StringUtils
+from src.handler.rca.rca_handler import RcaScene
+from src.common.tool import StringUtils
 
 
 class TransactionRollbackScene(RcaScene):