1.1.2 fixing SNS publish batch-size issue (#339)

* Updated deployment group for E2E env * V1 branch rules updated (#308) * Updated deployment group for E2E env (#305) * updated rules as per v1_* branches * Fixed SNS publish batch-size issue * debug pipeline failure * include hidden file in artifact
heremaps · Sep 10, 2024 · 8c60ae9 · 8c60ae9
1 parent 53bfc6b
commit 8c60ae9
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 13 deletions.
diff --git a/.github/workflows/reusable-build-and-publish.yml b/.github/workflows/reusable-build-and-publish.yml
@@ -48,7 +48,7 @@ jobs:
           cp -p $SERVICE_JAR_DIR/xyz-hub-service.jar $CODEDEPLOY_DIR/contents/xyz-hub/
       - name: List CodeDeploy artifact content
         run: |
-          ls -lR $CODEDEPLOY_DIR
+          ls -lRa $CODEDEPLOY_DIR
       - name: Save pipeline artifact name
         id: save-artifact-name
         run: echo "name=${{ env.GITHUB_CODEDEPLOY_ARTIFACT_NAME }}" >> "$GITHUB_OUTPUT"
@@ -58,6 +58,7 @@ jobs:
           name: ${{ env.GITHUB_CODEDEPLOY_ARTIFACT_NAME }}
           path: ${{ env.CODEDEPLOY_DIR }}
           if-no-files-found: error
+          include-hidden-files: true
       - name: Identify and save Application version
         id: save-app-version
         run: |

diff --git a/.github/workflows/reusable-s3-codedeploy-release.yml b/.github/workflows/reusable-s3-codedeploy-release.yml
@@ -49,7 +49,7 @@ jobs:
           path: download
       - name: List CodeDeploy artifacts
         run: |
-          ls -lR download/
+          ls -lRa download/
       - name: Preparing S3 artifact name
         id: s3-artifact-name
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Naksha_1.1.2
+
+- Fixed batch-size failure issue for SNS publishing where one of the message fails during publish, then we optimize by continuing from that failure instead of re-processing entire batch 
+
 ## Naksha_1.1.1
 
 - Introduced new query parameter `rlock` to indicate whether API transaction should `WAIT` or `ABORT` when there is DB row-level lock found during Updates.

diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
 
   <groupId>com.here.xyz</groupId>
   <artifactId>xyz-hub</artifactId>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.1.2</version>
   <packaging>pom</packaging>
 
   <modules>

diff --git a/xyz-connectors/pom.xml b/xyz-connectors/pom.xml
@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
   </parent>
 
   <licenses>

diff --git a/xyz-hub-service/pom.xml b/xyz-hub-service/pom.xml
@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
   </parent>
 
   <licenses>

diff --git a/xyz-hub-test/pom.xml b/xyz-hub-test/pom.xml
@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
   </parent>
 
   <licenses>

diff --git a/xyz-models/pom.xml b/xyz-models/pom.xml
@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
   </parent>
 
   <licenses>

diff --git a/xyz-psql-connector/pom.xml b/xyz-psql-connector/pom.xml
@@ -25,7 +25,7 @@
     <groupId>com.here.xyz</groupId>
     <artifactId>xyz-hub</artifactId>
     <relativePath>../</relativePath>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.1.2</version>
   </parent>
 
   <licenses>

diff --git a/xyz-txn-handler/pom.xml b/xyz-txn-handler/pom.xml
@@ -25,7 +25,7 @@
         <groupId>com.here.xyz</groupId>
         <artifactId>xyz-hub</artifactId>
         <relativePath>../</relativePath>
-        <version>1.1.2-SNAPSHOT</version>
+        <version>1.1.2</version>
     </parent>
 
     <licenses>

diff --git a/xyz-txn-handler/src/main/java/com/here/xyz/pub/handlers/PubTxnListHandler.java b/xyz-txn-handler/src/main/java/com/here/xyz/pub/handlers/PubTxnListHandler.java
@@ -46,10 +46,15 @@ public void run() {
                 return;
             }
             // Handover transactions to appropriate Publisher (e.g. DefaultSNSPublisher)
-            final PublishEntryDTO lastTxn = PubUtil.getPubInstance(sub).publishTransactions(pubCfg, sub, txnList, lastTxnId, lastTxnRecId);
-
-            // Update last txn_id in AdminDB::xyz_config::xyz_txn_pub table
-            PubDatabaseHandler.saveLastTxnId(adminDBConnParams, subId, lastTxn);
+            PublishEntryDTO lastTxn = null;
+            try {
+                lastTxn = PubUtil.getPubInstance(sub).publishTransactions(pubCfg, sub, txnList, lastTxnId, lastTxnRecId);
+            } finally {
+                if (lastTxn != null) {
+                    // Update last txn_id in AdminDB::xyz_config::xyz_txn_pub table
+                    PubDatabaseHandler.saveLastTxnId(adminDBConnParams, subId, lastTxn);
+                }
+            }
         } catch (Exception ex) {
             logger.error("{} - Exception in publisher job for subId={}, spaceId={}. ",
                     PubLogConstants.LOG_CODE_PUBLISH_ERROR, subId, spaceId, ex);