Release 4.1.1

th2-net · Nov 10, 2022 · e5416a2 · e5416a2
2 parents 4100f9c + 9f7a92f
commit e5416a2
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 61 deletions.
diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml
@@ -7,17 +7,17 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: ${{ github.sha }}
-    - name: Checkout tool
-      uses: actions/checkout@v2
-      with:
-        repository: exactpro-th2/ci-github-action
-        ref: master
-        token: ${{ secrets.PAT_CI_ACTION }}
-        path: ci-github-action
-    - name: Run CI action
-      uses: ./ci-github-action
-      with:
-        ref: ${{ github.sha }}
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.sha }}
+      - name: Checkout tool
+        uses: actions/checkout@v3
+        with:
+          repository: exactpro-th2/ci-github-action
+          ref: master
+          token: ${{ secrets.PAT_CI_ACTION }}
+          path: ci-github-action
+      - name: Run CI action
+        uses: ./ci-github-action
+        with:
+          ref: ${{ github.sha }}
diff --git a/.github/workflows/dev-docker-publish.yml b/.github/workflows/dev-docker-publish.yml
@@ -3,8 +3,8 @@ name: Dev build and publish Docker distributions to Github Container Registry gh
 on:
   push:
     branches-ignore:
-    - master
-    - version-*
+      - master
+      - version-*
 #     paths:
 #    - gradle.properties
 #    - package_info.json
@@ -13,38 +13,38 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Prepare custom build version
       - name: Get branch name
         id: branch
-        run: echo ::set-output name=branch_name::${GITHUB_REF#refs/*/}
+        run: echo "branch_name=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
       - name: Get SHA of the commit
         id: sha
-        run: echo ::set-output name=sha_short::$(git rev-parse --short HEAD)
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
       - name: Get release_version
         id: ver
-        uses: christian-draeger/read-properties@1.0.1
+        uses: christian-draeger/read-properties@1.1.1
         with:
           path: gradle.properties
-          property: release_version
+          properties: release_version
       - name: Build custom release version
         id: release_ver
-        run: echo ::set-output name=value::"${{ steps.ver.outputs.value }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}-${{ steps.sha.outputs.sha_short }}"
+        run: echo value="${{ steps.ver.outputs.release_version }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}-${{ steps.sha.outputs.sha_short }}" >> $GITHUB_OUTPUT
       - name: Show custom release version
         run: echo ${{ steps.release_ver.outputs.value }}
       # Build and publish image
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - uses: docker/login-action@v1
+        uses: docker/setup-buildx-action@v2
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
-      - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')"
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_OUTPUT
         id: meta
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           push: true
           tags: ghcr.io/${{ github.repository }}:${{ steps.release_ver.outputs.value }}

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -3,35 +3,35 @@ name: Build and publish Docker distributions to Github Container Registry ghcr.i
 on:
   push:
     branches:
-    - master
-    - version-*
+      - master
+      - version-*
     paths:
-    - gradle.properties
+      - gradle.properties
 
 jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-    - uses: docker/login-action@v1
-      with:
-        registry: ghcr.io
-        username: ${{ github.repository_owner }}
-        password: ${{ secrets.CR_PAT }}
-    - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')"
-      id: meta
-    - name: Read version from gradle.properties
-      id: read_property
-      uses: christian-draeger/read-properties@1.0.1
-      with:
-        path: ./gradle.properties
-        property: release_version
-    - name: Build and push
-      id: docker_build
-      uses: docker/build-push-action@v2
-      with:
-        push: true
-        tags: ghcr.io/${{ github.repository }}:${{ steps.read_property.outputs.value }}
-        labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.read_property.outputs.value }}
+      - uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_OUTPUT
+        id: meta
+      - name: Read version from gradle.properties
+        id: read_property
+        uses: christian-draeger/read-properties@1.1.1
+        with:
+          path: ./gradle.properties
+          properties: release_version
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          tags: ghcr.io/${{ github.repository }}:${{ steps.read_property.outputs.release_version }}
+          labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.read_property.outputs.release_version }}
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Overview (4.1.0)
+# Overview (4.1.1)
 
 Message store (mstore) is an important th2 component responsible for storing raw messages into Cradle. Please refer to [Cradle repository] (https://github.com/th2-net/cradleapi/blob/master/README.md) for more details. This component has a pin for listening messages via MQ.
 
@@ -19,9 +19,9 @@ session alias, direction and sequence number are a **compound unique identifier*
 {
   "drain-interval": 1000,
   "termination-timeout": 5000,
-  "maxTaskCount" : 1024,
+  "maxTaskCount" : 256,
   "maxTaskDataSize" : 133169152,
-  "maxRetryCount" : 3,
+  "maxRetryCount" : 1000000,
   "retryDelayBase" : 5000
 }
 ```
@@ -74,6 +74,17 @@ spec:
 This is a list of supported features provided by libraries.
 Please see more details about this feature via [link](https://github.com/th2-net/th2-common-j#configuration-formats).
 
+## 4.1.1
+
++ Using Cradle 3.1.4. No changes related to message persistence
++ Changed default configuration to
+```json
+{
+    "maxTaskCount" : 256,
+    "maxRetryCount" : 1000000,
+    "retryDelayBase" : 5000
+}
+```
 ## 4.1.0
 + Added metrics collection for Prometheus
 + Limiting simultaneously processed message batches by number and content size

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 ext {
     sharedDir       = file("${project.rootDir}/shared")
-    cradleVersion   = '3.1.3'
+    cradleVersion   = '3.1.4'
 }
 
 group = 'com.exactpro.th2'

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-release_version=4.1.0
+release_version=4.1.1
diff --git a/src/main/java/com/exactpro/th2/mstore/Configuration.java b/src/main/java/com/exactpro/th2/mstore/Configuration.java
@@ -70,8 +70,8 @@ public static Builder builder() {
     public static final class Builder {
         private static final long DEFAULT_DRAIN_INTERVAL = 1000L;
         private static final long DEFAULT_WAIT_TIMEOUT = 5000L;
-        private static final int DEFAULT_MAX_TASK_RETRIES = 3;
-        private static final int DEFAULT_MAX_TASK_COUNT = 1024;
+        private static final int DEFAULT_MAX_TASK_RETRIES = 1000000;
+        private static final int DEFAULT_MAX_TASK_COUNT = 256;
         private static final long DEFAULT_RETRY_DELAY_BASEM_MS = 5000;
 
         @JsonProperty("drain-interval")