commit 46dcd9d2724a75c0c0df7ffca7edcc4faa54d1be
author Kent Hagerman <khagerma@ciena.com> Wed Sep 18 16:42:59 2019 -0400
committer David Bainbridge <dbainbri@ciena.com> Fri Sep 20 00:49:05 2019 +0000
tree cd17009a0308428df5be0c7c9874029f9ffbc95d
parent 5f401474e2c1884e2beacd98518f0df3c31b2b88

[VOL-1913] Replies with errors of the form "transaction-not-acquired" are now ignored.

Also had to add a conditional branch in case no valid responses are received (the last thread to exit must clean up the connection).
The rw cores will now respond with a "transaction-not-acquired" error in place of "failed-to-seize-request" or COMPLETED_BY_OTHER.

Change-Id: I199d4a0091ba4fc1db5b8097adbad951408e5034

rw_core/core/adapter_request_handler.go

diff --git a/rw_core/core/adapter_request_handler.go b/rw_core/core/adapter_request_handler.go
index 2b28fa5..bd84bdd 100644
--- a/rw_core/core/adapter_request_handler.go
+++ b/rw_core/core/adapter_request_handler.go
@@ -72,7 +72,7 @@
 		log.Debugw("acquired-request", log.Fields{"xtrnsId": transactionId})
 		return txn, nil
 	} else {
-		return nil, errors.New("failed-to-seize-request")
+		return nil, errorTransactionNotAcquired
 	}
 }
 
@@ -93,7 +93,7 @@
 			log.Debugw("processing-request", log.Fields{"Id": devId})
 			return txn, nil
 		} else {
-			return nil, errors.New("failed-to-seize-request")
+			return nil, errorTransactionNotAcquired
 		}
 	} else {
 		log.Debugw("not-owned-by-me", log.Fields{"Id": devId})
@@ -101,7 +101,7 @@
 			log.Debugw("timeout-processing-request", log.Fields{"Id": devId})
 			return txn, nil
 		} else {
-			return nil, errors.New("device-not-owned")
+			return nil, errorTransactionNotAcquired
 		}
 	}
 }

rw_core/core/grpc_nbi_api_handler.go

diff --git a/rw_core/core/grpc_nbi_api_handler.go b/rw_core/core/grpc_nbi_api_handler.go
index 7f45875..987a3f6 100755
--- a/rw_core/core/grpc_nbi_api_handler.go
+++ b/rw_core/core/grpc_nbi_api_handler.go
@@ -138,7 +138,7 @@
 	} else if txn.Acquired(timeout) {
 		return txn, nil
 	} else {
-		return nil, errors.New("failed-to-seize-request")
+		return nil, errorTransactionNotAcquired
 	}
 }
 
@@ -166,7 +166,7 @@
 			log.Debugw("acquired-transaction", log.Fields{"transaction-timeout": timeout})
 			return txn, nil
 		} else {
-			return nil, errors.New("failed-to-seize-request")
+			return nil, errorTransactionNotAcquired
 		}
 	} else {
 		if txn.Monitor(timeout) {
@@ -174,7 +174,7 @@
 			return txn, nil
 		} else {
 			log.Debugw("transaction-completed-by-other", log.Fields{"timeout": timeout, "waited-time": time.Since(t)})
-			return nil, errors.New(string(COMPLETED_BY_OTHER))
+			return nil, errorTransactionNotAcquired
 		}
 	}
 }
@@ -557,8 +557,8 @@
 
 	if handler.competeForTransaction() {
 		if txn, err := handler.takeRequestOwnership(ctx, &utils.DeviceID{Id: id.Id}); err != nil {
-			// Remove the device in memory
-			if err.Error() == (errors.New(string(COMPLETED_BY_OTHER)).Error()) {
+			if err == errorTransactionNotAcquired && !handler.core.deviceOwnership.OwnedByMe(&utils.DeviceID{Id: id.Id}) {
+				// Remove the device in memory
 				handler.deviceMgr.stopManagingDevice(id.Id)
 			}
 			return new(empty.Empty), err

rw_core/core/transaction.go

diff --git a/rw_core/core/transaction.go b/rw_core/core/transaction.go
index 0d30340..b2d01a4 100644
--- a/rw_core/core/transaction.go
+++ b/rw_core/core/transaction.go
@@ -37,6 +37,8 @@
 import (
 	"github.com/opencord/voltha-go/common/log"
 	"github.com/opencord/voltha-go/db/kvstore"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	"time"
 )
 
@@ -50,6 +52,8 @@
 	STOPPED_WAITING_FOR_KEY
 )
 
+var errorTransactionNotAcquired = status.Error(codes.Canceled, "transaction-not-acquired")
+
 const (
 	TRANSACTION_COMPLETE = "TRANSACTION-COMPLETE"
 )