This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new cf9f564f [horus] Optimize horus content (#435)
cf9f564f is described below
commit cf9f564f9900dfcea9a3dbca4e6ac600c47c327b
Author: mfordjody <[email protected]>
AuthorDate: Mon Oct 7 10:27:54 2024 +0800
[horus] Optimize horus content (#435)
---
app/horus/base/db/db.go | 141 +++++++++++++++++++++----------------------
app/horus/base/db/db_test.go | 1 -
app/horus/base/db/sql.tpl | 62 +++++++++----------
3 files changed, 100 insertions(+), 104 deletions(-)
diff --git a/app/horus/base/db/db.go b/app/horus/base/db/db.go
index 013edcff..112fc656 100644
--- a/app/horus/base/db/db.go
+++ b/app/horus/base/db/db.go
@@ -43,20 +43,17 @@ type NodeDataInfo struct {
}
type PodDataInfo struct {
- Id int64 `json:"id"`
- PodName string `json:"pod_name" xorm:"pod_name"`
- PodIP string `json:"pod_ip" xorm:"pod_ip"`
- Sn string `json:"sn"`
- NodeName string `json:"node_name" xorm:"node_name"`
- ClusterName string `json:"cluster_name" xorm:"cluster_name"`
- ModuleName string `json:"module_name" xorm:"module_name"`
- Reason string `json:"reason"`
- Restart int `json:"restart"`
- Repair int `json:"repair"`
- RepairTicketUrl string `json:"repair_ticket_url"
xorm:"repair_ticket_url"`
- FirstDate string `json:"first_date" xorm:"first_date"`
- CreateTime time.Time `json:"create_time" xorm:"create_time
created"`
- UpdateTime time.Time `json:"update_time" xorm:"update_time
updated"`
+ Id int64 `json:"id"`
+ PodName string `json:"pod_name" xorm:"pod_name"`
+ PodIP string `json:"pod_ip" xorm:"pod_ip"`
+ Sn string `json:"sn"`
+ NodeName string `json:"node_name" xorm:"node_name"`
+ ClusterName string `json:"cluster_name" xorm:"cluster_name"`
+ ModuleName string `json:"module_name" xorm:"module_name"`
+ Reason string `json:"reason"`
+ FirstDate string `json:"first_date" xorm:"first_date"`
+ CreateTime time.Time `json:"create_time" xorm:"create_time created"`
+ UpdateTime time.Time `json:"update_time" xorm:"update_time updated"`
}
var (
@@ -66,7 +63,7 @@ var (
func InitDataBase(mc *config.MysqlConfiguration) error {
data, err := xorm.NewEngine("mysql", mc.Address)
if err != nil {
- fmt.Printf("Unable to connect to mysql server:\n addr: %s\n
err: %v\n", mc.Address, err)
+ fmt.Printf("Unable to connect to mysql server:\n addr:%s\n
err:%v\n", mc.Address, err)
}
data.Logger().SetLevel(xlog.LOG_INFO)
data.ShowSQL(mc.Debug)
@@ -79,11 +76,6 @@ func (n *NodeDataInfo) Add() (int64, error) {
return row, err
}
-func (p *PodDataInfo) Add() (int64, error) {
- row, err := db.Insert(p)
- return row, err
-}
-
func (n *NodeDataInfo) Get() (*NodeDataInfo, error) {
exist, err := db.Get(n)
if err != nil {
@@ -95,17 +87,6 @@ func (n *NodeDataInfo) Get() (*NodeDataInfo, error) {
return n, nil
}
-func (p *PodDataInfo) Get() (*PodDataInfo, error) {
- exist, err := db.Get(p)
- if err != nil {
- return nil, err
- }
- if !exist {
- return nil, nil
- }
- return p, nil
-}
-
func (n *NodeDataInfo) Update() (bool, error) {
firstDate := time.Now().Format("2006-01-02 15:04:05")
n.FirstDate = firstDate
@@ -120,30 +101,11 @@ func (n *NodeDataInfo) Update() (bool, error) {
return false, nil
}
-func (p *PodDataInfo) Update() (bool, error) {
- firstDate := time.Now().Format("2006-01-02 15:04:05")
- p.FirstDate = firstDate
-
- row, err := db.Where(fmt.Sprintf("id=%d", p.Id)).Update(p)
- if err != nil {
- return false, err
- }
- if row > 0 {
- return true, nil
- }
- return false, nil
-}
-
func (n *NodeDataInfo) Check() (bool, error) {
exist, err := db.Exist(n)
return exist, err
}
-func (p *PodDataInfo) Check() (bool, error) {
- exist, err := db.Exist(p)
- return exist, err
-}
-
func (n *NodeDataInfo) AddOrGet() (int64, error) {
exist, _ := n.Check()
if exist {
@@ -153,13 +115,29 @@ func (n *NodeDataInfo) AddOrGet() (int64, error) {
return row, err
}
-func (p *PodDataInfo) AddOrGet() (int64, error) {
- exist, _ := p.Check()
- if exist {
- return p.Id, nil
+func (n *NodeDataInfo) RecoveryMarker() (bool, error) {
+ n.RecoveryMark = 1
+ return n.Update()
+}
+
+func (n *NodeDataInfo) RestartMarker() (bool, error) {
+ n.Restart = 1
+ return n.Update()
+}
+
+func GetNode() ([]NodeDataInfo, error) {
+ var ndi []NodeDataInfo
+ session := db.Where(fmt.Sprintf("id>%d", 0))
+ err := session.Find(&ndi)
+ return ndi, err
+}
+
+func GetNodeByName(nodeName, moduleName string) (*NodeDataInfo, error) {
+ ndi := NodeDataInfo{
+ NodeName: nodeName,
+ ModuleName: moduleName,
}
- row, err := p.Add()
- return row, err
+ return ndi.Get()
}
func GetRecoveryNodeDataInfoDate(day int) ([]NodeDataInfo, error) {
@@ -183,29 +161,48 @@ func GetDailyLimitNodeDataInfoDate(day, module, cluster
string) ([]NodeDataInfo,
return ndi, err
}
-func (n *NodeDataInfo) RecoveryMarker() (bool, error) {
- n.RecoveryMark = 1
- return n.Update()
+func (p *PodDataInfo) Add() (int64, error) {
+ row, err := db.Insert(p)
+ return row, err
}
-func (n *NodeDataInfo) RestartMarker() (bool, error) {
- n.Restart = 1
- return n.Update()
+func (p *PodDataInfo) Get() (*PodDataInfo, error) {
+ exist, err := db.Get(p)
+ if err != nil {
+ return nil, err
+ }
+ if !exist {
+ return nil, nil
+ }
+ return p, nil
}
-func GetNode() ([]NodeDataInfo, error) {
- var ndi []NodeDataInfo
- session := db.Where(fmt.Sprintf("id>%d", 0))
- err := session.Find(&ndi)
- return ndi, err
+func (p *PodDataInfo) Update() (bool, error) {
+ firstDate := time.Now().Format("2006-01-02 15:04:05")
+ p.FirstDate = firstDate
+
+ row, err := db.Where(fmt.Sprintf("id=%d", p.Id)).Update(p)
+ if err != nil {
+ return false, err
+ }
+ if row > 0 {
+ return true, nil
+ }
+ return false, nil
}
-func GetNodeByName(nodeName, moduleName string) (*NodeDataInfo, error) {
- ndi := NodeDataInfo{
- NodeName: nodeName,
- ModuleName: moduleName,
+func (p *PodDataInfo) Check() (bool, error) {
+ exist, err := db.Exist(p)
+ return exist, err
+}
+
+func (p *PodDataInfo) AddOrGet() (int64, error) {
+ exist, _ := p.Check()
+ if exist {
+ return p.Id, nil
}
- return ndi.Get()
+ row, err := p.Add()
+ return row, err
}
func GetPod() ([]PodDataInfo, error) {
diff --git a/app/horus/base/db/db_test.go b/app/horus/base/db/db_test.go
index b150f8d3..3fcf9220 100644
--- a/app/horus/base/db/db_test.go
+++ b/app/horus/base/db/db_test.go
@@ -46,7 +46,6 @@ func TestDataBase(t *testing.T) {
Repair: 0,
FirstDate: today,
}
- data.NodeName = "002"
id, err := data.Add()
t.Logf("test.add id:%v err:%v", id, err)
}
diff --git a/app/horus/base/db/sql.tpl b/app/horus/base/db/sql.tpl
index e431303f..bd61301b 100644
--- a/app/horus/base/db/sql.tpl
+++ b/app/horus/base/db/sql.tpl
@@ -14,38 +14,38 @@
// limitations under the License.
CREATE TABLE `node_data_info` (
- `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
- `node_name` varchar(255) CHARACTER SET utf8mb3
COLLATE utf8mb3_general_ci NOT NULL COMMENT '节点名',
- `node_ip` varchar(255) CHARACTER SET utf8mb3
COLLATE utf8mb3_general_ci NOT NULL COMMENT '节点IP',
- `sn` varchar(255) CHARACTER SET utf8mb3 COLLATE
utf8mb3_general_ci NOT NULL COMMENT '序列号',
- `cluster_name` varchar(255) CHARACTER SET utf8mb3
COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '集群名',
- `module_name` varchar(255) CHARACTER SET utf8mb3
COLLATE utf8mb3_general_ci NOT NULL COMMENT '模块名',
- `reason` varchar(255) CHARACTER SET utf8mb3
COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '维护原因',
- `restart` int(10) UNSIGNED NULL DEFAULT NULL
COMMENT '重启标志',
- `repair` int(10) UNSIGNED NULL DEFAULT NULL
COMMENT '修复标志',
- `repair_ticket_url` varchar(255) CHARACTER SET
utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '修复单跳转 URL',
- `first_date` datetime(0) NULL DEFAULT NULL
COMMENT '最早开始维护时间',
- `create_time` datetime(0) NULL DEFAULT
CURRENT_TIMESTAMP(0) COMMENT '创建时间',
- `update_time` datetime(0) NULL DEFAULT
CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间',
- PRIMARY KEY (`id`) USING BTREE,
- UNIQUE INDEX `idx_unique_node_module`
(`node_name`, `module_name`) USING BTREE
+ `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+ `node_name` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci
NOT NULL COMMENT '节点名',
+ `node_ip` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci
NOT NULL COMMENT '节点IP',
+ `sn` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT
NULL COMMENT '序列号',
+ `cluster_name` varchar(255) CHARACTER SET utf8mb3 COLLATE
utf8mb3_general_ci NULL DEFAULT NULL COMMENT '集群名',
+ `module_name` varchar(255) CHARACTER SET utf8mb3 COLLATE
utf8mb3_general_ci NOT NULL COMMENT '模块名',
+ `reason` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci
NULL DEFAULT NULL COMMENT '维护原因',
+ `restart` int(10) UNSIGNED NULL DEFAULT NULL COMMENT '重启标志',
+ `repair` int(10) UNSIGNED NULL DEFAULT NULL COMMENT '修复标志',
+ `repair_ticket_url` varchar(255) CHARACTER SET utf8mb3 COLLATE
utf8mb3_general_ci NULL DEFAULT NULL COMMENT '修复单跳转 URL',
+ `first_date` datetime(0) NULL DEFAULT NULL COMMENT '最早开始维护时间',
+ `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT
'创建时间',
+ `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE
CURRENT_TIMESTAMP(0) COMMENT '更新时间',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `idx_unique_node_module` (`node_name`, `module_name`) USING
BTREE
) ENGINE=InnoDB AUTO_INCREMENT=3 CHARACTER SET=utf8mb3
COLLATE=utf8mb3_general_ci ROW_FORMAT=Dynamic;
CREATE TABLE `pod_data_info` (
- `id` int unsigned NOT NULL AUTO_INCREMENT,
- `pod_name` varchar(255) CHARACTER SET utf8mb3
COLLATE utf8mb3_general_ci NOT NULL COMMENT 'Pod 名',
- `pod_ip` varchar(255) CHARACTER SET utf8mb3
COLLATE utf8mb3_general_ci DEFAULT NULL COMMENT 'PodIP',
- `sn` varchar(255) CHARACTER SET utf8mb3
COLLATE utf8mb3_general_ci NOT NULL COMMENT '序列号',
- `node_name` varchar(255) CHARACTER SET
utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT '节点名',
- `cluster_name` varchar(255) CHARACTER SET
utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL COMMENT '集群名',
- `module_name` varchar(255) CHARACTER SET
utf8mb3 COLLATE utf8mb3_general_ci NOT NULL COMMENT '模块名',
- `reason` varchar(255) CHARACTER SET utf8mb3
COLLATE utf8mb3_general_ci DEFAULT NULL COMMENT '维护原因',
- `restart` int DEFAULT NULL COMMENT '重启标志',
- `repair` int DEFAULT NULL COMMENT '修复标志',
- `repair_ticket_url` varchar(255) CHARACTER
SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL COMMENT '修复单跳转 URL',
- `first_date` datetime DEFAULT NULL COMMENT
'最早开始维护时间',
- `create_time` datetime DEFAULT
CURRENT_TIMESTAMP COMMENT '创建时间',
- `update_time` datetime DEFAULT
CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
- PRIMARY KEY (`id`) USING BTREE,
- UNIQUE KEY `idxUniqueName` (`pod_name`,
`module_name`) USING BTREE
+ `id` int unsigned NOT NULL AUTO_INCREMENT,
+ `pod_name` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci
NOT NULL COMMENT 'Pod 名',
+ `pod_ip` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci
DEFAULT NULL COMMENT 'PodIP',
+ `sn` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NOT
NULL COMMENT '序列号',
+ `node_name` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci
NOT NULL COMMENT '节点名',
+ `cluster_name` varchar(255) CHARACTER SET utf8mb3 COLLATE
utf8mb3_general_ci DEFAULT NULL COMMENT '集群名',
+ `module_name` varchar(255) CHARACTER SET utf8mb3 COLLATE
utf8mb3_general_ci NOT NULL COMMENT '模块名',
+ `reason` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci
DEFAULT NULL COMMENT '维护原因',
+ `restart` int DEFAULT NULL COMMENT '重启标志',
+ `repair` int DEFAULT NULL COMMENT '修复标志',
+ `repair_ticket_url` varchar(255) CHARACTER SET utf8mb3 COLLATE
utf8mb3_general_ci DEFAULT NULL COMMENT '修复单跳转 URL',
+ `first_date` datetime DEFAULT NULL COMMENT '最早开始维护时间',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '更新时间',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE KEY `idxUniqueName` (`pod_name`, `module_name`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC;
\ No newline at end of file
