Merge branch '2.5.1' of github.com:Altinity/clickhouse-sink-connector…

… into 965-ddl-translation-error-modify-column-datatype-with-default-null
Altinity · Jan 23, 2025 · a2a13fc · a2a13fc
2 parents 6be1543 + 6252738
commit a2a13fc
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -57,7 +57,7 @@ jobs:
         run: mvn -B package install -DskipTests=true --file pom.xml
 
       - name: Upload Maven build (Kafka)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: clickhouse-sink-connector-kafka-${{ env.IMAGE_TAG }}.jar
           path: sink-connector/target/clickhouse-kafka-sink-connector-${{ env.PROJECT_VERSION }}.jar
@@ -69,7 +69,7 @@ jobs:
           docker save altinityinfra/clickhouse-sink-connector:${{ env.IMAGE_TAG }}-kafka | gzip > clickhouse-sink-connector_${{ env.IMAGE_TAG }}-kafka.tar.gz
 
       - name: Upload Docker tar (Kafka)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ github.event.pull_request.head.repo.full_name != 'Altinity/clickhouse-sink-connector' && github.event_name != 'workflow_dispatch' }}
         with:
           name: clickhouse-sink-connector_${{ env.IMAGE_TAG }}-kafka.tar.gz
@@ -88,7 +88,7 @@ jobs:
         run:  mvn -B package -DskipTests=true --file pom.xml
 
       - name: Upload Maven build (Lightweight)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: clickhouse-sink-connector-lt-${{ env.IMAGE_TAG }}.jar
           path: sink-connector-lightweight/target/clickhouse-debezium-embedded-${{ env.PROJECT_VERSION }}.jar
@@ -103,7 +103,7 @@ jobs:
           docker save altinityinfra/clickhouse-sink-connector:${{ env.IMAGE_TAG }}-lt | gzip > clickhouse-sink-connector_${{ env.IMAGE_TAG }}-lt.tar.gz
 
       - name: Upload Docker tar (Lightweight)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ github.event.pull_request.head.repo.full_name != 'Altinity/clickhouse-sink-connector' && github.event_name != 'workflow_dispatch' }}
         with:
           name: clickhouse-sink-connector_${{ env.IMAGE_TAG }}-lt.tar.gz

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -71,7 +71,7 @@ jobs:
           body_path: ${{ github.workspace }}/release-notes/${{ env.release_tag }}.md
 
       - name: Download jar files
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
 #      - name: Zip jar files
 #        run: |

diff --git a/.github/workflows/testflows-sink-connector-kafka.yml b/.github/workflows/testflows-sink-connector-kafka.yml
@@ -72,7 +72,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         if: ${{ github.event.pull_request.head.repo.full_name != 'Altinity/clickhouse-sink-connector' && github.event_name != 'workflow_dispatch' }}
         with:
           name: clickhouse-sink-connector_${{ github.event.number }}-${{ github.sha }}-kafka.tar.gz
@@ -135,7 +135,7 @@ jobs:
           AWS_DEFAULT_REGION: 'eu-west-2'
         run: aws s3 cp . s3://altinity-test-reports/altinity-sink-connector/testflows/${{ steps.date.outputs.date }}_sink/ --recursive --exclude "*" --include "*.log" --include "*.html"
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: testflows-sink-connector-kafka-artefacts

diff --git a/.github/workflows/testflows-sink-connector-lightweight.yml b/.github/workflows/testflows-sink-connector-lightweight.yml
@@ -73,7 +73,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         if: ${{ github.event.pull_request.head.repo.full_name != 'Altinity/clickhouse-sink-connector' && github.event_name != 'workflow_dispatch' }}
         with:
           name: clickhouse-sink-connector_${{ github.event.number }}-${{ github.sha }}-lt.tar.gz
@@ -136,7 +136,7 @@ jobs:
           AWS_DEFAULT_REGION: 'eu-west-2'
         run: aws s3 cp . s3://altinity-test-reports/altinity-sink-connector/testflows/${{ steps.date.outputs.date }}_sink_lw/ --recursive --exclude "*" --include "*.log" --include "*.html"
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: testflows-sink-connector-lightweight-artefacts
@@ -151,7 +151,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         if: ${{ github.event.pull_request.head.repo.full_name != 'Altinity/clickhouse-sink-connector' && github.event_name != 'workflow_dispatch' }}
         with:
           name: clickhouse-sink-connector_${{ github.event.number }}-${{ github.sha }}-lt.tar.gz
@@ -214,7 +214,7 @@ jobs:
           AWS_DEFAULT_REGION: 'eu-west-2'
         run: aws s3 cp . s3://altinity-test-reports/altinity-sink-connector/testflows/${{ steps.date.outputs.date }}_sink_lw/ --recursive --exclude "*" --include "*.log" --include "*.html"
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: testflows-sink-connector-lightweight-replicated-artefacts

diff --git a/sink-connector-lightweight/docker/config.yml b/sink-connector-lightweight/docker/config.yml
@@ -183,3 +183,10 @@ metrics.enable: "true"
 # to reduce slow startup when replicating dbs with large number of tables
 #schema.history.internal.store.only.captured.tables.ddl: "true"
 #schema.history.internal.store.only.captured.databases.ddl: "true"
+
+# Required for fixing bug with freeze in debezium loop.
+use.nongraceful.disconnect: "true"
+database.keep.alive.interval.`ms: "30000"  #Send keepalive every 30 seconds
+database.connection.reconnect.backoff.ms: "1000"
+database.connection.reconnect.backoff.max.ms: "10000"
+database.ssl.mode: "disabled"
diff --git a/sink-connector-lightweight/docker/config_postgres.yml b/sink-connector-lightweight/docker/config_postgres.yml
@@ -125,4 +125,12 @@ SELECT
     toDateTime(fromUnixTimestamp(toInt32(JSONExtractUInt(offset_val, 'ts_usec') / 1000000)), 'UTC') AS utc_time,
     fromUnixTimestamp(toInt32(JSONExtractUInt(offset_val, 'ts_usec') / 1000000)) AS local_time
 FROM altinity_sink_connector.replica_source_info
-SETTINGS final = 1"
+SETTINGS final = 1"
+
+
+# Required for fixing bug with freeze in debezium loop.
+use.nongraceful.disconnect: "true"
+database.keep.alive.interval.`ms: "30000"  #Send keepalive every 30 seconds
+database.connection.reconnect.backoff.ms: "1000"
+database.connection.reconnect.backoff.max.ms: "10000"
+database.ssl.mode: "disabled"