From f1cd5a5e3adc85f80ba79b4b75348651865de8c7 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 15 八月 2019 17:21:34 +0800
Subject: [PATCH] rm a.Stop when Join failed
---
agent.go | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/agent.go b/agent.go
index 8764201..bc2585f 100644
--- a/agent.go
+++ b/agent.go
@@ -118,12 +118,18 @@
switch ev := event.(type) {
case serf.UserEvent:
- fmt.Println(string(ev.Payload))
- var sqlArr []string
- sqlArr = append(sqlArr, string(ev.Payload))
- //results, err := ExecuteWriteSql(sqlArr)
- flag, _ := ExecuteSqlByGorm(sqlArr)
- fmt.Println("userEvent exec ",sqlArr,",Result:",flag)
+ //fmt.Println(string(ev.Payload))
+ var sqlUe SqlUserEvent
+ err := json.Unmarshal(ev.Payload, &sqlUe)
+ if err !=nil {
+ fmt.Println("sqlUe unmarshal err:",err)
+ return
+ }
+ if sqlUe.Owner != a.conf.NodeName {
+ //results, err := ExecuteWriteSql(sqlArr)
+ flag, _ := ExecuteSqlByGorm(sqlUe.Sql)
+ fmt.Println("userEvent exec ",sqlUe.Sql,",Result:",flag)
+ }
case *serf.Query:
@@ -478,10 +484,24 @@
}
+type SqlUserEvent struct {
+ Owner string `json:"owner"`
+ Sql []string `json:"sql"`
+}
+
//SyncSql boardcast sql to cluster
-func (a *Agent) SyncSql(sqlOp string) {
+func (a *Agent) SyncSql(sqlOp []string) {
// event : use to send command to operate db.
- err := a.UserEvent("SyncSql", []byte(sqlOp), false)
+ var sqlUe = SqlUserEvent{
+ Owner: a.conf.NodeName,
+ Sql: sqlOp,
+ }
+ ueB, err := json.Marshal(sqlUe)
+ if err !=nil {
+ fmt.Println("sqlUE marshal err:",err)
+ return
+ }
+ err = a.UserEvent("SyncSql", ueB, false)
if err == nil || !strings.Contains(err.Error(), "cannot contain") {
fmt.Println("err: ", err)
}
@@ -553,8 +573,8 @@
n, err := a.Agent.Join(nodes, true)
if err != nil || n == 0 {
- a.Stop()
- fmt.Println("Stop node")
+ //a.Stop()
+ //fmt.Println("Stop node")
return fmt.Errorf("Error Encrypt Key!")
}
--
Gitblit v1.8.0