This is an automated email from the ASF dual-hosted git repository.
Aias00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 7c6736d63c Fixes #6775: Guard ExtensionLoader joins during concurrent
initialization (#7140)
7c6736d63c is described below
commit 7c6736d63ccb1da1a18334752afa8245f462a328
Author: BobSong <[email protected]>
AuthorDate: Sun Sep 27 13:28:41 2026 +0800
Fixes #6775: Guard ExtensionLoader joins during concurrent initialization
(#7140)
* fix(spi): guard getJoins against incomplete initialization (#6775)
* fix(ci): make PR checks deterministic
---------
Co-authored-by: BobSong-dev <[email protected]>
Co-authored-by: moremind <[email protected]>
Co-authored-by: aias00 <[email protected]>
---
.github/scripts/resolve-ci-modules.sh | 10 ++++
.../k8s/shenyu-zookeeper.yml | 2 +-
.../script/build_k8s_cluster.sh | 2 +
.../org/apache/shenyu/spi/ExtensionLoader.java | 24 +++++++++-
.../org/apache/shenyu/spi/ExtensionLoaderTest.java | 54 ++++++++++++++++++++++
5 files changed, 90 insertions(+), 2 deletions(-)
diff --git a/.github/scripts/resolve-ci-modules.sh
b/.github/scripts/resolve-ci-modules.sh
index 9b41d5ff4e..ec886dd75f 100644
--- a/.github/scripts/resolve-ci-modules.sh
+++ b/.github/scripts/resolve-ci-modules.sh
@@ -119,6 +119,16 @@ while IFS= read -r file; do
fi
done < <(printf '%s' "${changed_files_json}" | jq -r '.[]')
+# SPI changes can affect modules that consume shared classes without declaring
a
+# direct Maven dependency on every transitive module. Build the full reactor so
+# those modules cannot silently use a stale SNAPSHOT from the Maven cache.
+for module in "${modules[@]}"; do
+ if [[ "${module}" == "shenyu-spi" ]]; then
+ full_build_required=true
+ break
+ fi
+done
+
if [[ "${has_code_changes}" == "true" && ("${#modules[@]}" -eq 0 ||
"${#modules[@]}" -gt "${max_modules}") ]]; then
full_build_required=true
fi
diff --git
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/k8s/shenyu-zookeeper.yml
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/k8s/shenyu-zookeeper.yml
index 900ace6dc1..5a8c7ba063 100644
---
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/k8s/shenyu-zookeeper.yml
+++
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/k8s/shenyu-zookeeper.yml
@@ -68,7 +68,7 @@ metadata:
app: shenyu-zk
all: shenyu-examples-dubbo
spec:
- type: NodePort
+ type: ClusterIP
selector:
app: shenyu-zk
all: shenyu-examples-dubbo
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-apache-dubbo/script/build_k8s_cluster.sh
b/shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-apache-dubbo/script/build_k8s_cluster.sh
index 6202b037ae..1ff67d7728 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-apache-dubbo/script/build_k8s_cluster.sh
+++
b/shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-apache-dubbo/script/build_k8s_cluster.sh
@@ -16,6 +16,8 @@
# limitations under the License.
#
+set -euo pipefail
+
kind load docker-image "shenyu-examples-apache-dubbo-service:latest"
kind load docker-image
"apache/shenyu-integrated-test-k8s-ingress-apache-dubbo:latest"
kubectl apply -f
./shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/k8s/shenyu-zookeeper.yml
diff --git
a/shenyu-spi/src/main/java/org/apache/shenyu/spi/ExtensionLoader.java
b/shenyu-spi/src/main/java/org/apache/shenyu/spi/ExtensionLoader.java
index 706187fb1d..92a367f1f9 100644
--- a/shenyu-spi/src/main/java/org/apache/shenyu/spi/ExtensionLoader.java
+++ b/shenyu-spi/src/main/java/org/apache/shenyu/spi/ExtensionLoader.java
@@ -176,7 +176,8 @@ public final class ExtensionLoader<T> {
if (extensionClassesEntity.isEmpty()) {
return Collections.emptyList();
}
- if (Objects.equals(extensionClassesEntity.size(),
cachedInstances.size())) {
+ if (Objects.equals(extensionClassesEntity.size(),
cachedInstances.size())
+ &&
cachedInstances.values().stream().allMatch(Holder::isInitialized)) {
return (List<T>) this.cachedInstances.values().stream()
.sorted(HOLDER_COMPARATOR)
.map(e -> {
@@ -222,6 +223,7 @@ public final class ExtensionLoader<T> {
}
holder.setOrder(classEntity.getOrder());
holder.setValue(o);
+ holder.setInitialized(true);
}
/**
@@ -329,6 +331,8 @@ public final class ExtensionLoader<T> {
private static final class Holder<T> {
private volatile T value;
+
+ private volatile boolean initialized;
private Integer order;
@@ -349,6 +353,24 @@ public final class ExtensionLoader<T> {
public void setValue(final T value) {
this.value = value;
}
+
+ /**
+ * Checks whether the holder is initialized.
+ *
+ * @return true if initialized
+ */
+ public boolean isInitialized() {
+ return initialized;
+ }
+
+ /**
+ * Sets initialized.
+ *
+ * @param initialized initialized
+ */
+ public void setInitialized(final boolean initialized) {
+ this.initialized = initialized;
+ }
/**
* set order.
diff --git
a/shenyu-spi/src/test/java/org/apache/shenyu/spi/ExtensionLoaderTest.java
b/shenyu-spi/src/test/java/org/apache/shenyu/spi/ExtensionLoaderTest.java
index 3bca33daba..84a957ccf5 100644
--- a/shenyu-spi/src/test/java/org/apache/shenyu/spi/ExtensionLoaderTest.java
+++ b/shenyu-spi/src/test/java/org/apache/shenyu/spi/ExtensionLoaderTest.java
@@ -32,6 +32,8 @@ import org.apache.shenyu.spi.fixture.SubHasDefaultSPI;
import org.apache.shenyu.spi.fixture.TreeListSPI;
import org.junit.jupiter.api.Test;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
@@ -42,12 +44,17 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.fail;
@@ -324,6 +331,53 @@ public final class ExtensionLoaderTest {
assertEquals(threadNum * loop, cache.size());
}
+ /**
+ * Test concurrent get joins when a holder has not finished initialization.
+ *
+ * @throws Exception when reflection or concurrent execution fails
+ */
+ @Test
+ public void testMultiThreadGetJoinsWithUninitializedHolder() throws
Exception {
+ ExtensionLoader<HasDefaultSPI> extensionLoader =
newExtensionLoader(HasDefaultSPI.class);
+ Map<String, Object> cachedInstances =
getCachedInstances(extensionLoader);
+ cachedInstances.put("subHasDefaultSPI",
getHolderConstructor().newInstance());
+ ExecutorService executor = Executors.newFixedThreadPool(4);
+ try {
+ List<Future<List<HasDefaultSPI>>> futures = new ArrayList<>();
+ for (int i = 0; i < 4; i++) {
+ futures.add(executor.submit(extensionLoader::getJoins));
+ }
+ for (Future<List<HasDefaultSPI>> future : futures) {
+ List<HasDefaultSPI> joins = future.get(5, TimeUnit.SECONDS);
+ assertEquals(1, joins.size());
+ assertNotNull(joins.get(0));
+ }
+ } finally {
+ executor.shutdownNow();
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private <S> ExtensionLoader<S> newExtensionLoader(final Class<S>
extensionClass) throws Exception {
+ Constructor<ExtensionLoader> constructor =
ExtensionLoader.class.getDeclaredConstructor(Class.class, ClassLoader.class);
+ constructor.setAccessible(true);
+ return (ExtensionLoader<S>) constructor.newInstance(extensionClass,
ExtensionLoader.class.getClassLoader());
+ }
+
+ @SuppressWarnings("unchecked")
+ private Map<String, Object> getCachedInstances(final ExtensionLoader<?>
extensionLoader) throws Exception {
+ Field field =
ExtensionLoader.class.getDeclaredField("cachedInstances");
+ field.setAccessible(true);
+ return (Map<String, Object>) field.get(extensionLoader);
+ }
+
+ private Constructor<?> getHolderConstructor() throws Exception {
+ Class<?> holderClass =
Class.forName("org.apache.shenyu.spi.ExtensionLoader$Holder");
+ Constructor<?> constructor = holderClass.getDeclaredConstructor();
+ constructor.setAccessible(true);
+ return constructor;
+ }
+
/**
* get private loadClass method.
*/
