dapr
/
java-sdk
mirror of https://github.com/dapr/java-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve concurrent data structures in ActorRuntime (#479) 

* Switch ActorManager registry to CHM in ActorRuntime

Synchronized HashMap may lead to unnecessary contention during
ActorManager lookups.

* Change ActorRuntimeConfig to be thread-safe
This commit is contained in:
Andrey Pechkurov 2021-02-04 20:45:33 +03:00 committed by GitHub
parent 5147ad0202
commit b7eb723445
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sdk-actors/src/main/java/io/dapr/actors/runtime/ActorRuntime.java
View File

@ -18,9 +18,8 @@ import reactor.core.publisher.Mono;
import java.io.Closeable;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
/**
* Contains methods to register actor types. Registering the types allows the
@ -66,7 +65,7 @@ public class ActorRuntime implements Closeable {
/**
* Map of ActorType --> ActorManager.
*/
private final Map<String, ActorManager> actorManagers;
private final ConcurrentMap<String, ActorManager> actorManagers;
/**
* The default constructor. This should not be called directly.
@ -100,7 +99,7 @@ public class ActorRuntime implements Closeable {
}
this.config = new ActorRuntimeConfig();
this.actorManagers = Collections.synchronizedMap(new HashMap<>());
this.actorManagers = new ConcurrentHashMap<>();
this.daprClient = daprClient;
this.channel = channel;
}
@ -138,7 +137,7 @@ public class ActorRuntime implements Closeable {
* @throws IOException If cannot serialize config.
*/
public byte[] serializeConfig() throws IOException {
return this.INTERNAL_SERIALIZER.serialize(this.config);
return INTERNAL_SERIALIZER.serialize(this.config);
}
/**
@ -207,17 +206,18 @@ public class ActorRuntime implements Closeable {
ActorTypeInformation<T> actorTypeInfo = ActorTypeInformation.create(clazz);
ActorRuntimeContext<T> context = new ActorRuntimeContext<>(
this,
objectSerializer,
actorFactory,
actorTypeInfo,
this.daprClient,
new DaprStateAsyncProvider(this.daprClient, stateSerializer));
// Create ActorManagers, override existing entry if registered again.
this.actorManagers.put(actorTypeInfo.getName(), new ActorManager<T>(context));
this.config.addRegisteredActorType(actorTypeInfo.getName());
// Create ActorManager, if not yet registered.
this.actorManagers.computeIfAbsent(actorTypeInfo.getName(), (k) -> {
ActorRuntimeContext<T> context = new ActorRuntimeContext<>(
this,
objectSerializer,
actorFactory,
actorTypeInfo,
this.daprClient,
new DaprStateAsyncProvider(this.daprClient, stateSerializer));
this.config.addRegisteredActorType(actorTypeInfo.getName());
return new ActorManager<T>(context);
});
}
/**

13
sdk-actors/src/main/java/io/dapr/actors/runtime/ActorRuntimeConfig.java
View File

@ -6,24 +6,25 @@
package io.dapr.actors.runtime;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
/**
* Represents the configuration for the Actor Runtime.
*/
public class ActorRuntimeConfig {
private Collection<String> registeredActorTypes = new ArrayList<>();
private List<String> registeredActorTypes = new CopyOnWriteArrayList<>();
private Duration actorIdleTimeout;
private volatile Duration actorIdleTimeout;
private Duration actorScanInterval;
private volatile Duration actorScanInterval;
private Duration drainOngoingCallTimeout;
private volatile Duration drainOngoingCallTimeout;
private Boolean drainBalancedActors;
private volatile Boolean drainBalancedActors;
/**
* Instantiates a new config for the Actor Runtime.