From 8f1e42921da26573b5d08ec2e6909f3081d85109 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期三, 13 五月 2020 20:43:11 +0800 Subject: [PATCH] fix debug.Stack() and add log --- agent.go | 69 +++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 30 deletions(-) diff --git a/agent.go b/agent.go index 45f9ab7..fb48647 100644 --- a/agent.go +++ b/agent.go @@ -62,9 +62,9 @@ } // Create create serf agent with config -func Create(conf *Config) (*Agent, error) { +func Create(conf *Config, snapshotPath string) (*Agent, error) { // config cover to serf config - serfConf, err := conf.convertToSerf() + serfConf, err := conf.convertToSerf(snapshotPath) if err != nil { return nil, err } @@ -130,6 +130,26 @@ receiveSqlInterface = c } +type DbHandler interface { + Execute(sql string) bool +} + +type DbDumpHandler interface { + Dump(tables string) string +} + +//鏁版嵁搴揺xecute鍙ユ焺 +var DbHandle DbHandler +//鏁版嵁搴撳浠藉彞鏌�,鍙湪syncdb涓敤鍒� +var dbDumpH DbDumpHandler + +func RegisterDbHandler(h DbHandler) { + DbHandle = h +} + +func RegisterDbDumpHandler(h DbDumpHandler) { + dbDumpH = h +} // HandleEvent Handles serf.EventMemberJoin events, // which will wait for members to join until the number of group members is equal to "groupExpect" @@ -148,7 +168,7 @@ return } if sqlUe.Owner != a.conf.NodeName { - ExecuteWriteSql(sqlUe.Sql, true) + //ExecuteWriteSql(sqlUe.Sql, true) //flag, _ := ExecuteSqlByGorm(sqlUe.Sql) //fmt.Println("userEvent exec 1 ", sqlUe.Sql, ",Result:", results) if receiveSqlInterface != nil && sqlUe.Sql !=nil && len(sqlUe.Sql) > 0 { @@ -192,23 +212,12 @@ //fmt.Println(string(ev.Payload)) var tableNames []string err := json.Unmarshal(ev.Payload, &tableNames) - if err !=nil { - //fmt.Println("Query tableNames unmarshal err") - return - } + fmt.Println("androidSync tableNames:", tableNames, "err:", err) - rows, err := ExecuteQuerySql(tableNames) - if err != nil { - //fmt.Println("err: ", err) - return - } - var rowsReturn []Rows - for _, r := range rows { - rowsReturn = append(rowsReturn, *r) - } + dumpData := dbDumpH.Dump(strings.Join(tableNames, ",")) - bytesReturn, err := json.Marshal(rowsReturn) - //fmt.Println("results: ", bytesReturn) + bytesReturn, _ := json.Marshal(dumpData) + fmt.Println("androidSync len(bytesReturn): ", len(bytesReturn)) if query, ok := event.(*serf.Query); ok { if err := query.Respond(bytesReturn); err != nil { //fmt.Printf("err: %s\n", err) @@ -442,21 +451,21 @@ func (a *Agent) GetTableDataFromCluster(tableNames []string) (*[]string, error) { //members: get name of first member mbs := a.GroupMembers(a.conf.ClusterID) - var specmembername string + specmembername := "" for _, m := range mbs { //fmt.Println("m", m) if m.Name != a.conf.NodeName { //鍓嶇紑锛欴SVAD:鍒嗘瀽鏈嶅姟鍣� DSPAD:杩涘嚭鍏ad - if strings.HasPrefix(a.conf.NodeName, "DSVAD"){ - if strings.HasPrefix(m.Name, "DSVAD") { + if strings.HasPrefix(a.conf.NodeName, "PSPAD"){ + if strings.HasPrefix(m.Name, "PSPAD") { specmembername = m.Name break } - }else{ - specmembername = m.Name - break } } } + //if specmembername == "" { + // return nil, errors.New("other pad node not found in memberlist") + //} //fmt.Println("mbs:", mbs, "a.conf.BindAddr:", a.conf.BindAddr, "specmembername:", specmembername) //query: get db file. @@ -469,9 +478,9 @@ resp, err := a.Query(QueryEventUpdateDBData, tBytes, ¶ms) if err == nil || !strings.Contains(err.Error(), "cannot contain") { - //fmt.Println("err: ", err) + //fmt.Println("QueryEventUpdateDBData err: ") } - //fmt.Println("Query.resp.err:", err, "resp:", resp) + fmt.Println("Query.resp.err:", err, "resp:", resp) var wg sync.WaitGroup wg.Add(1) @@ -520,8 +529,8 @@ } //Init serf Init -func Init(clusterID string, password string, nodeID string, addrs []string) (*Agent, error) { - agent, err := InitNode(clusterID, password, nodeID) +func Init(clusterID string, password string, nodeID string, addrs []string, snapshotPath string) (*Agent, error) { + agent, err := InitNode(clusterID, password, nodeID, snapshotPath) if err != nil { //fmt.Printf("InitNode failed, error: %s", err) return agent, err @@ -537,7 +546,7 @@ } //InitNode web鍚庡彴鏀跺埌鍒涘缓闆嗙兢鐨勮姹傦紝 -func InitNode(clusterID string, password string, nodeID string) (*Agent, error) { +func InitNode(clusterID string, password string, nodeID string, snapshotPath string) (*Agent, error) { conf := DefaultConfig() //fmt.Println("clusterID:", clusterID, "password:", password, "nodeID:", nodeID) conf.ClusterID = clusterID @@ -553,7 +562,7 @@ } conf.EncryptKey = password } - agent, err := Create(conf) + agent, err := Create(conf, snapshotPath) if err != nil { //fmt.Printf("create agent failed, error: %s", err) return agent, err -- Gitblit v1.8.0