Version 7.0.8.2

kineticadb · Oct 25, 2019 · 8ccf7c9 · 8ccf7c9
1 parent 3bc4727
commit 8ccf7c9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Version 7.0
 
+### Version 7.0.8.2 - 2019-10-25
+
+#### Fixed
+-   Multi-head insertion high-availability failover issue when retryCount > 0
+
 ### Version 7.0.8.1 - 2019-10-21
 
 #### Fixed

diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 MAJOR = 7
 MINOR = 0
 REVISION = 8
-ABI_VERSION = 1
+ABI_VERSION = 2
diff --git a/api/pom.xml b/api/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gpudb</groupId>
     <artifactId>gpudb-api</artifactId>
-    <version>7.0.8.1</version>
+    <version>7.0.8.2</version>
     <packaging>jar</packaging>
     <name>Kinetica Java API</name>
     <distributionManagement>
@@ -49,7 +49,7 @@
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <gpudb-api.version>7.0.8.1</gpudb-api.version>
+        <gpudb-api.version>7.0.8.2</gpudb-api.version>
     </properties>
     <profiles>
         <profile>

diff --git a/api/src/main/java/com/gpudb/BulkInserter.java b/api/src/main/java/com/gpudb/BulkInserter.java
@@ -774,6 +774,7 @@ public long getCountUpdated() {
         return countUpdated.get();
     }
 
+
     /**
      * Ensures that any queued records are inserted into GPUdb. If an error
      * occurs while inserting the records from any queue, the records will no
@@ -797,11 +798,10 @@ public void flush() throws InsertException {
                 queue = workerQueue.flush();
             }
 
-            flush(queue, workerQueue.getUrl(), true);
+            flush( queue, workerQueue.getUrl(), true );
         }
     }
 
-
     @SuppressWarnings("unchecked")
     private void flush(List<T> queue, URL url, boolean forcedFlush) throws InsertException {
         if (queue.isEmpty()) {
@@ -858,14 +858,12 @@ private void flush(List<T> queue, URL url, boolean forcedFlush) throws InsertExc
                             // Switch to a different cluster in the HA ring, if any
                             forceHAFailover( currURL, currentCountClusterSwitches );
                         } catch (GPUdbException ex2) {
-                            if (retries <= 0) {
-                                // We've now tried all the HA clusters and circled back;
-                                // propagate the error to the user, but only there
-                                // are no more retries left
-                                String originalCause = (ex.getCause() == null) ? ex.toString() : ex.getCause().toString();
-                                throw new GPUdbException( originalCause
-                                                          + ex2.getMessage(), true );
-                            }
+                            // We've now tried all the HA clusters and circled back;
+                            // propagate the error to the user, but only there
+                            // are no more retries left
+                            String originalCause = (ex.getCause() == null) ? ex.toString() : ex.getCause().toString();
+                            throw new GPUdbException( originalCause
+                                                      + ex2.getMessage(), true );
                         }
                     }
 
@@ -961,6 +959,8 @@ private void flush(List<T> queue, URL url, boolean forcedFlush) throws InsertExc
         }
     }
 
+
+
     /**
      * Queues a record for insertion into GPUdb. If the queue reaches the
      * {@link #getBatchSize batch size}, all records in the queue will be