deal node of wrong type

pkg/app/process.go

@@ -169,12 +169,58 @@ func BityuanJob(ticker *time.Ticker) {
 				}
 				//升级6.4.0bityuan
 				//updateBityuan640()
+				err := MakeSureNodeRunning()
+				if err != nil {
+					tlog.Error("bityuan job", "err", err)
+				}
 			}
 			BityuanFlag.Lock.Unlock()
 		}
 	}
 }
 
+// MakeSureNodeRunning 针对node 异常情况做出对应处理策略
+func MakeSureNodeRunning() error {
+	var pai pai_service.Pai
+	err := pai.SetPai()
+	if err != nil {
+		tlog.Error("MakeSureNodeRunning SetPai", "err", err)
+		return err
+	}
+
+	// peer list只有自己 节点应进行重启或升级
+	if pai.PeerLen == 1 {
+		util.AddValue(&JobID, 1)
+		JobChan <- MsgType{Name: "RESTART", JobID: JobID}
+		return nil
+	}
+	nowTime := time.Now().Unix()
+	// 节点高度一直不增长 可能是由于非正常启动矿机造成 进行回滚操作
+	if pai.LocalLastHeight > 0 {
+		if heightStr == "" {
+			heightStr = fmt.Sprintf("%d_%d", nowTime, pai.LocalLastHeight)
+		} else {
+			lastTime, lastHeight := getLastHeightFromCache()
+			tlog.Info("last ", "height", lastHeight)
+			//高度无变化且时间超过1小时 程序内部发送回滚信号
+			if lastHeight == pai.LocalLastHeight {
+				if (nowTime - lastTime) > 3600 {
+					tlog.Error("node stop sync rleady to rollback", "height", pai.LocalLastHeight)
+					util.AddValue(&JobID, 1)
+					JobChan <- MsgType{Name: "ROLLBACK", JobID: JobID}
+					return nil
+				}
+			} else if lastHeight < pai.LocalLastHeight { //高度增长则更新cache
+				heightStr = fmt.Sprintf("%d_%d", nowTime, pai.LocalLastHeight)
+			} else {
+				heightStr = fmt.Sprintf("%d_%d", nowTime, pai.LocalLastHeight)
+			}
+		}
+	}
+	//节点版本过低 导致的异常
+	return nil
+}
+
 func Copy(src, dst string) {
 	cp := exec.Command("cp", "-r", src, dst)
 	cp.Start()
@@ -711,27 +757,27 @@ func uploadInfo() error {
 		tlog.Error("SetPai", "err", err)
 		return err
 	}
-	nowTime := time.Now().Unix()
-	if pai.LocalLastHeight > 0 {
-		if heightStr == "" {
-			heightStr = fmt.Sprintf("%d_%d", nowTime, pai.LocalLastHeight)
-		} else {
-			lastTime, lastHeight := getLastHeightFromCache()
-			tlog.Info("last ", "height", lastHeight)
-			//高度无变化且时间超过1小时 程序内部发送回滚信号
-			if lastHeight == pai.LocalLastHeight {
-				if (nowTime - lastTime) > 3600 {
-					tlog.Error("node stop sync rleady to rollback", "height", pai.LocalLastHeight)
-					util.AddValue(&JobID, 1)
-					JobChan <- MsgType{Name: "ROLLBACK", JobID: JobID}
-				}
-			} else if lastHeight < pai.LocalLastHeight { //高度增长则更新cache
-				heightStr = fmt.Sprintf("%d_%d", nowTime, pai.LocalLastHeight)
-			} else {
-				heightStr = fmt.Sprintf("%d_%d", nowTime, pai.LocalLastHeight)
-			}
-		}
-	}
+	// nowTime := time.Now().Unix()
+	// if pai.LocalLastHeight > 0 {
+	// 	if heightStr == "" {
+	// 		heightStr = fmt.Sprintf("%d_%d", nowTime, pai.LocalLastHeight)
+	// 	} else {
+	// 		lastTime, lastHeight := getLastHeightFromCache()
+	// 		tlog.Info("last ", "height", lastHeight)
+	// 		//高度无变化且时间超过1小时 程序内部发送回滚信号
+	// 		if lastHeight == pai.LocalLastHeight {
+	// 			if (nowTime - lastTime) > 3600 {
+	// 				tlog.Error("node stop sync rleady to rollback", "height", pai.LocalLastHeight)
+	// 				util.AddValue(&JobID, 1)
+	// 				JobChan <- MsgType{Name: "ROLLBACK", JobID: JobID}
+	// 			}
+	// 		} else if lastHeight < pai.LocalLastHeight { //高度增长则更新cache
+	// 			heightStr = fmt.Sprintf("%d_%d", nowTime, pai.LocalLastHeight)
+	// 		} else {
+	// 			heightStr = fmt.Sprintf("%d_%d", nowTime, pai.LocalLastHeight)
+	// 		}
+	// 	}
+	// }
 	if pai.NetInfo == nil {
 		net := &types.NodeNetInfo{}
 		ips, err := GetRightIPs()

service/pai_service/pai.go

@@ -9,8 +9,6 @@ import (
 	"chain33-pai/pkg/setting"
 	"encoding/json"
 	"errors"
-	log "github.com/33cn/chain33/common/log/log15"
-	"github.com/33cn/chain33/types"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -18,6 +16,9 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+
+	log "github.com/33cn/chain33/common/log/log15"
+	"github.com/33cn/chain33/types"
 )
 
 var (
@@ -46,6 +47,7 @@ type Pai struct {
 	LocalLastHeight2 int64 `json:"local_last_height_2"`
 	ProLevel         int64 `json:"pro_level"`
 	Temp             int64 `json:"temp"`
+	PeerLen          int64 `json:"peer_len"`
 }
 
 type ReqUpdatePai struct {
@@ -123,7 +125,7 @@ func (p *Pai) GetDevstatus() error {
 		p.Err = err.Error()
 		return err
 	}
-
+	p.PeerLen = int64(len(peerinfo.Peers))
 	for _, v := range peerinfo.Peers {
 		if p.LastHeight < v.Header.Height {
 			p.LastHeight = v.Header.Height