Merge pull request #8358 from sfc-gh-ajbeamon/bindingtester-fixes

Fix some binding tester issues

bindings/java/src/test/com/apple/foundationdb/test/Context.java

@@ -84,8 +84,8 @@ abstract class Context implements Runnable, AutoCloseable {
 		try {
 			executeOperations();
 		} catch(Throwable t) {
-			// EAT
 			t.printStackTrace();
+			System.exit(1);
 		}
 		while(children.size() > 0) {
 			//System.out.println("Shutting down...waiting on " + children.size() + " threads");
@@ -147,10 +147,11 @@ abstract class Context implements Runnable, AutoCloseable {
 	private static synchronized boolean newTransaction(Database db, Optional<Tenant> tenant, String trName, boolean allowReplace) {
 		TransactionState oldState = transactionMap.get(trName);
 		if (oldState != null) {
-			releaseTransaction(oldState.transaction);
-		}
-		else if (!allowReplace) {
-			return false;
+			if (allowReplace) {
+				releaseTransaction(oldState.transaction);
+			} else {
+				return false;
+			}
 		}
 
 		TransactionState newState = new TransactionState(createTransaction(db, tenant), tenant);

contrib/Joshua/scripts/bindingTestScript.sh

@@ -83,6 +83,7 @@ fi
 # Stop the cluster
 if stopCluster; then
 	unset FDBSERVERID
+	trap - EXIT
 fi
 
 exit "${status}"

contrib/Joshua/scripts/localClusterStart.sh

@@ -210,7 +210,7 @@ function stopCluster
   then
     # Ensure that process is dead
     if ! kill -0 "${FDBSERVERID}" 2> /dev/null; then
-      log "Killed cluster (${FDBSERVERID}) via cli"
+      log "Killed cluster (${FDBSERVERID}) via cli" "${DEBUGLEVEL}"
     elif ! kill -9 "${FDBSERVERID}"; then
       log "Failed to kill FDB Server process (${FDBSERVERID}) via cli or kill command"
       let status="${status} + 1"