set NB4 to Java 15

.github/workflows/release.yml

@@ -10,205 +10,235 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
 
-    - name: checkout repo
-      uses: actions/checkout@v2
+      - name: checkout repo
+        uses: actions/checkout@v2
 
-    - name: setup java
-      uses: actions/setup-java@v1
-      with:
-        java-version: '15'
-        java-package: jdk
-        architecture: x64
+      - name: setup java
+        uses: actions/setup-java@v1
+        with:
+          java-version: '15'
+          java-package: jdk
+          architecture: x64
 
-    - name: avoid release loop
-      run: scripts/avoid-release-loop.sh
-      env:
-       GIT_RELEASE_BOT_NAME: "nb-droid"
+      - name: avoid release loop
+        run: scripts/avoid-release-loop.sh
+        env:
+          GIT_RELEASE_BOT_NAME: "nb-droid"
 
-    - name: capture tty for gpg
-      run: |
-        echo "TTY="$(tty) >> $GITHUB_ENV
-        echo "GPG_TTY="$(tty) >> $GITHUB_ENV
-        # echo "::set-env name=TTY::"$(tty)
-        # echo "::set-env name=GPG_TTY::"$(tty)
+      - name: capture tty for gpg
+        run: |
+          echo "TTY="$(tty) >> $GITHUB_ENV
+          echo "GPG_TTY="$(tty) >> $GITHUB_ENV
+          # echo "::set-env name=TTY::"$(tty)
+          # echo "::set-env name=GPG_TTY::"$(tty)
 
-    - name: initialize gpg
-      run: |
-        set -x
-        echo "${{ secrets.GITHUB_GPG_KEY }}" | base64 -d > private.key
-        gpg --import --batch ./private.key
-        rm ./private.key
-        echo "gnupg files:"
-        ls -l ~/.gnupg/
+      - name: initialize gpg
+        run: |
+          set -x
+          echo "${{ secrets.GITHUB_GPG_KEY }}" | base64 -d > private.key
+          gpg --import --batch ./private.key
+          rm ./private.key
+          echo "gnupg files:"
+          ls -l ~/.gnupg/
 
-    - name: set git username
-      run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
+      - name: set git username
+        run: git config --global user.email "${{ secrets.NBDROID_EMAIL }}"
 
-    - name: set git email
-      run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
-
-    - name: free disk space
-      run: |
-        sudo swapoff -a
-        sudo rm -f /swapfile
-        sudo apt clean
-        docker rmi $(docker image ls -aq)
-        df -h
-
-    - name: Cache Maven packages
-      uses: actions/cache@v1
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
-
-    - name: read versions
-      run: |
-        set -x
-        CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-        RELEASE_VERSION=${CURRENT_VERSION%%-SNAPSHOT}
-        BASE_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f1-2)
-        MINOR_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f3)
-        NEXT_MINOR_VERSION=$(( MINOR_VERSION+1))
-        NEXT_SNAPSHOT="${BASE_VERSION}.${NEXT_MINOR_VERSION}-SNAPSHOT"
-        RELEASE_TAGNAME="nosqlbench-${RELEASE_VERSION}"
-        echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT}" >> $GITHUB_ENV
-        echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
-        echo "RELEASE_TAGNAME=${RELEASE_TAGNAME}" >> $GITHUB_ENV
-        # echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
-        # echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
-        # echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"
-
-    - name: prepare release summary
-      id: prepare_summary
-      run: |
-       #summary=$(scripts/release-notes.sh)
-       summary=$(cat RELEASENOTES.md)
-       summary="${summary//'%'/'%25'}"
-       summary="${summary//$'\n'/'%0A'}"
-       summary="${summary//$'\r'/'%0D'}"
-       echo "::set-output name=release_summary::$summary"
-
-    - name: prepare release
-      run: scripts/release-prepare.sh
-      env:
-       RELEASE_BRANCH_NAME: "main"
-       PRERELEASE_BRANCH_PATTERN: "-rc"
-       GIT_RELEASE_BOT_NAME: "nb-droid"
-       GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
-       ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
-       GPG_ENABLED: "true"
-       GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
-       GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
-       GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
-       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-       MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
-       MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
-       MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
-
-    - name: bundle integration test logs
-      run: |
-        pwd
-        find nb
-        mkdir -p itlogs/nb
-        cp -R nb/logs itlogs/nb
-
-    - name: upload integration test logs
-      uses: actions/upload-artifact@v1
-      with:
-        name: itlogs
-        path: itlogs
+      - name: set git email
+        run: git config --global user.name "${{ secrets.NBDROID_NAME }}"
 
 
-    - name: perform release
-      run: scripts/release-perform.sh
-      continue-on-error: true
-      env:
-       RELEASE_BRANCH_NAME: "main"
-       GIT_RELEASE_BOT_NAME: "nb-droid"
-       GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
-       ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
-       GPG_ENABLED: "true"
-       GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
-       GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
-       GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
-       GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-       MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
-       MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
-       MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
 
