SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-878 Fix concurrency issue during registration and lookup of functions

Browse Source 
Resolves #878
This commit is contained in:
Oleg Zhurakousky
2022-05-30 12:10:58 +02:00
parent 7edd022f86
commit 0576b6c6ce
4 changed files with 89 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistry.java
View File

@@ -112,50 +112,52 @@ public class BeanFactoryAwareFunctionRegistry extends SimpleFunctionRegistry imp
return null; return null;
} }
FunctionInvocationWrapper function = this.doLookup(type, functionDefinition, expectedOutputMimeTypes); FunctionInvocationWrapper function = this.doLookup(type, functionDefinition, expectedOutputMimeTypes);
Object syncInstance = functionDefinition == null ? this : functionDefinition;
if (function == null) { synchronized (syncInstance) {
Set<String> functionRegistratioinNames = super.getNames(null); if (function == null) {
String[] functionNames = StringUtils.delimitedListToStringArray(functionDefinition.replaceAll(",", "|").trim(), "|"); Set<String> functionRegistratioinNames = super.getNames(null);
for (String functionName : functionNames) { String[] functionNames = StringUtils.delimitedListToStringArray(functionDefinition.replaceAll(",", "|").trim(), "|");
if (functionRegistratioinNames.contains(functionName) && logger.isDebugEnabled()) { for (String functionName : functionNames) {
logger.debug("Skipping function '" + functionName + "' since it is already present"); if (functionRegistratioinNames.contains(functionName) && logger.isDebugEnabled()) {
} logger.debug("Skipping function '" + functionName + "' since it is already present");
else {
Object functionCandidate = this.discoverFunctionInBeanFactory(functionName);
if (functionCandidate != null) {
Type functionType = null;
FunctionRegistration functionRegistration = null;
if (functionCandidate instanceof FunctionRegistration) {
functionRegistration = (FunctionRegistration) functionCandidate;
}
else if (this.isFunctionPojo(functionCandidate, functionName)) {
Method functionalMethod = FunctionTypeUtils.discoverFunctionalMethod(functionCandidate.getClass());
functionCandidate = this.proxyTarget(functionCandidate, functionalMethod);
functionType = FunctionTypeUtils.fromFunctionMethod(functionalMethod);
}
else if (this.isSpecialFunctionRegistration(functionNames, functionName)) {
functionRegistration = this.applicationContext
.getBean(functionName + FunctionRegistration.REGISTRATION_NAME_SUFFIX, FunctionRegistration.class);
}
else {
functionType = FunctionTypeUtils.discoverFunctionType(functionCandidate, functionName, this.applicationContext);
}
if (functionRegistration == null) {
functionRegistration = new FunctionRegistration(functionCandidate, functionName).type(functionType);
}
// Certain Kafka Streams functions such as KStream[] return types could be null (esp when using Kotlin).
if (functionRegistration != null) {
this.register(functionRegistration);
}
} }
else { else {
if (logger.isDebugEnabled()) { Object functionCandidate = this.discoverFunctionInBeanFactory(functionName);
logger.debug("Function '" + functionName + "' is not available in FunctionCatalog or BeanFactory"); if (functionCandidate != null) {
Type functionType = null;
FunctionRegistration functionRegistration = null;
if (functionCandidate instanceof FunctionRegistration) {
functionRegistration = (FunctionRegistration) functionCandidate;
}
else if (this.isFunctionPojo(functionCandidate, functionName)) {
Method functionalMethod = FunctionTypeUtils.discoverFunctionalMethod(functionCandidate.getClass());
functionCandidate = this.proxyTarget(functionCandidate, functionalMethod);
functionType = FunctionTypeUtils.fromFunctionMethod(functionalMethod);
}
else if (this.isSpecialFunctionRegistration(functionNames, functionName)) {
functionRegistration = this.applicationContext
.getBean(functionName + FunctionRegistration.REGISTRATION_NAME_SUFFIX, FunctionRegistration.class);
}
else {
functionType = FunctionTypeUtils.discoverFunctionType(functionCandidate, functionName, this.applicationContext);
}
if (functionRegistration == null) {
functionRegistration = new FunctionRegistration(functionCandidate, functionName).type(functionType);
}
// Certain Kafka Streams functions such as KStream[] return types could be null (esp when using Kotlin).
if (functionRegistration != null) {
this.register(functionRegistration);
}
}
else {
if (logger.isDebugEnabled()) {
logger.debug("Function '" + functionName + "' is not available in FunctionCatalog or BeanFactory");
}
} }
} }
} }
function = super.doLookup(type, functionDefinition, expectedOutputMimeTypes);
} }
function = super.doLookup(type, functionDefinition, expectedOutputMimeTypes);
} }
return (T) function; return (T) function;

