[CLIENT-3205] Multi record transactions: support correct server error…

… codes for MRTs (#701) - [CLIENT-3199] Do not close/delete MRT monitor record on abort/commit when a write command in that MRT fails and is in doubt - [CLIENT-3212] Raise TranactionFailed exception instead of BatchFailed exception when batch MRT verify fails. - Always unlock macOS keychain on self-hosted macOS runners to prevent workflow from failing
aerospike · Dec 9, 2024 · 11d64db · 11d64db
1 parent 0ab340b
commit 11d64db
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -325,7 +325,8 @@ jobs:
           ref: ${{ env.COMMIT_SHA_TO_BUILD_AND_TEST }}
 
       # Need to be able to save Docker Hub credentials to keychain
-      - if: ${{ inputs.platform-tag == 'macosx_arm64' && inputs.use-server-rc }}
+      # Unable to do this via the ansible script for self hosted mac m1 runners
+      - if: ${{ inputs.platform-tag == 'macosx_arm64' }}
         run: security unlock-keychain -p ${{ secrets.MAC_M1_SELF_HOSTED_RUNNER_PW }}
 
       - uses: ./.github/actions/run-ee-server

diff --git a/aerospike-client-c b/aerospike-client-c
diff --git a/src/main/exception.c b/src/main/exception.c
@@ -111,6 +111,8 @@ struct exception_def exception_defs[] = {
                   AEROSPIKE_ERR_ASYNC_CONNECTION, NULL),
     EXCEPTION_DEF("ClientAbortError", CLIENT_ERR_EXCEPTION_NAME,
                   AEROSPIKE_ERR_CLIENT_ABORT, NULL),
+    EXCEPTION_DEF("TranactionFailed", CLIENT_ERR_EXCEPTION_NAME,
+                  AEROSPIKE_TXN_FAILED, NULL),
     // Server errors
     EXCEPTION_DEF("InvalidRequest", SERVER_ERR_EXCEPTION_NAME,
                   AEROSPIKE_ERR_REQUEST_INVALID, NULL),
+38 −33		src/include/aerospike/as_status.h
+4 −4		src/include/aerospike/as_txn.h
+1 −1		src/include/aerospike/version.h
+0 −3		src/main/aerospike/aerospike_batch.c
+0 −3		src/main/aerospike/aerospike_key.c
+14 −3		src/main/aerospike/aerospike_txn.c
+7 −6		src/main/aerospike/as_error.c
+2 −1		src/main/aerospike/as_txn.c
+1 −10		src/main/aerospike/as_txn_monitor.c
+1 −1		src/main/aerospike/version.c
+28 −13		src/test/aerospike_test.c
+6 −0		src/test/transaction.c
+6 −0		src/test/transaction_async.c
+1 −1		vs/aerospike-client-c-libevent.nuspec
+1 −1		vs/aerospike-client-c-libuv.nuspec
+1 −1		vs/aerospike-client-c.nuspec