Merge pull request #2576 from wusendong/solve_3.2

解决evenserver中redis oom问题

Former-commit-id: baaa3d2

Author: breezelxp

src/common/eventclient/eventclient.go

@@ -15,14 +15,15 @@ package eventclient
 import (
 	"encoding/json"
 	"net/http"
+	"reflect"
 	"time"
 
-	"gopkg.in/redis.v5"
-
 	"configcenter/src/common"
 	"configcenter/src/common/metadata"
 	"configcenter/src/common/util"
 	"configcenter/src/framework/core/errors"
+
+	"gopkg.in/redis.v5"
 )
 
 type EventContext struct {
@@ -47,6 +48,14 @@ func (c *EventContext) InsertEvent(eventType, objType, action string, curData in
 	if c.CacheCli == nil {
 		return errors.New("invalid event context with nil cache client")
 	}
+	equal, err := instEqual(curData, preData)
+	if err != nil {
+		return err
+	}
+	if equal {
+		return nil
+	}
+
 	eventID, err := c.CacheCli.Incr(common.EventCacheEventIDKey).Result()
 	if err != nil {
 		return err
@@ -86,3 +95,43 @@ func (c *EventContext) InsertEvent(eventType, objType, action string, curData in
 	}
 	return c.CacheCli.LPush(common.EventCacheEventQueueKey, value).Err()
 }
+
+// instEqual Determine whether the data is consistent before and after the change
+func instEqual(predata, curdata interface{}) (bool, error) {
+	switch {
+	case predata == curdata:
+		return true, nil
+	case predata == nil && curdata != nil:
+		return false, nil
+	case curdata == nil && predata != nil:
+		return false, nil
+	}
+
+	preData, err := toMap(predata)
+	if err != nil {
+		return false, err
+	}
+	curData, err := toMap(curdata)
+	if err != nil {
+		return false, err
+	}
+	delete(preData, common.LastTimeField)
+	delete(curData, common.LastTimeField)
+
+	return reflect.DeepEqual(preData, curData), nil
+}
+
+func toMap(data interface{}) (map[string]interface{}, error) {
+	out, err := json.Marshal(data)
+	if err != nil {
+		return nil, err
+	}
+
+	m := map[string]interface{}{}
+	err = json.Unmarshal(out, &m)
+	if err != nil {
+		return nil, err
+	}
+
+	return m, nil
+}

src/scene_server/event_server/identifier/identifier.go

@@ -424,17 +424,23 @@ func NewHostIdentifier(m map[string]interface{}) *HostIdentifier {
 	if nil != err {
 		blog.Errorf("%s is not integer, %+v ", "bk_host_id", m)
 	}
-	ident.Memory, err = util.GetInt64ByInterface(m["bk_mem"])
-	if nil != err {
-		blog.Errorf("%s is not integer, %+v ", "bk_mem", m)
+	if m["bk_mem"] != nil {
+		ident.Memory, err = util.GetInt64ByInterface(m["bk_mem"])
+		if nil != err {
+			blog.Warnf("%s is not integer, %+v ", "bk_mem", m)
+		}
 	}
-	ident.CPU, err = util.GetInt64ByInterface(m["bk_cpu"])
-	if nil != err {
-		blog.Errorf("%s is not integer, %+v ", "bk_cpu", m)
+	if m["bk_cpu"] != nil {
+		ident.CPU, err = util.GetInt64ByInterface(m["bk_cpu"])
+		if nil != err {
+			blog.Warnf("%s is not integer, %+v ", "bk_cpu", m)
+		}
 	}
-	ident.Disk, err = util.GetInt64ByInterface(m["bk_disk"])
-	if nil != err {
-		blog.Errorf("%s is not integer, %+v ", "bk_disk", m)
+	if m["bk_disk"] != nil {
+		ident.Disk, err = util.GetInt64ByInterface(m["bk_disk"])
+		if nil != err {
+			blog.Warnf("%s is not integer, %+v ", "bk_disk", m)
+		}
 	}
 	ident.Module = map[string]*Module{}
 	return &ident