Changes done for v4.1.3.

IBMStreams · Oct 31, 2021 · 30c711a · 30c711a
1 parent 05d6f0b
commit 30c711a
Show file tree

Hide file tree

Showing 4 changed files with 644 additions and 157 deletions.
diff --git a/com.ibm.streamsx.dps/impl/src/RedisClusterPlusPlusDBLayer.cpp b/com.ibm.streamsx.dps/impl/src/RedisClusterPlusPlusDBLayer.cpp
@@ -1,6 +1,6 @@
 /*
 # Licensed Materials - Property of IBM
-# Copyright IBM Corp. 2011, 2020
+# Copyright IBM Corp. 2011, 2021
 # US Government Users Restricted Rights - Use, duplication or
 # disclosure restricted by GSA ADP Schedule Contract with
 # IBM Corp.
@@ -5088,9 +5088,13 @@ namespace distributed
         exceptionType = REDIS_PLUS_PLUS_OTHER_ERROR;
      }
 
+     // Under normal working conditions of the Redis server(s),
+     // the Redis command executed above shouldn't have raised
+     // any exception.
+     //
      // Did we encounter a redis-cluster server connection error?
-     if (exceptionType == REDIS_PLUS_PLUS_CONNECTION_ERROR) {
-        SPLAPPTRC(L_ERROR, "Inside isConnected: Unable to connect to the redis-cluster server(s). Failed with an exception. Error=" << exceptionString << ". rc=" << DPS_CONNECTION_ERROR, "RedisClusterPlusPlusDBLayer");
+     if (exceptionType != REDIS_PLUS_PLUS_NO_ERROR) {
+        SPLAPPTRC(L_ERROR, "Inside isConnected: Unable to execute a get command. Possible issue connecting to the redis-cluster server(s). Failed with an exception type " << exceptionType << ". Error=" << exceptionString << ". rc=" << DPS_CONNECTION_ERROR << ". Application code may call the DPS reconnect API and then retry the failed operation.", "RedisClusterPlusPlusDBLayer");
         // Connection error.
         return(false);
      } else {

diff --git a/com.ibm.streamsx.dps/info.xml b/com.ibm.streamsx.dps/info.xml
@@ -235,7 +235,7 @@ To specifically learn how to call the DPS APIs from SPL native functions, C++ an
 # Reference information
 [../../javadoc/dps/index.html| DPS Java API Reference]
   </info:description>
-    <info:version>4.1.2</info:version>
+    <info:version>4.1.3</info:version>
     <info:requiredProductVersion>4.2.0.0</info:requiredProductVersion>
   </info:identity>
   <info:dependencies/>