lilai23 commented on a change in pull request #801: URL: https://github.com/apache/servicecomb-service-center/pull/801#discussion_r549953565
########## File path: datasource/mongo/event/instance_event_handler.go ########## @@ -0,0 +1,117 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package event + +import ( + "context" + "fmt" + "github.com/apache/servicecomb-service-center/datasource/mongo" + "github.com/apache/servicecomb-service-center/datasource/mongo/sd" + "github.com/apache/servicecomb-service-center/pkg/dump" + "github.com/apache/servicecomb-service-center/pkg/log" + "github.com/apache/servicecomb-service-center/pkg/util" + "github.com/apache/servicecomb-service-center/server/syncernotify" + "github.com/go-chassis/cari/discovery" + "go.mongodb.org/mongo-driver/bson" +) + +const ( + SPLIT = "/" + ServiceRootKey = "/cse-sr/ms/files" + InstanceRootKey = "/cse-sr/inst/files" +) Review comment: 建议引用datasource包下的常量 ########## File path: datasource/mongo/event/instance_event_handler.go ########## @@ -0,0 +1,117 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package event + +import ( + "context" + "fmt" + "github.com/apache/servicecomb-service-center/datasource/mongo" + "github.com/apache/servicecomb-service-center/datasource/mongo/sd" + "github.com/apache/servicecomb-service-center/pkg/dump" + "github.com/apache/servicecomb-service-center/pkg/log" + "github.com/apache/servicecomb-service-center/pkg/util" + "github.com/apache/servicecomb-service-center/server/syncernotify" + "github.com/go-chassis/cari/discovery" + "go.mongodb.org/mongo-driver/bson" +) + +const ( + SPLIT = "/" + ServiceRootKey = "/cse-sr/ms/files" + InstanceRootKey = "/cse-sr/inst/files" +) + +// InstanceEventHandler is the handler to handle events +//as instance registry or instance delete, and notify syncer +type InstanceEventHandler struct { +} + +func (h InstanceEventHandler) Type() string { + return mongo.CollectionInstance +} + +func (h InstanceEventHandler) OnEvent(evt sd.MongoEvent) { + action := evt.Type + instance := evt.Value.(sd.Instance) + providerID := instance.InstanceInfo.ServiceId + providerInstanceID := instance.InstanceInfo.InstanceId + + cacheService := sd.Store().Service().Cache().Get(providerID) + var ms *discovery.MicroService + if cacheService != nil { + ms = cacheService.(sd.Service).ServiceInfo + } + if ms == nil { + log.Info("get cached service failed, then get from data base") + service, errs := mongo.GetService(context.Background(), bson.M{"serviceinfo.serviceid": providerID}) + if service == nil || errs != nil { + log.Error("get service from database failed", errs) + return + } + ms = service.ServiceInfo // service in the cache may not ready, query from db once + if ms == nil { + log.Warn(fmt.Sprintf("caught [%s] instance[%s/%s] event, endpoints %v, get provider's file failed from db\n", + action, providerID, providerInstanceID, instance.InstanceInfo.Endpoints)) + return + } + } + if !syncernotify.GetSyncerNotifyCenter().Closed() { + NotifySyncerInstanceEvent(evt, ms) + } +} + +func NewInstanceEventHandler() *InstanceEventHandler { + return &InstanceEventHandler{} +} + +func NotifySyncerInstanceEvent(evt sd.MongoEvent, ms *discovery.MicroService) { + instance := evt.Value.(sd.Instance).InstanceInfo + log.Info(fmt.Sprintf("instance in NotifySyncerInstanceEvent : %v", instance)) Review comment: 不必打印出instance所有信息，关键信息即可，比如instanceId ########## File path: datasource/mongo/event/instance_event_handler.go ########## @@ -0,0 +1,117 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package event + +import ( + "context" + "fmt" + "github.com/apache/servicecomb-service-center/datasource/mongo" + "github.com/apache/servicecomb-service-center/datasource/mongo/sd" + "github.com/apache/servicecomb-service-center/pkg/dump" + "github.com/apache/servicecomb-service-center/pkg/log" + "github.com/apache/servicecomb-service-center/pkg/util" + "github.com/apache/servicecomb-service-center/server/syncernotify" + "github.com/go-chassis/cari/discovery" + "go.mongodb.org/mongo-driver/bson" +) + +const ( + SPLIT = "/" + ServiceRootKey = "/cse-sr/ms/files" + InstanceRootKey = "/cse-sr/inst/files" +) + +// InstanceEventHandler is the handler to handle events +//as instance registry or instance delete, and notify syncer +type InstanceEventHandler struct { +} + +func (h InstanceEventHandler) Type() string { + return mongo.CollectionInstance +} + +func (h InstanceEventHandler) OnEvent(evt sd.MongoEvent) { + action := evt.Type + instance := evt.Value.(sd.Instance) + providerID := instance.InstanceInfo.ServiceId + providerInstanceID := instance.InstanceInfo.InstanceId + + cacheService := sd.Store().Service().Cache().Get(providerID) + var ms *discovery.MicroService + if cacheService != nil { + ms = cacheService.(sd.Service).ServiceInfo + } + if ms == nil { + log.Info("get cached service failed, then get from data base") + service, errs := mongo.GetService(context.Background(), bson.M{"serviceinfo.serviceid": providerID}) + if service == nil || errs != nil { + log.Error("get service from database failed", errs) + return + } + ms = service.ServiceInfo // service in the cache may not ready, query from db once + if ms == nil { + log.Warn(fmt.Sprintf("caught [%s] instance[%s/%s] event, endpoints %v, get provider's file failed from db\n", + action, providerID, providerInstanceID, instance.InstanceInfo.Endpoints)) + return + } + } + if !syncernotify.GetSyncerNotifyCenter().Closed() { + NotifySyncerInstanceEvent(evt, ms) + } +} + +func NewInstanceEventHandler() *InstanceEventHandler { + return &InstanceEventHandler{} +} + +func NotifySyncerInstanceEvent(evt sd.MongoEvent, ms *discovery.MicroService) { + instance := evt.Value.(sd.Instance).InstanceInfo + log.Info(fmt.Sprintf("instance in NotifySyncerInstanceEvent : %v", instance)) + instanceKey := util.StringJoin([]string{InstanceRootKey, evt.Value.(sd.Instance).Domain, + evt.Value.(sd.Instance).Project, instance.ServiceId, instance.InstanceId}, SPLIT) + + instanceKv := dump.KV{ + Key: instanceKey, + Value: instance, + } + + dInstance := dump.Instance{ + KV: &instanceKv, + Value: instance, + } + serviceKey := util.StringJoin([]string{ServiceRootKey, evt.Value.(sd.Instance).Domain, + evt.Value.(sd.Instance).Project, instance.ServiceId}, SPLIT) + serviceKv := dump.KV{ + Key: serviceKey, + Value: ms, + } + + dService := dump.Microservice{ Review comment: 同上 ########## File path: datasource/mongo/event/instance_event_handler.go ########## @@ -0,0 +1,117 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package event + +import ( + "context" + "fmt" + "github.com/apache/servicecomb-service-center/datasource/mongo" Review comment: 建议包导入顺序：标准库、系统库、第三方库、本项目的库，不同分组之间使用空行分割开 ########## File path: datasource/mongo/event/instance_event_handler_test.go ########## @@ -0,0 +1,75 @@ +package event + +import ( + "testing" + + "github.com/apache/servicecomb-service-center/datasource/mongo/client" + "github.com/apache/servicecomb-service-center/datasource/mongo/sd" + "github.com/go-chassis/cari/discovery" + "github.com/go-chassis/go-chassis/v2/storage" + "github.com/stretchr/testify/assert" +) + +func init() { + config := storage.Options{ + URI: "mongodb://localhost:27017", + } + client.NewMongoClient(config) +} + +func TestInstanceEventHandler_OnEvent(t *testing.T) { + + t.Run("OnEvent test by request config", func(t *testing.T) { + h := InstanceEventHandler{} + h.OnEvent(mongoAssign()) + assert.NotNil(t, discovery.MicroService{}) + }) + t.Run("OnEvent test by request config", func(t *testing.T) { + h := InstanceEventHandler{} + h.OnEvent(mongoAssign()) + assert.Error(t, assert.AnError) + }) +} + +func TestNotifySyncerInstanceEvent(t *testing.T) { + t.Run("NotifySyncerInstanceEvent test", func(t *testing.T) { + evt := mongoAssign() + ms := getMicroService() + NotifySyncerInstanceEvent(evt, ms) + assert.Equal(t, false, t.Failed()) + }) +} + +func mongoAssign() sd.MongoEvent { + sd.Store().Service().Cache() + endPoints := []string{"127.0.0.1:27017"} + instance := discovery.MicroServiceInstance{ + InstanceId: "f73dceb440f711eba63ffa163e7cdcb8", + ServiceId: "2a20507274fc71c925d138341517dce14b600744", + Endpoints: endPoints, + } + mInstance := sd.Instance{} + mInstance.InstanceInfo = &instance + mInstance.Domain = "default" Review comment: 变量命名问题 ########## File path: datasource/mongo/event/instance_event_handler.go ########## @@ -0,0 +1,117 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package event + +import ( + "context" + "fmt" + "github.com/apache/servicecomb-service-center/datasource/mongo" + "github.com/apache/servicecomb-service-center/datasource/mongo/sd" + "github.com/apache/servicecomb-service-center/pkg/dump" + "github.com/apache/servicecomb-service-center/pkg/log" + "github.com/apache/servicecomb-service-center/pkg/util" + "github.com/apache/servicecomb-service-center/server/syncernotify" + "github.com/go-chassis/cari/discovery" + "go.mongodb.org/mongo-driver/bson" +) + +const ( + SPLIT = "/" + ServiceRootKey = "/cse-sr/ms/files" + InstanceRootKey = "/cse-sr/inst/files" +) + +// InstanceEventHandler is the handler to handle events +//as instance registry or instance delete, and notify syncer +type InstanceEventHandler struct { +} + +func (h InstanceEventHandler) Type() string { + return mongo.CollectionInstance +} + +func (h InstanceEventHandler) OnEvent(evt sd.MongoEvent) { + action := evt.Type + instance := evt.Value.(sd.Instance) + providerID := instance.InstanceInfo.ServiceId + providerInstanceID := instance.InstanceInfo.InstanceId + + cacheService := sd.Store().Service().Cache().Get(providerID) + var ms *discovery.MicroService + if cacheService != nil { + ms = cacheService.(sd.Service).ServiceInfo + } + if ms == nil { + log.Info("get cached service failed, then get from data base") + service, errs := mongo.GetService(context.Background(), bson.M{"serviceinfo.serviceid": providerID}) + if service == nil || errs != nil { + log.Error("get service from database failed", errs) + return + } + ms = service.ServiceInfo // service in the cache may not ready, query from db once + if ms == nil { + log.Warn(fmt.Sprintf("caught [%s] instance[%s/%s] event, endpoints %v, get provider's file failed from db\n", + action, providerID, providerInstanceID, instance.InstanceInfo.Endpoints)) + return + } + } + if !syncernotify.GetSyncerNotifyCenter().Closed() { + NotifySyncerInstanceEvent(evt, ms) + } +} + +func NewInstanceEventHandler() *InstanceEventHandler { + return &InstanceEventHandler{} +} + +func NotifySyncerInstanceEvent(evt sd.MongoEvent, ms *discovery.MicroService) { + instance := evt.Value.(sd.Instance).InstanceInfo + log.Info(fmt.Sprintf("instance in NotifySyncerInstanceEvent : %v", instance)) + instanceKey := util.StringJoin([]string{InstanceRootKey, evt.Value.(sd.Instance).Domain, + evt.Value.(sd.Instance).Project, instance.ServiceId, instance.InstanceId}, SPLIT) + + instanceKv := dump.KV{ + Key: instanceKey, + Value: instance, + } + + dInstance := dump.Instance{ Review comment: dInstance变量命名不清晰明了 ########## File path: datasource/mongo/event/instance_event_handler.go ########## @@ -0,0 +1,117 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package event + +import ( + "context" + "fmt" + "github.com/apache/servicecomb-service-center/datasource/mongo" + "github.com/apache/servicecomb-service-center/datasource/mongo/sd" + "github.com/apache/servicecomb-service-center/pkg/dump" + "github.com/apache/servicecomb-service-center/pkg/log" + "github.com/apache/servicecomb-service-center/pkg/util" + "github.com/apache/servicecomb-service-center/server/syncernotify" + "github.com/go-chassis/cari/discovery" + "go.mongodb.org/mongo-driver/bson" +) + +const ( + SPLIT = "/" + ServiceRootKey = "/cse-sr/ms/files" + InstanceRootKey = "/cse-sr/inst/files" +) + +// InstanceEventHandler is the handler to handle events +//as instance registry or instance delete, and notify syncer +type InstanceEventHandler struct { +} + +func (h InstanceEventHandler) Type() string { + return mongo.CollectionInstance +} + +func (h InstanceEventHandler) OnEvent(evt sd.MongoEvent) { + action := evt.Type + instance := evt.Value.(sd.Instance) + providerID := instance.InstanceInfo.ServiceId + providerInstanceID := instance.InstanceInfo.InstanceId + + cacheService := sd.Store().Service().Cache().Get(providerID) + var ms *discovery.MicroService + if cacheService != nil { + ms = cacheService.(sd.Service).ServiceInfo + } + if ms == nil { + log.Info("get cached service failed, then get from data base") + service, errs := mongo.GetService(context.Background(), bson.M{"serviceinfo.serviceid": providerID}) + if service == nil || errs != nil { + log.Error("get service from database failed", errs) + return + } + ms = service.ServiceInfo // service in the cache may not ready, query from db once + if ms == nil { + log.Warn(fmt.Sprintf("caught [%s] instance[%s/%s] event, endpoints %v, get provider's file failed from db\n", + action, providerID, providerInstanceID, instance.InstanceInfo.Endpoints)) + return + } + } + if !syncernotify.GetSyncerNotifyCenter().Closed() { + NotifySyncerInstanceEvent(evt, ms) + } +} + +func NewInstanceEventHandler() *InstanceEventHandler { + return &InstanceEventHandler{} +} + +func NotifySyncerInstanceEvent(evt sd.MongoEvent, ms *discovery.MicroService) { + instance := evt.Value.(sd.Instance).InstanceInfo + log.Info(fmt.Sprintf("instance in NotifySyncerInstanceEvent : %v", instance)) + instanceKey := util.StringJoin([]string{InstanceRootKey, evt.Value.(sd.Instance).Domain, + evt.Value.(sd.Instance).Project, instance.ServiceId, instance.InstanceId}, SPLIT) + + instanceKv := dump.KV{ + Key: instanceKey, + Value: instance, + } + + dInstance := dump.Instance{ + KV: &instanceKv, + Value: instance, + } + serviceKey := util.StringJoin([]string{ServiceRootKey, evt.Value.(sd.Instance).Domain, + evt.Value.(sd.Instance).Project, instance.ServiceId}, SPLIT) + serviceKv := dump.KV{ + Key: serviceKey, + Value: ms, + } + + dService := dump.Microservice{ + KV: &serviceKv, + Value: ms, + } + + instEvent := &dump.WatchInstanceChangedEvent{ + Action: string(evt.Type), + Service: &dService, + Instance: &dInstance, + } + syncernotify.GetSyncerNotifyCenter().AddEvent(instEvent) + + log.Debug(fmt.Sprintf("success to add instance change event:%v to event queue", instEvent)) Review comment: 同上，日志打印不需打印整个结构体 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
