Merge pull request #456 from DrHayt/master

Augment bad connection management

Author: sijms

v2/command.go

@@ -8,11 +8,12 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/sijms/go-ora/v2/network"
 	"reflect"
 	"regexp"
 	"strings"
 	"time"
+
+	"github.com/sijms/go-ora/v2/network"
 )
 
 type StmtType int
@@ -568,6 +569,7 @@ func (stmt *defaultStmt) fetch(dataSet *DataSet) error {
 	var err = stmt._fetch(dataSet)
 	if err != nil {
 		if isBadConn(err) {
+			stmt.connection.setBad()
 			tracer.Print("Error: ", err)
 			return driver.ErrBadConn
 		}
@@ -2213,6 +2215,7 @@ func (stmt *Stmt) Exec(args []driver.Value) (driver.Result, error) {
 	}
 	if err != nil {
 		if isBadConn(err) {
+			stmt.connection.setBad()
 			tracer.Print("Error: ", err)
 			return nil, driver.ErrBadConn
 		}
@@ -2326,6 +2329,7 @@ func (stmt *Stmt) Query_(namedArgs []driver.NamedValue) (*DataSet, error) {
 	dataSet, err := stmt._query()
 	if err != nil {
 		if isBadConn(err) {
+			stmt.connection.setBad()
 			tracer.Print("Error: ", err)
 			return nil, driver.ErrBadConn
 		}

v2/connection.go

@@ -7,15 +7,17 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/sijms/go-ora/v2/advanced_nego"
-	"github.com/sijms/go-ora/v2/converters"
-	"github.com/sijms/go-ora/v2/network"
 	"reflect"
 	"regexp"
 	"strconv"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"time"
+
+	"github.com/sijms/go-ora/v2/advanced_nego"
+	"github.com/sijms/go-ora/v2/converters"
+	"github.com/sijms/go-ora/v2/network"
 )
 
 type ConnectionState int
@@ -102,7 +104,7 @@ type Connection struct {
 		date      int
 		timestamp int
 	}
-	bad       bool
+	bad       atomic.Bool
 	dbTimeLoc *time.Location
 }
 
@@ -1289,11 +1291,12 @@ func (conn *Connection) readResponse(msgCode uint8) error {
 }
 
 func (conn *Connection) setBad() {
-	conn.bad = true
+	conn.bad.Swap(true)
+	//conn.bad = true
 }
 
 func (conn *Connection) ResetSession(ctx context.Context) error {
-	if conn.bad {
+	if conn.bad.Load() {
 		return driver.ErrBadConn
 	}
 	return nil

v2/network/oracle_error.go

@@ -50,3 +50,12 @@ func (err *OracleError) translate() {
 		err.ErrMsg = "ORA-" + strconv.Itoa(err.ErrCode)
 	}
 }
+
+func (err *OracleError) Bad() bool {
+	switch err.ErrCode {
+	case 28, 1012, 1033, 1034, 1089, 3113, 3114, 3135, 12528, 12537:
+		return true
+	default:
+		return false
+	}
+}

v2/ref_cursor.go

@@ -2,6 +2,7 @@ package go_ora
 
 import (
 	"database/sql/driver"
+
 	"github.com/sijms/go-ora/v2/network"
 )
 
@@ -142,6 +143,7 @@ func (cursor *RefCursor) Query() (*DataSet, error) {
 	dataSet, err := cursor._query()
 	if err != nil {
 		if isBadConn(err) {
+			cursor.connection.setBad()
 			tracer.Print("Error: ", err)
 			return nil, driver.ErrBadConn
 		}

v2/simple_object.go

@@ -57,6 +57,7 @@ func (obj *simpleObject) exec() error {
 	var err = obj.write().read()
 	if err != nil {
 		if isBadConn(err) {
+			obj.connection.setBad()
 			tracer.Print("Error: ", err)
 			return driver.ErrBadConn
 		}

v2/utils.go

@@ -6,15 +6,17 @@ import (
 	"database/sql/driver"
 	"errors"
 	"fmt"
-	"github.com/sijms/go-ora/v2/converters"
-	"github.com/sijms/go-ora/v2/network"
 	"io"
+	"net"
 	"reflect"
 	"regexp"
 	"strconv"
 	"strings"
 	"syscall"
 	"time"
+
+	"github.com/sijms/go-ora/v2/converters"
+	"github.com/sijms/go-ora/v2/network"
 )
 
 var (
@@ -944,7 +946,21 @@ func setNumber(value reflect.Value, input float64) error {
 }
 
 func isBadConn(err error) bool {
-	return errors.Is(err, io.EOF) || errors.Is(err, syscall.EPIPE)
+	var opError *net.OpError
+	var oraError *network.OracleError
+	switch {
+	case errors.Is(err, io.EOF):
+		return true
+	case errors.Is(err, syscall.EPIPE):
+		return true
+	case errors.As(err, &opError):
+		if opError.Net == "tcp" && opError.Op == "write" {
+			return true
+		}
+	case errors.As(err, &oraError):
+		return oraError.Bad()
+	}
+	return false
 }
 
 func collectLocators(pars []ParameterInfo) [][]byte {