Bump corfu version to 0.4.2.1 (#269)

* Bump corfu version to 0.4.2.1

* Upgrade JDK to 11 in actions

* Disable auto run of upgrade test as it was meant for LRv2 only

* use setup-java v4 in action

* miscellaneous

.github/workflows/cloud-upgrade-test.yml

@@ -1,6 +1,6 @@
 name: Corfu Cluster Test
 
-on: push
+on: workflow_dispatch
 
 jobs:
   upgrade-test:

.github/workflows/publish-universe-artifacts.yml

@@ -23,9 +23,12 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
-          java-version: 1.8
+          distribution: 'corretto'
+          java-version: '11'
+          check-latest: true
+          cache-dependency-path: '**/pom.xml'
 
       - name: Cache local Gradle repository
         uses: actions/cache@v2

.github/workflows/pull_request_benchmarks.yml

@@ -19,9 +19,12 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
-        java-version: 1.8
+        distribution: 'corretto'
+        java-version: '11'
+        check-latest: true
+        cache-dependency-path: '**/pom.xml'
 
     - name: Cache local Gradle repository
       uses: actions/cache@v2

.github/workflows/pull_request_universe.yml

@@ -20,9 +20,12 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
-        java-version: 1.8
+        distribution: 'corretto'
+        java-version: '11'
+        check-latest: true
+        cache-dependency-path: '**/pom.xml'
 
     - name: Cache local Gradle repository
       uses: actions/cache@v2

.github/workflows/run_benchmarks.yml

@@ -22,9 +22,12 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
-          java-version: 1.8
+          distribution: 'corretto'
+          java-version: '11'
+          check-latest: true
+          cache-dependency-path: '**/pom.xml'
 
       - name: Cache local Gradle repository
         uses: actions/cache@v2

benchmarks/build.gradle.kts

@@ -33,7 +33,7 @@ apply(from = "${gradleScriptsDir}/gradle/idea.gradle")
 version = "1.0.0"
 
 val corfuVersion = project.ext["corfuVersion"] as String
-val nettyVersion = project.ext["nettyVersion"] as String
+val nettyTcnativeVersion = project.ext["nettyTcnativeVersion"] as String
 val assertjVersion = project.ext["assertjVersion"] as String
 val lombokVersion = project.ext["lombokVersion"] as String
 val jmhSdkVersion = project.ext["jmhVersion"] as String
@@ -57,7 +57,7 @@ dependencies {
     implementation("org.corfudb:runtime:${corfuVersion}") {
         exclude(group = "io.netty", module = "netty-tcnative")
     }
-    implementation("io.netty:netty-tcnative:${nettyVersion}:${osdetector.os}-${osdetector.arch}")
+    implementation("io.netty:netty-tcnative:${nettyTcnativeVersion}:${osdetector.os}-${osdetector.arch}")
 
     jmh("org.openjdk.jmh:jmh-core:${jmhSdkVersion}")
     jmh("org.openjdk.jmh:jmh-generator-annprocess:${jmhSdkVersion}")

benchmarks/config/checkstyle/checkstyle.xml

@@ -45,6 +45,7 @@
         <property name="fileExtensions" value="java"/>
         <property name="max" value="120"/>
         <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        <property name="severity" value="ignore"/>
     </module>
 
     <module name="TreeWalker">
@@ -287,12 +288,14 @@
             <property name="allowMissingReturnTag" value="true"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="MissingJavadocMethod">
             <property name="scope" value="public"/>
             <property name="minLineCount" value="2"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>

benchmarks/src/jmh/java/org/corfudb/benchmarks/cluster/ClusterBenchmark.java

@@ -196,7 +196,7 @@ private String getAppVersion() {
             //https://docs.gradle.org/current/dsl/org.gradle.api.tasks.SourceSetOutput.html
 
             //return new UniverseAppUtil().getAppVersion();
-            return "0.4.0-SNAPSHOT";
+            return "0.4.2.1-SNAPSHOT";
         }
     }
 }

cloud/corfu/install_corfu_helm.sh

