diff --git a/apiserver/eurekaserver/access.go b/apiserver/eurekaserver/access.go index 0c157873b..f25036084 100644 --- a/apiserver/eurekaserver/access.go +++ b/apiserver/eurekaserver/access.go @@ -455,11 +455,6 @@ func (h *EurekaServer) DeleteStatus(req *restful.Request, rsp *restful.Response) log.Infof("[EUREKA-SERVER]instance status (instId=%s, appId=%s) has been deleted successfully", instId, appId) writeHeader(http.StatusOK, rsp) - h.replicateWorker.AddReplicateTask(&ReplicationInstance{ - AppName: appId, - Id: instId, - Action: actionDeleteStatusOverride, - }) return } log.Errorf("[EUREKA-SERVER]instance status (instId=%s, appId=%s) has been deleted failed, code is %d", @@ -494,12 +489,6 @@ func (h *EurekaServer) RenewInstance(req *restful.Request, rsp *restful.Response writePolarisStatusCode(req, code) if code == api.ExecuteSuccess || code == api.HeartbeatExceedLimit { writeHeader(http.StatusOK, rsp) - h.replicateWorker.AddReplicateTask(&ReplicationInstance{ - AppName: appId, - Id: instId, - Status: "UP", - Action: actionHeartbeat, - }) return } log.Errorf("[EUREKA-SERVER]instance (instId=%s, appId=%s) heartbeat failed, code is %d", @@ -538,11 +527,6 @@ func (h *EurekaServer) CancelInstance(req *restful.Request, rsp *restful.Respons writeHeader(http.StatusOK, rsp) log.Infof("[EUREKA-SERVER]instance (instId=%s, appId=%s) has been deregistered successfully, code is %d", instId, appId, code) - h.replicateWorker.AddReplicateTask(&ReplicationInstance{ - AppName: appId, - Id: instId, - Action: actionCancel, - }) return } log.Errorf("[EUREKA-SERVER]instance (instId=%s, appId=%s) has been deregistered failed, code is %d", diff --git a/apiserver/eurekaserver/replicate_worker.go b/apiserver/eurekaserver/replicate_worker.go index 3c0808511..bc2387c33 100644 --- a/apiserver/eurekaserver/replicate_worker.go +++ b/apiserver/eurekaserver/replicate_worker.go @@ -124,7 +124,8 @@ func (r *ReplicateWorker) doReplicateToPeer(peer string, tasks []*ReplicationIns if respInstance.StatusCode == http.StatusNotFound { task := tasks[i] if task.Action == actionHeartbeat { - log.Infof("[EUREKA-SERVER] instance %s of service %s not exists in %s, do register", task.Id, task.AppName, peer) + log.Infof("[EUREKA-SERVER] instance %s of service %s not exists in %s, do register instance info %+v", + task.Id, task.AppName, peer, task.InstanceInfo) // do the re-register registerTask := &ReplicationInstance{ AppName: task.AppName, diff --git a/bootstrap/server.go b/bootstrap/server.go index b78fac2ba..3fbbb0a3a 100644 --- a/bootstrap/server.go +++ b/bootstrap/server.go @@ -27,7 +27,7 @@ import ( "time" "github.com/golang/protobuf/ptypes/wrappers" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" "github.com/polarismesh/polaris/apiserver" "github.com/polarismesh/polaris/auth" @@ -425,7 +425,10 @@ func FinishBootstrapOrder(tx store.Transaction) error { func genContext() context.Context { ctx := context.Background() + reqCtx := context.WithValue(context.Background(), utils.ContextAuthTokenKey, "") ctx = context.WithValue(ctx, utils.StringContext("request-id"), fmt.Sprintf("self-%d", time.Now().Nanosecond())) + ctx = context.WithValue(ctx, utils.ContextAuthContextKey, model.NewAcquireContext( + model.WithOperation(model.Read), model.WithModule(model.BootstrapModule), model.WithRequestContext(reqCtx))) return ctx } @@ -511,10 +514,6 @@ func selfRegister( if err != nil { return err } - storage, err := store.GetStore() - if err != nil { - return err - } name := boot_config.DefaultPolarisName polarisNamespace := boot_config.DefaultPolarisNamespace @@ -526,14 +525,6 @@ func selfRegister( polarisNamespace = polarisService.Namespace } - svc, err := storage.GetService(name, polarisNamespace) - if err != nil { - return err - } - if svc == nil { - return fmt.Errorf("self service(%s) in namespace(%s) not found", name, polarisNamespace) - } - metadata := polarisService.Metadata if len(metadata) == 0 { metadata = make(map[string]string) @@ -547,7 +538,6 @@ func selfRegister( Host: utils.NewStringValue(host), Port: utils.NewUInt32Value(port), Protocol: utils.NewStringValue(protocol), - ServiceToken: utils.NewStringValue(svc.Token), Version: utils.NewStringValue(version.Get()), EnableHealthCheck: utils.NewBoolValue(true), Isolate: utils.NewBoolValue(isolated), diff --git a/common/model/auth.go b/common/model/auth.go index b90a04a10..36aedbd73 100644 --- a/common/model/auth.go +++ b/common/model/auth.go @@ -164,6 +164,8 @@ const ( AuthModule // MaintainModule 运维操作模块 MaintainModule + // BootstrapModule 初始化模块 + BootstrapModule ) // UserRoleType 用户角色类型