-    - name: bundle artifacts
-      run: |
-        pwd
-        ls -l
-        mkdir staging
-        cp nb/target/nb.jar nb/target/nb staging
 
-    - name: upload artifacts
-      uses: actions/upload-artifact@v1
-      with:
-       name: binaries
-       path: staging
 
-    - name: docker push
-      uses: docker/build-push-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        repository: nosqlbench/nosqlbench
-        tags: latest, ${{ env.RELEASE_VERSION }}
-        tag_with_ref: false
+      - name: free disk space
+        run: |
+          sudo swapoff -a
+          sudo rm -f /swapfile
+          sudo apt clean
+          docker rmi $(docker image ls -aq)
+          df -h
 
-    - name: bundle guidebook
-      run: mkdir guidebook && cp -R nb/target/guidebook guidebook
+      - name: Cache Maven packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
 
-    - name: upload guidebook
-      uses: actions/upload-artifact@v1
-      with:
-        name: guidebook
-        path: guidebook
+      - name: read versions
+        run: |
+          set -x
+          CURRENT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          RELEASE_VERSION=${CURRENT_VERSION%%-SNAPSHOT}
+          BASE_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f1-2)
+          MINOR_VERSION=$(echo "$RELEASE_VERSION" | cut -d'.' -f3)
+          NEXT_MINOR_VERSION=$(( MINOR_VERSION+1))
+          NEXT_SNAPSHOT="${BASE_VERSION}.${NEXT_MINOR_VERSION}-SNAPSHOT"
+          RELEASE_TAGNAME="nosqlbench-${RELEASE_VERSION}"
+          echo "NEXT_SNAPSHOT=${NEXT_SNAPSHOT}" >> $GITHUB_ENV
+          echo "RELEASE_VERSION=${RELEASE_VERSION}" >> $GITHUB_ENV
+          echo "RELEASE_TAGNAME=${RELEASE_TAGNAME}" >> $GITHUB_ENV
+          # echo "::set-env name=NEXT_SNAPSHOT::${NEXT_SNAPSHOT}"
+          # echo "::set-env name=RELEASE_VERSION::${RELEASE_VERSION}"
+          # echo "::set-env name=RELEASE_TAGNAME::${RELEASE_TAGNAME}"
 
-    - name: select release type from branch name
-      run: |
-       current_branch=$(git rev-parse --abbrev-ref HEAD)
-       if [[ ${current_branch} == *"-rc"* ]]
-        then echo "PRERELEASE=true" >> $GITHUB_ENV
-        else echo "PRERELEASE=false" >> $GITHUB_ENV
-       fi
+      - name: prepare release summary
+        id: prepare_summary
+        run: |
+          #summary=$(scripts/release-notes.sh)
+          summary=$(cat RELEASENOTES.md)
+          summary="${summary//'%'/'%25'}"
+          summary="${summary//$'\n'/'%0A'}"
+          summary="${summary//$'\r'/'%0D'}"
+          echo "::set-output name=release_summary::$summary"
 
