ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-03 09:12:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

rpc: Fix deadlock caused by deliver() and close()

Browse Source
This commit is contained in:
Andras Slemmer 2017-03-08 17:03:25 +00:00
parent a394adbb44
commit 60520412c8
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
node/src/main/kotlin/net/corda/node/services/messaging/CordaRPCClientImpl.kt
View File

@ -284,6 +284,10 @@ class CordaRPCClientImpl(private val session: ClientSession,
private val rootShared = root.doOnUnsubscribe { close() }.share() private val rootShared = root.doOnUnsubscribe { close() }.share()
// This could be made more efficient by using a specialised IntMap // This could be made more efficient by using a specialised IntMap
/**
* When handling this map we synchronise on it explicitly instead of on [this], otherwise there is a race
* condition between close() and deliver()
*/
private val observables = HashMap<Int, Observable<Any>>() private val observables = HashMap<Int, Observable<Any>>()
private var consumer: ClientConsumer? = null private var consumer: ClientConsumer? = null
@ -320,8 +324,8 @@ class CordaRPCClientImpl(private val session: ClientSession,
} }
} }
@Synchronized
fun getForHandle(handle: Int): Observable<Any> { fun getForHandle(handle: Int): Observable<Any> {
synchronized(observables) {
return observables.getOrPut(handle) { return observables.getOrPut(handle) {
/** /**
* Note that the order of bufferUntilSubscribed() -> dematerialize() is very important here. * Note that the order of bufferUntilSubscribed() -> dematerialize() is very important here.
@ -340,13 +344,14 @@ class CordaRPCClientImpl(private val session: ClientSession,
rootShared.filter { it.forHandle == handle }.map { it.what }.bufferUntilSubscribed().dematerialize<Any>().doOnSubscribe { refCountUp() }.doOnUnsubscribe { refCountDown() }.share() rootShared.filter { it.forHandle == handle }.map { it.what }.bufferUntilSubscribed().dematerialize<Any>().doOnSubscribe { refCountUp() }.doOnUnsubscribe { refCountDown() }.share()
} }
} }
}
private fun deliver(msg: ClientMessage) { private fun deliver(msg: ClientMessage) {
msg.acknowledge() msg.acknowledge()
val kryo = createRPCKryo(observableSerializer = observableDeserializer) val kryo = createRPCKryo(observableSerializer = observableDeserializer)
val received: MarshalledObservation = msg.deserialize(kryo) val received: MarshalledObservation = msg.deserialize(kryo)
rpcLog.debug { "<- Observable [$rpcName] <- Received $received" } rpcLog.debug { "<- Observable [$rpcName] <- Received $received" }
synchronized(this) { synchronized(observables) {
// Force creation of the buffer if it doesn't already exist. // Force creation of the buffer if it doesn't already exist.
getForHandle(received.forHandle) getForHandle(received.forHandle)
root.onNext(received) root.onNext(received)