@@ -2,4 +2,4 @@
 
 set -e
 
-helm install corfu corfu --set tls.enabled=false --set tls.certificate.enabled=false --set global.replicas=3 --set image.repository=corfudb/corfu-server --set image.tag=0.4.0-SNAPSHOT
+helm install corfu corfu --set tls.enabled=false --set tls.certificate.enabled=false --set global.replicas=3 --set image.repository=corfudb/corfu-server --set image.tag=0.4.2.1-SNAPSHOT

cloud/infrastructure/config/checkstyle/checkstyle.xml

@@ -45,6 +45,7 @@
         <property name="fileExtensions" value="java"/>
         <property name="max" value="120"/>
         <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        <property name="severity" value="ignore"/>
     </module>
 
     <module name="TreeWalker">
@@ -287,12 +288,14 @@
             <property name="allowMissingReturnTag" value="true"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="MissingJavadocMethod">
             <property name="scope" value="public"/>
             <property name="minLineCount" value="2"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
@@ -301,6 +304,7 @@
         </module>
         <module name="SingleLineJavadoc">
             <property name="ignoreInlineTags" value="false"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="EmptyCatchBlock">
             <property name="exceptionVariableName" value="expected"/>

config/checkstyle/checkstyle.xml

@@ -45,6 +45,7 @@
         <property name="fileExtensions" value="java"/>
         <property name="max" value="120"/>
         <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        <property name="severity" value="ignore"/>
     </module>
 
     <module name="TreeWalker">
@@ -287,12 +288,14 @@
             <property name="allowMissingReturnTag" value="true"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="MissingJavadocMethod">
             <property name="scope" value="public"/>
             <property name="minLineCount" value="2"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
@@ -301,6 +304,7 @@
         </module>
         <module name="SingleLineJavadoc">
             <property name="ignoreInlineTags" value="false"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="EmptyCatchBlock">
             <property name="exceptionVariableName" value="expected"/>

gradle/dependencies.gradle