-    - name: create release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ env.RELEASE_TAGNAME }}
-        release_name: Release ${{ env.RELEASE_TAGNAME }}
-        draft: false
-        prerelease: ${{ env.PRERELEASE }}
-        body: ${{ steps.prepare_summary.outputs.release_summary }}
+      - name: select release type from branch name
+        run: |
+          current_branch=$(git rev-parse --abbrev-ref HEAD)
+          if [[ ${current_branch} == *"-rc"* ]]
+           then
+            echo "PRERELEASE=true" >> $GITHUB_ENV
+            echo "DOCKER_TAGS=nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
+           else
+            echo "PRERELEASE=false" >> $GITHUB_ENV
+            echo "DOCKER_TAGS=nosqlbench/nosqlbench:latest,nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }}" >> $GITHUB_ENV
+          fi
 
-    - name: upload nb.jar
-      id: upload-nb-jar
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: nb/target/nb.jar
-        asset_name: nb.jar
-        asset_content_type: application/octet-stream
+      - name: prepare Maven release
+        run: scripts/release-prepare.sh
+        env:
+          RELEASE_BRANCH_NAME: "main"
+          PRERELEASE_BRANCH_PATTERN: "-rc"
+          GIT_RELEASE_BOT_NAME: "nb-droid"
+          GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
+          ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
+          GPG_ENABLED: "true"
+          GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
+          GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
+          GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
+          MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
+          MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
 
-    - name: upload nb binary
-      id: upload-nb-binary
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: nb/target/nb
-        asset_name: nb
-        asset_content_type: application/octet-stream
+      - name: Setup docker buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: docker hub login
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: docker test build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: Dockerfile
+          pull: true
+          push: false
+          load: true
+          tags: ${{ env.DOCKER_TAGS }}
+
+      - name: sanity check docker image
+        run: |
+          docker run --rm nosqlbench/nosqlbench:${{ env.RELEASE_VERSION }} --version
+
+      - name: bundle integration test logs
+        run: |
+          pwd
+          find nb
+          mkdir -p itlogs/nb
+          cp -R nb/logs itlogs/nb
+
+      - name: upload integration test logs
+        uses: actions/upload-artifact@v1
+        with:
+          name: itlogs
+          path: itlogs
+
+      - name: perform Maven release
+        run: scripts/release-perform.sh
+        continue-on-error: true
+        env:
+          RELEASE_BRANCH_NAME: "main"
+          GIT_RELEASE_BOT_NAME: "nb-droid"
+          GIT_RELEASE_BOT_EMAIL: ${{ secrets.GIT_RELEASE_BOT_EMAIL }}
+          ACCESS_TOKEN: ${{ secrets.GITHUB_ACCESS_TOKEN }}
+          GPG_ENABLED: "true"
+          GPG_KEY_ID: ${{ secrets.GITHUB_GPG_KEY_ID }}
+          GPG_KEY: ${{ secrets.GITHUB_GPG_KEY }}
+          GPG_SERVER_NAME: ${{ secrets.GPG_SERVER_NAME }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          MAVEN_REPO_SERVER_ID: ${{ secrets.MAVEN_REPO_SERVER_ID }}
+          MAVEN_REPO_SERVER_USERNAME: ${{ secrets.MVN_REPO_PRIVATE_REPO_USER }}
+          MAVEN_REPO_SERVER_PASSWORD: ${{ secrets.MVN_REPO_PRIVATE_REPO_PASSWORD }}
+
+      - name: bundle artifacts
+        run: |
+          pwd
+          ls -l
+          mkdir staging
+          cp nb/target/nb.jar nb/target/nb staging
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: binaries
+          path: staging
+
+      - name: docker push to hub
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: Dockerfile
+          pull: true
+          push: true
+          tags: ${{ env.DOCKER_TAGS }}
+
+      - name: bundle guidebook
+        run: mkdir guidebook && cp -R nb/target/guidebook guidebook
+
+      - name: upload guidebook
+        uses: actions/upload-artifact@v1
+        with:
+          name: guidebook
+          path: guidebook
+
+      - name: create github release
+        id: create_github_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.RELEASE_TAGNAME }}
+          release_name: Release ${{ env.RELEASE_TAGNAME }}
+          draft: false
+          prerelease: ${{ env.PRERELEASE }}
+          body: ${{ steps.prepare_summary.outputs.release_summary }}
+
+      - name: upload nb.jar to github release
+        id: upload-nb-jar
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_github_release.outputs.upload_url }}
+          asset_path: nb/target/nb.jar
+          asset_name: nb.jar
+          asset_content_type: application/octet-stream
+
+      - name: upload nb binary to github release
+        id: upload-nb-binary
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_github_release.outputs.upload_url }}
+          asset_path: nb/target/nb
+          asset_name: nb
+          asset_content_type: application/octet-stream
 
   docs:
     needs: release
