Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Set up jdk
uses: actions/setup-java@v3
with:
java-version: '17'
java-version: '17.0.2'
distribution: 'temurin'
- name: Set up Maven
uses: stCarolas/setup-maven@v4.5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-jdk17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Set up jdk
uses: actions/setup-java@v3
with:
java-version: '17'
java-version: '17.0.2'
distribution: 'temurin'
- name: Compilation and Installation
run: mvn -B -Dcheckstyle.skip -Dspotbugs.skip=true clean install -Pit
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-jdk21.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Set up jdk
uses: actions/setup-java@v3
with:
java-version: '21'
java-version: '21.0.7'
distribution: 'temurin'
- name: Compilation and Installation
run: mvn -B -Dcheckstyle.skip -Dspotbugs.skip=true clean install -Pit
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.servicecomb.registry.api.event.CreateMicroserviceEvent;
import org.apache.servicecomb.registry.api.event.CreateMicroserviceVersionEvent;
import org.apache.servicecomb.registry.api.event.DestroyMicroserviceEvent;
import org.apache.servicecomb.registry.api.event.RefreshRemoteSwaggerEvent;
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.registry.consumer.MicroserviceVersion;
import org.apache.servicecomb.registry.consumer.MicroserviceVersions;
Expand Down Expand Up @@ -133,4 +134,11 @@ public void onCreateMicroserviceVersion(CreateMicroserviceVersionEvent event) {
public void destroy() {
scbEngine.getEventBus().unregister(this);
}

@EnableExceptionPropagation
@SubscriberOrder(-800)
@Subscribe
public void onRefreshRemoteSwaggerEvent(RefreshRemoteSwaggerEvent event) {
scbEngine.getSwaggerLoader().removeRemoteSwagger(event);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* 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 org.apache.servicecomb.registry.api.event;

import java.util.List;

public class RefreshRemoteSwaggerEvent {
private final List<String> serviceIds;

private final String appId;

private final String serviceName;

public RefreshRemoteSwaggerEvent(List<String> serviceIds, String appId, String serviceName) {
this.serviceIds = serviceIds;
this.appId = appId;
this.serviceName = serviceName;
}

public List<String> getServiceIds() {
return serviceIds;
}

public String getAppId() {
return appId;
}

public String getServiceName() {
return serviceName;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.servicecomb.registry.api.event.CreateMicroserviceEvent;
import org.apache.servicecomb.registry.api.event.DestroyMicroserviceEvent;
import org.apache.servicecomb.registry.api.event.MicroserviceInstanceChangedEvent;
import org.apache.servicecomb.registry.api.event.RefreshRemoteSwaggerEvent;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstanceStatus;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstances;
Expand All @@ -41,8 +42,10 @@
import org.apache.servicecomb.registry.definition.MicroserviceNameParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.CollectionUtils;

import com.google.common.annotations.VisibleForTesting;
import com.netflix.config.DynamicPropertyFactory;

public class MicroserviceVersions {
private static final Logger LOGGER = LoggerFactory.getLogger(MicroserviceVersions.class);
Expand Down Expand Up @@ -183,13 +186,32 @@ public void pullInstances() {
return;
}

// send refresh remote swagger info
sendRefreshRemoteSwaggerEvent();

pulledInstances = microserviceInstances.getInstancesResponse().getInstances();
pulledInstances.sort(Comparator.comparing(MicroserviceInstance::getInstanceId));
String rev = microserviceInstances.getRevision();

safeSetInstances(pulledInstances, rev);
}

private void sendRefreshRemoteSwaggerEvent() {
boolean refreshEnabled = DynamicPropertyFactory.getInstance()
.getBooleanProperty("servicecomb.remote.swagger.refresh.enabled", false).get();
if (!refreshEnabled) {
return;
}
List<String> serviceIds = new ArrayList<>();
if (CollectionUtils.isEmpty(pulledInstances)) {
return;
}
for (MicroserviceInstance instance : pulledInstances) {
serviceIds.add(instance.getServiceId());
}
appManager.getEventBus().post(new RefreshRemoteSwaggerEvent(serviceIds, appId, shortName));
}

protected MicroserviceInstances findServiceInstances() {
return DiscoveryManager.INSTANCE.findServiceInstances(appId,
shortName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@
import org.apache.servicecomb.foundation.common.utils.ResourceUtil;
import org.apache.servicecomb.registry.DiscoveryManager;
import org.apache.servicecomb.registry.RegistrationManager;
import org.apache.servicecomb.registry.api.event.RefreshRemoteSwaggerEvent;
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.registry.definition.MicroserviceNameParser;
import org.apache.servicecomb.swagger.SwaggerUtils;
import org.apache.servicecomb.swagger.generator.SwaggerGenerator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.CollectionUtils;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Charsets;
Expand Down Expand Up @@ -197,7 +199,6 @@ private Swagger loadFromRemote(Microservice microservice, Collection<Microservic
}
return null;
});

if (result != null) {
return result;
}
Expand All @@ -212,4 +213,24 @@ private Swagger loadFromRemote(Microservice microservice, Collection<Microservic

return null;
}

public void removeRemoteSwagger(RefreshRemoteSwaggerEvent event) {
List<String> serviceIds = event.getServiceIds();
if (CollectionUtils.isEmpty(serviceIds)) {
return;
}
List<String> matchKey = remoteSwagger.keySet().stream().filter(key -> {
for (String serviceId : serviceIds) {
if (key.startsWith(serviceId)) {
return true;
}
}
return false;
}).toList();
for (String key : matchKey) {
remoteSwagger.remove(key);
LOGGER.info("remove local appid=[{}], serviceName=[{}], swagger [{}]", event.getAppId(),
event.getServiceName(), key);
}
}
}
Loading