2
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
View File

@@ -286,7 +286,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
/* /*
* *
*/ */
private synchronized FunctionInvocationWrapper compose(Class<?> type, String functionDefinition) { private FunctionInvocationWrapper compose(Class<?> type, String functionDefinition) {
String[] functionNames = StringUtils.delimitedListToStringArray(functionDefinition.replaceAll(",", "|").trim(), "|"); String[] functionNames = StringUtils.delimitedListToStringArray(functionDefinition.replaceAll(",", "|").trim(), "|");
FunctionInvocationWrapper composedFunction = null; FunctionInvocationWrapper composedFunction = null;

22
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
View File

@@ -22,6 +22,7 @@ import java.lang.reflect.Field;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
@@ -103,6 +104,27 @@ public class BeanFactoryAwareFunctionRegistryTests {
System.clearProperty("spring.cloud.function.definition"); System.clearProperty("spring.cloud.function.definition");
} }
@SuppressWarnings({ "rawtypes" })
@Test
public void concurrencyLookupTest() throws Exception {
FunctionCatalog catalog = this.configureCatalog();
ExecutorService executor = Executors.newCachedThreadPool();
for (int i = 0; i < 100; i++) {
executor.execute(() -> {
catalog.lookup("uppercase", "application/json");
});
executor.execute(() -> {
catalog.lookup("numberword", "application/json");
});
}
Thread.sleep(1000);
Field frField = ReflectionUtils.findField(catalog.getClass(), "functionRegistrations");
frField.setAccessible(true);
Collection c = (Collection) frField.get(catalog);
assertThat(c.size()).isEqualTo(2);
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Test @Test
public void testDefaultLookup() throws Exception { public void testDefaultLookup() throws Exception {

26
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistryTests.java
View File

@@ -16,13 +16,17 @@
package org.springframework.cloud.function.context.catalog; package org.springframework.cloud.function.context.catalog;
import java.lang.reflect.Field;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function; import java.util.function.Function;
@@ -68,6 +72,7 @@ import org.springframework.messaging.converter.MessageConverter;
import org.springframework.messaging.converter.StringMessageConverter; import org.springframework.messaging.converter.StringMessageConverter;
import org.springframework.messaging.support.MessageBuilder; import org.springframework.messaging.support.MessageBuilder;
import org.springframework.util.MimeType; import org.springframework.util.MimeType;
import org.springframework.util.ReflectionUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@@ -93,6 +98,27 @@ public class SimpleFunctionRegistryTests {
this.conversionService = new DefaultConversionService(); this.conversionService = new DefaultConversionService();
} }
@SuppressWarnings("rawtypes")
@Test
public void concurrencyRegistrationTest() throws Exception {
Echo function = new Echo();
FunctionRegistration<Echo> registration = new FunctionRegistration<>(
function, "echo").type(FunctionType.of(Echo.class));
SimpleFunctionRegistry catalog = new SimpleFunctionRegistry(this.conversionService, this.messageConverter,
new JacksonMapper(new ObjectMapper()));
ExecutorService executor = Executors.newCachedThreadPool();
for (int i = 0; i < 1000; i++) {
executor.execute(() -> {
catalog.register(registration);
});
}
Thread.sleep(1000);
Field frField = ReflectionUtils.findField(catalog.getClass(), "functionRegistrations");
frField.setAccessible(true);
Collection c = (Collection) frField.get(catalog);
assertThat(c.size()).isEqualTo(1);
}
@Test @Test
public void testCachingOfFunction() { public void testCachingOfFunction() {
Echo function = new Echo(); Echo function = new Echo();