@@ -224,8 +254,8 @@ jobs:
       - name: download guidebook
         uses: actions/download-artifact@v1
         with:
-         name: guidebook
-         path: guidebook
+          name: guidebook
+          path: guidebook
 
       - run: ls -la
 
@@ -234,30 +264,30 @@ jobs:
           NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
           NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
         run: |
-         git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git nosqlbench-docs
-         cd nosqlbench-docs
-         echo "files listing"
-         find .
-         git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git
-         git remote -v
+          git clone https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git nosqlbench-docs
+          cd nosqlbench-docs
+          echo "files listing"
+          find .
+          git remote set-url origin https://${{secrets.NBDROID_NAME}}:${{secrets.NBDROID_TOKEN}}@github.com/nosqlbench/nosqlbench-docs.git
+          git remote -v
 
       - name: push changes
         env:
           NBDROID_NAME: ${{ secrets.NBDROID_NAME }}
           NBDROID_TOKEN: ${{ secrets.NBDROID_TOKEN }}
         run: |
-         rsync -av --delete guidebook/guidebook/ nosqlbench-docs/docs/
-         echo "docs.nosqlbench.io" > nosqlbench-docs/docs/CNAME
-         cd nosqlbench-docs
-         git add docs
-         git add -u
-         CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
-         echo "found $CHANGES to push for doc updates"
-         if (( $CHANGES > 0 ))
-         then
-           git commit -m"docs update for $GITHUB_REF"
-           git push
-         fi
+          rsync -av --delete guidebook/guidebook/ nosqlbench-docs/docs/
+          echo "docs.nosqlbench.io" > nosqlbench-docs/docs/CNAME
+          cd nosqlbench-docs
+          git add docs
+          git add -u
+          CHANGES=$(git status --porcelain 2>/dev/null| wc -l)
+          echo "found $CHANGES to push for doc updates"
+          if (( $CHANGES > 0 ))
+          then
+            git commit -m"docs update for $GITHUB_REF"
+            git push
+          fi
 
 
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:14-alpine
+FROM openjdk:15-alpine
 RUN apk --no-cache add curl
 
 COPY nb/target/nb.jar nb.jar

devdocs/java_versions.md

