Fixed the issue where connections weren't put back to pool on certain…

… non-critical errors

command.go

@@ -992,7 +992,12 @@ func (cmd *baseCommand) execute(ifc command) (err error) {
 			// cancelling/closing the batch/multi commands will return an error, which will
 			// close the connection to throw away its data and signal the server about the
 			// situation. We will not put back the connection in the buffer.
-			node.InvalidateConnection(cmd.conn)
+			if KeepConnection(err) {
+				// Put connection back in pool.
+				node.PutConnection(cmd.conn)
+			} else {
+				node.InvalidateConnection(cmd.conn)
+			}
 			return err
 		}
 

types/result_code.go

@@ -204,9 +204,15 @@ const (
 )
 
 // Should connection be put back into pool.
-func KeepConnection(resultCode int) bool {
-	switch ResultCode(resultCode) {
-	case OK, // Exception did not originate on server.
+func KeepConnection(err error) bool {
+	// if error is not an Aerospike Errors, Throw it away
+	ae, ok := err.(AerospikeError)
+	if !ok {
+		return false
+	}
+
+	switch ae.resultCode {
+	case 0, // Zero Value
 		QUERY_TERMINATED,
 		SCAN_TERMINATED,
 		INVALID_NODE_ERROR,
@@ -219,6 +225,7 @@ func KeepConnection(resultCode int) bool {
 		INDEX_OOM,
 		QUERY_ABORTED,
 		QUERY_TIMEOUT:
+
 		return false
 
 	default: