quota modify

server/service/event/instance_event_handler.go

@@ -21,6 +21,8 @@ import (
 	nf "github.com/ServiceComb/service-center/server/service/notification"
 	serviceUtil "github.com/ServiceComb/service-center/server/service/util"
 	"golang.org/x/net/context"
+	"strings"
+	apt "github.com/ServiceComb/service-center/server/core"
 )
 
 type InstanceEventHandler struct {
@@ -40,6 +42,17 @@ func (h *InstanceEventHandler) OnEvent(evt *store.KvEvent) {
 			providerId, providerInstanceId, action)
 		return
 	}
+	if action == pb.EVT_DELETE {
+		spilted := strings.Split(tenantProject, "/")
+		if len(spilted) == 2 && apt.IsDefaultDomain(tenantProject) {
+			domainName := spilted[0]
+			projectName := spilted[1]
+			ctx := context.TODO()
+			ctx = context.WithValue(ctx, "tenant", domainName)
+			ctx = context.WithValue(ctx, "project", projectName)
+			serviceUtil.RemandInstanceQuota(ctx)
+		}
+	}
 
 	if nf.GetNotifyService().Closed() {
 		util.Logger().Warnf(nil, "caught instance %s/%s [%s] event, but notify service is closed",

server/service/instances.go

@@ -275,8 +275,6 @@ func (s *InstanceController) Unregister(ctx context.Context, in *pb.UnregisterIn
 		}, nil
 	}
 
-	serviceUtil.RemandInstanceQuota(ctx)
-
 	util.Logger().Infof("unregister instance successful isntance %s, operator %s.", instanceFlag, remoteIP)
 	return &pb.UnregisterInstanceResponse{
 		Response: pb.CreateResponse(pb.Response_SUCCESS, "Unregister service instance successfully."),

server/service/util/microservice_util.go

@@ -232,7 +232,6 @@ func GetAllServiceUtil(ctx context.Context, opts ...registry.PluginOpOption) ([]
 
 func RemandServiceQuota(ctx context.Context) {
 	quota.QuotaPlugins[quota.QuataType]().RemandQuotas(ctx, quota.MicroServiceQuotaType)
-	RemandInstanceQuota(ctx)
 }
 
 func RemandInstanceQuota(ctx context.Context) {