@@ -30,9 +30,9 @@ configurations.all {
 
 ext {
     logbackVersion = "1.2.3"
-    corfuVersion = "0.4.0-SNAPSHOT"
+    corfuVersion = "0.4.2.1-SNAPSHOT"
     protobufVersion = "3.11.1"
-    nettyVersion = "2.0.25.Final"
+    nettyTcnativeVersion = "2.0.60.Final"
     assertjVersion = "3.14.0"
     junitVersion = "5.5.2"
     lombokVersion = "1.18.18"

gradle/java.gradle

@@ -1,8 +1,8 @@
 group = 'org.corfudb'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 
     withJavadocJar()
     withSourcesJar()

tests/build.gradle.kts

@@ -33,7 +33,7 @@ apply(from="${gradleScriptsDir}/gradle/idea.gradle")
 version = "1.0.0"
 
 val corfuVersion = project.ext["corfuVersion"]
-val nettyVersion = project.ext["nettyVersion"]
+val nettyTcnativeVersion = project.ext["nettyTcnativeVersion"]
 val assertjVersion = project.ext["assertjVersion"]
 val lombokVersion = project.ext["lombokVersion"]
 
@@ -65,7 +65,7 @@ dependencies {
         exclude(group="io.netty", module="netty-tcnative")
     }
 
-    implementation("io.netty:netty-tcnative:${nettyVersion}:${osdetector.os}-${osdetector.arch}")
+    implementation("io.netty:netty-tcnative:${nettyTcnativeVersion}:${osdetector.os}-${osdetector.arch}")
 
     implementation("org.assertj:assertj-core:${assertjVersion}")
 

tests/config/checkstyle/checkstyle.xml

@@ -45,6 +45,7 @@
         <property name="fileExtensions" value="java"/>
         <property name="max" value="120"/>
         <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        <property name="severity" value="ignore"/>
     </module>
 
     <module name="TreeWalker">
@@ -287,12 +288,14 @@
             <property name="allowMissingReturnTag" value="true"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="MissingJavadocMethod">
             <property name="scope" value="public"/>
             <property name="minLineCount" value="2"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
@@ -301,6 +304,7 @@
         </module>
         <module name="SingleLineJavadoc">
             <property name="ignoreInlineTags" value="false"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="EmptyCatchBlock">
             <property name="exceptionVariableName" value="expected"/>

tests/docs/compatibility-tests/README.md

@@ -29,7 +29,7 @@ The diagram below describes the compatibility test action in CorfuDB, which is r
 The basic idea is instead of using cloud hosted Corfu client/server versions, we use the specific versions build locally.
 
 1. Prepare Corfu server docker image(s):
-    * In CorfuDB repo, switch to the version (git branch/commit) you want, change the version tag specified in pom file (0.4.0-SNAPSHOT for example), run prepare corfu docker image:
+    * In CorfuDB repo, switch to the version (git branch/commit) you want, change the version tag specified in pom file (0.0.0.0-SNAPSHOT for example), run prepare corfu docker image:
     ```shell script
     ./mvnw clean install -Pdocker -DskipTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip -T 1C
     ```

tests/src/main/resources/universe-tests.properties

@@ -1,5 +1,5 @@
 corfu.cluster.name=static_cluster
 corfu.server.jar=build
 corfu.server.initialPort=9000
-server.version=0.4.0-SNAPSHOT
+server.version=0.4.2.1-SNAPSHOT
 test.data.clean=true

universe/config/checkstyle/checkstyle.xml

@@ -45,6 +45,7 @@
         <property name="fileExtensions" value="java"/>
         <property name="max" value="120"/>
         <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        <property name="severity" value="ignore"/>
     </module>
 
     <module name="TreeWalker">
@@ -287,12 +288,14 @@
             <property name="allowMissingReturnTag" value="true"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="MissingJavadocMethod">
             <property name="scope" value="public"/>
             <property name="minLineCount" value="2"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
@@ -301,6 +304,7 @@
         </module>
         <module name="SingleLineJavadoc">
             <property name="ignoreInlineTags" value="false"/>
+            <property name="severity" value="ignore"/>
         </module>
         <module name="EmptyCatchBlock">
             <property name="exceptionVariableName" value="expected"/>

universe/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM corfudb/corfu-server:0.4.0-SNAPSHOT
+FROM corfudb/corfu-server:0.4.2.1-SNAPSHOT
 
 RUN apk update && apk add openssh openssl openrc
 

universe/universe-core/src/main/java/org/corfudb/universe/infrastructure/docker/universe/node/server/DockerNode.java

@@ -244,7 +244,8 @@ public void collectLogs() {
 
         log.debug("Collect logs for: {}", appParams().getName());
 
-        try (LogStream stream = dockerManager.logs()) {
+        try {
+            LogStream stream = dockerManager.logs();
             String logs = stream.readFully();
 
             if (StringUtils.isEmpty(logs)) {
@@ -256,6 +257,7 @@ public void collectLogs() {
                     logs.getBytes(StandardCharsets.UTF_8),
                     StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE, StandardOpenOption.SYNC
             );
+            stream.close();
         } catch (Exception e) {
             log.error("Can't collect logs from container: {}", appParams().getName(), e);
         }

universe/universe-core/src/main/java/org/corfudb/universe/universe/node/server/ServerUtil.java

@@ -3,6 +3,7 @@
 import org.corfudb.universe.api.universe.node.NodeException;
 
 import javax.net.ServerSocketFactory;
+import javax.net.ssl.SSLServerSocketFactory;
 import java.io.IOException;
 import java.net.ServerSocket;
 
@@ -18,8 +19,11 @@ private ServerUtil() {
      * @return random tcp port
      */
     public static int getRandomOpenPort() {
-        try (ServerSocket socket = ServerSocketFactory.getDefault().createServerSocket(0)) {
-            return socket.getLocalPort();
+        try {
+            ServerSocket socket = SSLServerSocketFactory.getDefault().createServerSocket(0);
+            int localPort = socket.getLocalPort();
+            socket.close();
+            return localPort;
         } catch (IOException e) {
             throw new NodeException("Can't get any open port", e);
         }