ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-29 15:43:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/os/4.9' into vkolomeyko/cc4.9-cc4.10-merge

Browse Source 
# Conflicts:
#	.ci/dev/regression/Jenkinsfile
#	build.gradle
This commit is contained in:
Viktor Kolomeyko 2022-05-18 15:27:44 +01:00
commit 355411b195
10 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/dev/regression/Jenkinsfile vendored
View File

@ -396,7 +396,7 @@ pipeline {
}
unstable {
script {
sendSlackNotifications("warning", "BUILD UNSTABLE - Unstable Builds are likely a result of Nexus Sonar Scanner violations", false, "#corda-corda4-open-source-build-notifications")
sendSlackNotifications("warning", "BUILD UNSTABLE - Unstable Builds are likely a result of Nexus Sonar Scanner violations", false, "#corda-corda4-open-source-build-notifications")
}
}
failure {

6
build.gradle
View File

@ -373,6 +373,12 @@ allprojects {
repositories {
mavenLocal()
// Prevents cache giving use the wrong artemis
mavenCentral {
content {
includeGroup 'org.apache.activemq'
}
}
// Use system environment to activate caching with Artifactory,
// because it is actually easier to pass that during parallel build.
// NOTE: it has to be a name of a virtual repository with all

6
config/dev/log4j2.xml
View File

@ -202,7 +202,11 @@
<AppenderRef ref="Console-ErrorCode-Selector"/>
<AppenderRef ref="RollingFile-ErrorCode-Appender"/>
</Logger>
<Logger name="org.apache.activemq.artemis.core.server" level="error" additivity="false">
<Logger name="org.apache.activemq.artemis.core.server" level="info" additivity="false">
<Filters>
<RegexFilter regex=".*AMQ222165.*" onMatch="DENY" onMismatch="NEUTRAL"/>
<RegexFilter regex=".*AMQ222166.*" onMatch="DENY" onMismatch="NEUTRAL"/>
</Filters>
<AppenderRef ref="Console-ErrorCode-Selector"/>
<AppenderRef ref="RollingFile-ErrorCode-Appender"/>
</Logger>

2
constants.properties
View File

@ -27,7 +27,7 @@ typesafeConfigVersion=1.3.4
jsr305Version=3.0.2
artifactoryPluginVersion=4.16.1
snakeYamlVersion=1.19
caffeineVersion=2.7.0
caffeineVersion=2.9.3
metricsVersion=4.1.0
metricsNewRelicVersion=1.1.1
djvmVersion=1.1.1

2
docker/src/docker/Dockerfile
View File

@ -1,4 +1,4 @@
FROM azul/zulu-openjdk:8u312
FROM azul/zulu-openjdk:8u322
## Add packages, clean cache, create dirs, create corda user and change ownership
RUN apt-get update && \

2
docker/src/docker/Dockerfile-debug
View File

@ -1,4 +1,4 @@
FROM azul/zulu-openjdk:8u312
FROM azul/zulu-openjdk:8u322
## Add packages, clean cache, create dirs, create corda user and change ownership
RUN apt-get update && \

2
docker/src/docker/DockerfileAL
View File

@ -1,4 +1,4 @@
FROM amazoncorretto:8u312-al2
FROM amazoncorretto:8u322-al2
## Add packages, clean cache, create dirs, create corda user and change ownership
RUN yum -y install bash && \

1
node/build.gradle
View File

@ -206,7 +206,6 @@ dependencies {
// BFT-Smart dependencies
compile 'com.github.bft-smart:library:master-v1.1-beta-g6215ec8-87'
compile 'commons-codec:commons-codec:1.13'
// Java Atomix: RAFT library
compile 'io.atomix.copycat:copycat-client:1.2.3'

13
node/src/main/kotlin/net/corda/node/services/statemachine/StaffedFlowHospital.kt
View File

@ -104,17 +104,6 @@ class StaffedFlowHospital(private val flowMessaging: FlowMessaging,
* Flows should be removed from [flowsInHospital] when they have completed a successful transition.
*/
private val flowsInHospital = ConcurrentHashMap<StateMachineRunId, FlowFiber>()
/**
* Returns true if the flow is currently being treated in the hospital.
* The differs to flows with a medical history (which can accessed via [StaffedFlowHospital.contains]).
*/
@VisibleForTesting
internal fun flowInHospital(runId: StateMachineRunId): Boolean {
// The .keys avoids https://youtrack.jetbrains.com/issue/KT-18053
return runId in flowsInHospital.keys
}
private val mutex = ThreadBox(object {
/**
* Contains medical history of every flow (a patient) that has entered the hospital. A flow can leave the hospital,
@ -348,7 +337,7 @@ class StaffedFlowHospital(private val flowMessaging: FlowMessaging,
}
}
operator fun contains(flowId: StateMachineRunId) = mutex.locked { flowId in flowPatients }
operator fun contains(flowId: StateMachineRunId) = flowId in flowsInHospital.keys
override fun close() {
hospitalJobTimer.cancel()

6
testing/test-common/src/main/resources/log4j2-test.xml
View File

@ -90,7 +90,11 @@
<AppenderRef ref="Console-ErrorCode-Appender"/>
<AppenderRef ref="RollingFile-ErrorCode-Appender"/>
</Logger>
<Logger name="org.apache.activemq.artemis.core.server" level="error" additivity="false">
<Logger name="org.apache.activemq.artemis.core.server" level="info" additivity="false">
<Filters>
<RegexFilter regex=".*AMQ222165.*" onMatch="DENY" onMismatch="NEUTRAL"/>
<RegexFilter regex=".*AMQ222166.*" onMatch="DENY" onMismatch="NEUTRAL"/>
</Filters>
<AppenderRef ref="Console-ErrorCode-Appender"/>
<AppenderRef ref="RollingFile-ErrorCode-Appender"/>
</Logger>