ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-17 22:58:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-5492: Don't do reconnect logic on illegal argument for attachments (#6693)

Browse Source 
* ENT-5492: Don't do reconnect logic on illegal argument for attachments

* Use a dedicated exception for missing attachments.
This commit is contained in:
Ryan Fowler
2020-09-09 12:20:16 +01:00
committed by GitHub
parent fd341c7e48
commit 6f2cac146c
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/rpc/src/main/kotlin/net/corda/client/rpc/internal/ReconnectingCordaRPCOps.kt
View File

@ -38,6 +38,7 @@ import net.corda.core.utilities.NetworkHostAndPort
import net.corda.core.utilities.contextLogger
import net.corda.core.utilities.debug
import net.corda.core.utilities.seconds
import net.corda.nodeapi.exceptions.MissingAttachmentException
import net.corda.nodeapi.exceptions.RejectedCommandException
import org.apache.activemq.artemis.api.core.ActiveMQConnectionTimedOutException
import org.apache.activemq.artemis.api.core.ActiveMQSecurityException
@ -320,7 +321,7 @@ class ReconnectingCordaRPCOps private constructor(
checkIfClosed()
var remainingAttempts = maxNumberOfAttempts
var lastException: Throwable? = null
while (remainingAttempts != 0 && !reconnectingRPCConnection.isClosed()) {
loop@ while (remainingAttempts != 0 && !reconnectingRPCConnection.isClosed()) {
try {
log.debug { "Invoking RPC $method..." }
return method.invoke(reconnectingRPCConnection.proxy, *(args ?: emptyArray())).also {
@ -353,6 +354,10 @@ class ReconnectingCordaRPCOps private constructor(
is PermissionException -> {
throw RPCException("User does not have permission to perform operation ${method.name}.", e)
}
is MissingAttachmentException -> {
log.warn("Failed to perform operation ${method.name}.", e)
break@loop
}
else -> {
log.warn("Failed to perform operation ${method.name}.", e)
throw e.targetException

6
node-api/src/main/kotlin/net/corda/nodeapi/exceptions/RpcExceptions.kt
View File

@ -35,6 +35,12 @@ class RejectedCommandException(message: String) :
CordaRuntimeException(message),
@Suppress("DEPRECATION") net.corda.core.ClientRelevantError
/**
* Thrown to indicate that the command was rejected by the node, typically due to a special temporary mode.
*/
class MissingAttachmentException(message: String) :
CordaRuntimeException(message)
/**
* Allows an implementing [Throwable] to be propagated to RPC clients.
*/

4
node/src/main/kotlin/net/corda/node/internal/CordaRPCOpsImpl.kt
View File

@ -1,6 +1,5 @@
package net.corda.node.internal
import net.corda.client.rpc.RPCException
import net.corda.client.rpc.notUsed
import net.corda.common.logging.CordaVersion
import net.corda.core.CordaRuntimeException
@ -57,6 +56,7 @@ import net.corda.node.services.api.ServiceHubInternal
import net.corda.node.services.rpc.CheckpointDumperImpl
import net.corda.node.services.rpc.context
import net.corda.node.services.statemachine.StateMachineManager
import net.corda.nodeapi.exceptions.MissingAttachmentException
import net.corda.nodeapi.exceptions.NonRpcFlowException
import net.corda.nodeapi.exceptions.RejectedCommandException
import rx.Observable
@ -288,7 +288,7 @@ internal class CordaRPCOpsImpl(
override fun openAttachment(id: SecureHash): InputStream {
return services.attachments.openAttachment(id)?.open() ?:
throw RPCException("Unable to open attachment with id: $id")
throw MissingAttachmentException("Unable to open attachment with id: $id")
}
override fun uploadAttachment(jar: InputStream): SecureHash {

4
node/src/test/kotlin/net/corda/node/CordaRPCOpsImplTest.kt
View File

@ -2,7 +2,6 @@ package net.corda.node
import co.paralleluniverse.fibers.Suspendable
import net.corda.client.rpc.PermissionException
import net.corda.client.rpc.RPCException
import net.corda.core.context.AuthServiceId
import net.corda.core.context.InvocationContext
import net.corda.core.contracts.Amount
@ -41,6 +40,7 @@ import net.corda.node.services.Permissions.Companion.invokeRpc
import net.corda.node.services.Permissions.Companion.startFlow
import net.corda.node.services.rpc.CURRENT_RPC_CONTEXT
import net.corda.node.services.rpc.RpcAuthContext
import net.corda.nodeapi.exceptions.MissingAttachmentException
import net.corda.nodeapi.exceptions.NonRpcFlowException
import net.corda.nodeapi.internal.config.User
import net.corda.testing.core.ALICE_NAME
@ -361,7 +361,7 @@ class CordaRPCOpsImplTest {
withPermissions(invokeRpc(CordaRPCOps::openAttachment)) {
assertThatThrownBy {
rpc.openAttachment(SecureHash.zeroHash)
}.isInstanceOf(RPCException::class.java)
}.isInstanceOf(MissingAttachmentException::class.java)
.withFailMessage("Unable to open attachment with id: ${SecureHash.zeroHash}")
}
}