[FAB-16315] Improved Load Ability

A fairly sizeable CR for improving the load handling
ability of the Java chaincode. This required a rework
of the threading model within the core shim layer.

Plus adding configuration and metrics to support this.
The configuration is a simple Java props file should
the need be to ever modify the default thread pool settings.

Metrics are basic stats on the thread pool are written to the
log

Change-Id: I31b05585a0aa650f7e2a7e2b0389799e90adc2c3
Signed-off-by: Matthew B. White <[email protected]>
(cherry picked from commit baaaef8)

Author: mbwhite

.gitignore

@@ -4,7 +4,7 @@
 *.swp
 .gradletasknamecache
 .classpath
-/bin/
+**/bin/
 /build/
 build/*
 

build.gradle

@@ -6,21 +6,7 @@
 
 apply plugin: 'idea'
 apply plugin: 'eclipse-wtp'
-apply plugin: 'com.dorongold.task-tree'
 version = '2.0.0-SNAPSHOT'
-
-buildscript {
-  repositories {
-    maven {
-      url "https://plugins.gradle.org/m2/"
-    }
-  }
-  dependencies {
-    classpath "gradle.plugin.com.dorongold.plugins:task-tree:1.4"
-  }
-}
-
-
 allprojects {
     repositories {
         mavenCentral()
@@ -44,11 +30,16 @@ subprojects {
     dependencies {
         compile 'commons-cli:commons-cli:1.4'
         compile 'commons-logging:commons-logging:1.2'
+        testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
+        testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
 
-        testCompile 'junit:junit:4.12'
         testCompile 'org.hamcrest:hamcrest-library:1.3'
         testCompile 'org.mockito:mockito-core:2.23.0'
         testCompile 'com.github.stefanbirkner:system-rules:1.17.0'
+
+        testCompileOnly 'junit:junit:4.12'
+        testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.3.1'
+        testCompile 'org.assertj:assertj-core:3.9.1'
     }
 
     if (!it.name.equals('fabric-chaincode-protos')) {
@@ -57,6 +48,10 @@ subprojects {
         }
     }
 
+    test {
+        useJUnitPlatform()
+    }
+
 }
 
 task printVersionName() {

fabric-chaincode-docker/.gitignore

@@ -0,0 +1 @@
+/bin/

fabric-chaincode-example-sacc/src/main/java/org/hyperledger/fabric/example/SimpleAsset.java

@@ -27,6 +27,7 @@ public Response init(ChaincodeStub stub) {
             if (args.size() != 2) {
                 ResponseUtils.newErrorResponse("Incorrect arguments. Expecting a key and a value");
             }
+
             // Set up any variables or assets here by calling stub.putState()
             // We store the key and the value on the ledger
             stub.putStringState(args.get(0), args.get(1));

fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/FabricState.java

@@ -0,0 +1,45 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+package org.hyperleder.fabric.shim.integration;
+
+import org.hyperleder.fabric.shim.integration.DockerCompose.DockerComposeBuilder;
+
+public class FabricState {
+
+    private static FabricState state;
+
+    public static FabricState getState(){
+        if (state==null){
+            state = new FabricState();
+        }
+
+        return state;
+    }
+
+    private boolean started = false;
+
+    public synchronized void start(){
+        if (!this.started) {
+
+            // create the docker-compose command
+            DockerComposeBuilder composebuilder = DockerCompose.newBuilder()
+                    .file("src/test/resources/first-network/docker-compose-cli.yaml");
+
+            // close down anything running...
+            composebuilder.duplicate().down().build().run();
+
+            // ...and bring up
+            DockerCompose compose = composebuilder.up().detach().build();
+            compose.run();
+
+            this.started = true;
+        } else {
+            System.out.println("Fabric already started....");
+        }
+    }
+
+
+}

fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/SACCIntegrationTest.java

@@ -32,16 +32,7 @@ public static void setUp() throws Exception {
         String s = currentRelativePath.toAbsolutePath().toString();
         System.out.println("Current relative path is: " + s);
 
-        // create the docker-compose command
-        DockerComposeBuilder composebuilder = DockerCompose.newBuilder()
-                .file("src/test/resources/first-network/docker-compose-cli.yaml");
-
-        // close down anything running...
-        composebuilder.duplicate().down().build().run();
-
-        // ...and bring up
-        DockerCompose compose = composebuilder.up().detach().build();
-        compose.run();
+        FabricState.getState().start();
 
         // the cli container contains a script that does the channel create, joing
         // and chaincode install/instantiate

fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/SBECCIntegrationTest.java

@@ -28,6 +28,8 @@ public class SBECCIntegrationTest {
     @BeforeClass
     public static void setUp() throws Exception {
 
+        FabricState.getState().start();
+
         // Call the inbuilt script to install/instantiate
         DockerBuilder dockerBuilder = new Docker.DockerBuilder();
         Docker docker = dockerBuilder.exec().container("cli").script("./scripts/script-sbe.sh").build();

fabric-chaincode-integration-test/src/test/resources/first-network/base/peer-base.yaml

@@ -23,6 +23,6 @@ services:
       - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key
       - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/tls/ca.crt
       - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:amd64-latest
-      - CORE_CHAINCODE_EXECUTETIMEOUT=300s
+      - CORE_CHAINCODE_EXECUTETIMEOUT=400s
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
     command: peer node start