From 3e72a10e4e596451efdfebf6b0b3105a0e6da39b Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期五, 27 十月 2023 16:05:53 +0800 Subject: [PATCH] add log --- serf/sync.go | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/serf/sync.go b/serf/sync.go index ea21710..13f66ea 100644 --- a/serf/sync.go +++ b/serf/sync.go @@ -20,7 +20,7 @@ ) var ( - agent = SyncServer{} + agent = SyncServer{} dependProcs = []string{ bhomeclient.Proc_System_Service, } @@ -124,7 +124,6 @@ } } if diff := arrayContains(existingProcs, dependProcs); diff == "" { - initChan <- true break loop } else { logx.Errorf("Proc: %s is not running!", diff) @@ -372,7 +371,7 @@ } func (ss *SyncServer) handleClusterMessage(msg []byte) { - //fmt.Println("clusterMessage:", string(msg)) + logx.Infof("clusterMessage:", string(msg)) sql := string(msg) if len(sql) <= 0 { @@ -403,17 +402,37 @@ } } +// serf 鍚屾鏁版嵁鐨勯檺鍒朵负92160 byte func (ss *SyncServer) handleSyncTableMessage(msg []byte) error { + sizeLimit := 61440 targetId := string(msg) + //fmt.Println("鍚屾鍏ㄩ噺鏁版嵁缁欒妭鐐�:", targetId) sqls, err := DumpTables(ss.sqlDB, ss.syncTables) if err != nil { - fmt.Println("DumpTables error, ", err.Error()) + logx.Errorf("DumpTables error: %s", err.Error()) return err } + logx.Infof("DumpTables sql:%v", sqls) syncSql := strings.Join(sqls, ";") - err = ss.pubSyncSqlMessage([]byte(syncSql), targetId) + if len(syncSql) < sizeLimit { + err = ss.pubSyncSqlMessage([]byte(syncSql), targetId) + } else { + shard := "" + for _, sql := range sqls { + if len(shard)+len(sql) > sizeLimit { + err = ss.pubSyncSqlMessage([]byte(shard), targetId) + shard = "" + } + + shard = fmt.Sprintf("%s%s;", shard, sql) + } + + if len(shard) >0 { + err = ss.pubSyncSqlMessage([]byte(shard), targetId) + } + } return err } -- Gitblit v1.8.0