@@ -0,0 +1,18 @@
+# Java Version Updates
+
+This is a list of all the places that the Java version is referenced in
+the NoSQLBench project. If you change versions or need to do
+version-specific troubleshooting, this list will help.
+
+- In the Dockerfile, in the parent image "FROM" tag.
+  [here](../Dockerfile)
+- In the Maven pom files, under `<source>...</source>`, `<release>...
+  </release>`, `<target>...</target>`
+  [here](../mvn-defaults/pom.xml)
+- In some cases, a Maven variable '<java.target.version>...</java.target.
+  version>` is used.
+  [here](../mvn-defaults/pom.xml)
+- In the nb appimage build scripts under nb/build-bin.sh.
+  [here](../nb/build-bin.sh)
+- In the github actions workflows for the Java runtime version
+

engine-docker/src/main/resources/docker/dashboards/nb4-default-dashboard.json

@@ -47,6 +47,7 @@
     "gnetId": null,
     "graphTooltip": 1,
     "id": null,
+    "iteration": 1607447891116,
     "links": [],
     "panels": [
       {
@@ -371,13 +372,13 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "result{type=\"avg_rate\",avg_of=\"1m\"}",
+            "expr": "result{type=\"avg_rate\",avg_of=\"1m\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-allops",
             "refId": "C"
           },
           {
-            "expr": "result_success{type=\"avg_rate\",avg_of=\"1m\"}",
+            "expr": "result_success{type=\"avg_rate\",avg_of=\"1m\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-okops",
             "refId": "A"
@@ -475,7 +476,7 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "{__name__=~\"errorcounts.*\"}",
+            "expr": "{__name__=~\"errorcounts.*\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-{{error}}",
             "refId": "B"
@@ -574,18 +575,18 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "result_success{type=\"pctile\"}",
+            "expr": "result_success{type=\"pctile\",alias=\"$Alias\"}",
             "hide": false,
             "interval": "",
             "legendFormat": "{{alias}}-p{{pctile}}",
             "refId": "B"
           },
           {
-            "expr": "cycles_servicetime{type=\"pctile\"}",
-            "hide": true,
+            "expr": "result_success{type=\"pctile\",alias=\"$Alias\"}",
+            "hide": false,
             "interval": "",
-            "legendFormat": "{{alias}}-{{pctile}}",
-            "refId": "A"
+            "legendFormat": "{{alias}}-p{{pctile}}",
+            "refId": "C"
           }
         ],
         "thresholds": [],
@@ -680,7 +681,7 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "tries{type=\"pctile\"}",
+            "expr": "tries{type=\"pctile\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-p{{pctile}}",
             "refId": "A"
@@ -778,7 +779,7 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"75\"}",
+            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"75\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-{{__name__}}-p{{pctile}}",
             "refId": "A"
@@ -877,7 +878,7 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"99\"}",
+            "expr": "{__name__=~\"read_input|bind|execute\",type=\"pctile\",pctile=\"99\",alias=\"$Alias\"}",
             "format": "time_series",
             "hide": false,
             "instant": false,
@@ -981,13 +982,13 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "result_success{type=\"pctile\",pctile=\"0\"}",
+            "expr": "result_success{type=\"pctile\",pctile=\"0\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-min",
             "refId": "B"
           },
           {
-            "expr": "result_success{type=\"pctile\",pctile=\"100\"}",
+            "expr": "result_success{type=\"pctile\",pctile=\"100\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-max",
             "refId": "A"
@@ -1085,7 +1086,7 @@
         "steppedLine": false,
         "targets": [
           {
-            "expr": "cycles_servicetime{type=\"counter\"}",
+            "expr": "cycles_servicetime{type=\"counter\",alias=\"$Alias\"}",
             "interval": "",
             "legendFormat": "{{alias}}-count",
             "refId": "C"
@@ -1145,9 +1146,52 @@
         {
           "allValue": null,
           "current": {
-            "selected": false,
-            "text": "CLI",
-            "value": "CLI"
+            "selected": true,
+            "tags": [],
+            "text": [
+              "All"
+            ],
+            "value": [
+              "$__all"
+            ]
+          },
+          "datasource": "prometheus",
+          "definition": "{appname=\"nosqlbench\"}",
+          "error": null,
+          "hide": 0,
+          "includeAll": true,
+          "label": "Alias",
+          "multi": true,
+          "name": "Alias",
+          "options": [
+            {
+              "selected": true,
+              "text": "All",
+              "value": "$__all"
+            },
+            {
+              "selected": false,
+              "text": "DIAG0",
+              "value": "DIAG0"
+            }
+          ],
+          "query": "{appname=\"nosqlbench\"}",
+          "refresh": 0,
+          "regex": "/.*alias=\"(\\w+)\".*/",
+          "skipUrlSync": false,
+          "sort": 0,
+          "tagValuesQuery": "",
+          "tags": [],
+          "tagsQuery": "",
+          "type": "query",
+          "useTags": false
+        },
+        {
+          "allValue": null,
+          "current": {
+            "selected": true,
+            "text": "Script",
+            "value": "Script"
           },
           "error": null,
           "hide": 0,
@@ -1172,12 +1216,12 @@
               "value": "Scenario"
             },
             {
-              "selected": false,
+              "selected": true,
               "text": "Script",
               "value": "Script"
             },
             {
-              "selected": true,
+              "selected": false,
               "text": "Activity",
               "value": "Activity"
             },
@@ -1225,6 +1269,6 @@
     "timezone": "",
     "title": "NB4 Dashboard",
     "uid": "aIIX1f6Wz",
-    "version": 6
+    "version": 10
   }
 }

mvn-defaults/pom.xml

@@ -11,8 +11,6 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <javadoc.name>nosqlbench</javadoc.name>
 
-<!--    <java.target.version>11</java.target.version>-->
-
     <!-- properties for package versions -->
     <ascii.data.version>1.2.0</ascii.data.version>
     <commons.codec.version>1.14</commons.codec.version>

nb/build-bin.sh

@@ -29,28 +29,60 @@ fi
 
 rsync -av appimage/skel/ "${APPDIR}/"
 cp target/nb.jar "${APPDIR}/usr/bin/nb.jar"
-
-if [ ! -d "cache/jre15" ]
-then
-  printf "getting jre once into cache/jre15\n";
-  mkdir -p cache
-  (cd cache && (
-   if [ "$BUILD_OPENJ9" = "true" ]
-   then
-    wget -c wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-    tar -xf OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-    mv jdk-15.0.1+9-jre jre15
-    rm OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
-   else
-    wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
-    tar xf OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
-    mv jdk-15.0.1+9-jre jre15
-   fi
-  ))
-fi
+JAVA_VERSION="15"
 
 mkdir -p "${APPDIR}/usr/bin/jre"
-rsync -av cache/jre15/ "${APPDIR}/usr/bin/jre/"
+
+if [ "$JAVA_VERSION" == "15" ]
+then
+  if [ ! -d "cache/jre15" ] ; then
+    printf "getting jre once into cache/jre15\n";
+    mkdir -p cache
+    (cd cache && (
+     if [ "$BUILD_OPENJ9" = "true" ]
+     then
+      wget -c wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
+      tar -xf OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
+      mv jdk-15.0.1+9-jre jre15
+      rm OpenJDK15U-jre_x64_linux_openj9_linuxXL_2020-11-19-07-04.tar.gz
+     else
+      wget -c https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk15u-2020-11-19-07-04/OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
+      tar xf OpenJDK15U-jre_x64_linux_hotspot_2020-11-19-07-04.tar.gz
+      mv jdk-15.0.1+9-jre jre15
+     fi
+    ))
+  fi
+  rsync -av cache/jre15/ "${APPDIR}/usr/bin/jre/"
+# Java 14 should run binaries targeted to Java 11 bytecode
+elif [ "$JAVA_VERSION" == "14" ] ; then
+  if [ ! -d "cache/jre14" ] ; then
+    printf "getting jre once into cache/jre14\n";
+    mkdir -p cache
+    (cd cache && (
+     if [ "$BUILD_OPENJ9" = "true" ]
+     then
+      wget -c https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14u-2020-04-27-07-27/OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
+      tar xf OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
+      mv jdk-14.0.1+7-jre jre14
+      rm OpenJDK14U-jre_x64_linux_openj9_linuxXL_2020-04-27-07-27.tar.gz
+     else
+      wget -c https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk14u-2020-04-27-07-27/OpenJDK14U-jre_x64_linux_hotspot_2020-04-27-07-27.tar.gz
+      tar xf OpenJDK14U-jre_x64_linux_hotspot_2020-04-27-07-27.tar.gz
+      mv jdk-14.0.1+7-jre jre14
+     fi
+    ))
+  fi
+  rsync -av cache/jre14/ "${APPDIR}/usr/bin/jre/"
+else
+  printf "Unknown java version indicated in $0"
+  exit 2
+   # wget -c https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.2%2B10/OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
+   # tar xf OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
+   # mv jdk-12.0.2+10-jre jre
+   # rm OpenJDK12U-jre_x64_linux_hotspot_12.0.2_10.tar.gz
+fi
+
+
 
 if [ ! -f "${APPDIR}/AppRun" ]
   then