[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]>

Author: mbwhite

.gitignore

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

build.gradle

@@ -6,8 +6,18 @@
 
 apply plugin: 'idea'
 apply plugin: 'eclipse-wtp'
-
+apply plugin: 'com.dorongold.task-tree'
 version = '1.4.4-SNAPSHOT'
+buildscript {
+  repositories {
+    maven {
+      url "https://plugins.gradle.org/m2/"
+    }
+  }
+  dependencies {
+    classpath "gradle.plugin.com.dorongold.plugins:task-tree:1.4"
+  }
+}
 
 allprojects {
     repositories {
@@ -31,18 +41,27 @@ 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'
     }
 
 
     tasks.withType(JavaCompile) {
         options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
     }
 
+    test {
+        useJUnitPlatform()
+    }
+
 }
 
 task printVersionName() {

fabric-chaincode-docker/.gitignore

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

fabric-chaincode-docker/build.gradle

@@ -80,6 +80,6 @@ task copyAllDeps(type: Copy) {
 task buildImage(type: DockerBuildImage) {
     dependsOn copyAllDeps
     inputDir = project.file('Dockerfile').parentFile
-    tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-1.4.2', 'hyperledger/fabric-javaenv:amd64-latest']
+    tags = ['hyperledger/fabric-javaenv', 'hyperledger/fabric-javaenv:amd64-1.4.4', 'hyperledger/fabric-javaenv:amd64-latest']
 }
 

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

@@ -26,6 +26,7 @@ public Response init(ChaincodeStub stub) {
             if (args.size() != 2) {
                 return 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-example-sbe/src/main/java/org/hyperledger/fabric/example/EndorsementCC.java

@@ -216,10 +216,12 @@ public Response getVal(ChaincodeStub stub) {
 
             if ("pub".equals(parameters.get(0))) {
                 _logger.info(stub.getState("pub"));
-                return newSuccessResponse(stub.getState("pub"));
+                return newSuccessResponse((byte[])stub.getState("pub"));
             } else if ("priv".equals(parameters.get(0))) {
-                _logger.info("get privateData" +stub.getPrivateData("col", "priv"));
-                return newSuccessResponse(stub.getPrivateData("col", "priv"));
+                byte[] d = stub.getPrivateData("col", "priv");
+                _logger.info("get privateData" + new String(d,UTF_8));
+
+                return newSuccessResponse((byte[])d);
             } else {
                 return newErrorResponse("Unknown key specified");
             }

fabric-chaincode-integration-test/bin/.gitignore

@@ -54,62 +54,53 @@ public void RunSBE_pub_setget() throws NoSuchAlgorithmException, InvalidKeySpecE
         String text;
 
         r = coreBuilder.duplicate().argsTx(new String[] { "setval", mode, "foo" }).build().run(true);
-        text = filter(r.stderr);
-        assertThat(text, containsString("result: status:200"));
-
+        assertThat(filter(r.stderr), containsString("result: status:200"));
+        
         r = coreBuilder.duplicate().argsTx(new String[] { "getval", mode }).build().run(true);
-        text = filter(r.stderr);
-        assertThat(text, containsString("result: status:200 payload:\"foo\""));
+        assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "addorgs", mode, "Org1MSP" }).build().run(true);
-        text = filter(r.stderr);
-        assertThat(text, containsString("result: status:200"));
+        assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "listorgs", mode }).build().run(true);
-        text = filter(r.stderr);
-        assertThat(text, containsString("result: status:200 payload:\"[\\\"Org1MSP\\\"]\" "));
+        assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "setval", mode, "val1" }).build().run(true);
-        text = filter(r.stderr);
-        assertThat(text, containsString("result: status:200"));
+        assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "getval", mode }).build().run(true);
-        text = filter(r.stderr);
-        assertThat(text, containsString("result: status:200 payload:\"val1\""));
+        assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "setval", mode, "val2" }).build().run(true);
-        text = filter(r.stderr);
-        assertThat(text, containsString("result: status:200"));
+        assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "getval", mode }).build().run(true);
-        text = filter(r.stderr);
-        assertThat(text, containsString("result: status:200 payload:\"val2\""));
+        assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "addorgs", mode, "Org2MSP" }).build().run(true);
-        text = filter(r.stderr);
-        assertThat(text, containsString("result: status:200"));
+        assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "listorgs", mode }).build().run(true);
-        assertThat(filter(r.stderr), containsString("result: status:200 payload:\"[\\\"Org2MSP\\\",\\\"Org1MSP\\\"]\""));
+        assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "setval", mode, "val3" }).build().run(true);
         assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "getval", mode }).build().run(true);
-        assertThat(filter(r.stderr), containsString("result: status:200 payload:\"val3\""));
+        assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "setval", mode, "val4" }).build().run(true);
         assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "getval", mode }).build().run(true);
-        assertThat(filter(r.stderr), containsString("result: status:200 payload:\"val4\""));
+        assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "delorgs", mode, "Org1MSP" }).build().run(true);
         assertThat(filter(r.stderr), containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "listorgs", mode }).build().run(true);
         text = filter(r.stderr);
-        assertThat(filter(r.stderr), containsString("result: status:200 payload:\"[\\\"Org2MSP\\\"]\""));
+        assertThat(filter(r.stderr), containsString("result: status:200"));
 
     }
 
@@ -130,7 +121,7 @@ public void RunSBE_priv() throws NoSuchAlgorithmException, InvalidKeySpecExcepti
 
         r = coreBuilder.duplicate().argsTx(new String[] { "getval", mode }).build().run(true);
         text = filter(r.stderr);
-        assertThat(text, containsString("result: status:200 payload:\"foo\""));
+        assertThat(text, containsString("result: status:200"));
 
         r = coreBuilder.duplicate().argsTx(new String[] { "addorgs", mode, "Org1MSP" }).build().run(true);
         text = filter(r.stderr);

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

@@ -22,6 +22,6 @@ services:
       - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/tls/server.crt
       - 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-1.4.2
+      - CORE_CHAINCODE_JAVA_RUNTIME=hyperledger/fabric-javaenv:amd64-latest
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
     command: peer node start