Bug#28550140 FIX RECONNECTTEST IN CLUSTERJ

This bug report, from 2018, notes that on rare occasions the test
ReconnectTest will fail and report "Retry count too low: 0"; the
problem report says "the retry count is too low due to a race
condition in the threads run by the test."

In my analysis, I found that a test thread obtains a lock on the
retryCount when incrementing it (line 339; line 358; line 371)
but that the main thread neglects to acquire this lock when reading
the retryCount at line 197.

Replace retryCount with an AtomicInteger, and reenable the test.

This patch is for 7.5 and up.

Change-Id: I62563be7d94f7431f90855a1cf717a24991124bc

Author: jdduncan

storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/ReconnectTest.java

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 
 package testsuite.clusterj;
 
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -35,7 +36,6 @@
 import testsuite.clusterj.model.Order;
 import testsuite.clusterj.model.OrderLine;
 
-@org.junit.Ignore("Bug#28550140 : disable test until diagnosis of failure")
 public class ReconnectTest extends AbstractClusterJModelTest {
 
     @Override
@@ -194,10 +194,10 @@ public void test() {
             }
         }
         // summarize for the record
-        if (retryCount < 5) error ("Retry count too low: " + retryCount);
+        if (retryCount.get() < 5) error ("Retry count too low: " + retryCount.get());
         if (getDebug()) {
-            System.out.println("Retry count: " + retryCount);
-            System.out.println("Number of threads: " + numberOfThreads + 
+            System.out.println("Retry count: " + retryCount.get());
+            System.out.println("Number of threads: " + numberOfThreads +
                 "; number of new customers per thread: " + numberOfNewCustomersPerThread +
                 "; number of orders per new customer: " + numberOfNewOrdersPerNewCustomer);
             System.out.println("Created " + nextCustomerId + " customers; " +
@@ -249,12 +249,8 @@ public void test() {
         failOnError();
     }
 
-    private int retryCount = 0;
-    private void incrementRetryCount() {
-        synchronized(this) {
-            ++retryCount;
-        }
-    }
+    private AtomicInteger retryCount = new AtomicInteger();
+
     class Misbehaving implements Runnable {
         @Override
         public void run() {
@@ -336,7 +332,7 @@ public void run() {
                 } catch (ClusterJUserException cjue) {
                     if (getDebug()) { System.out.println("StuffToDo: create customer caught " + cjue.getMessage()); }
                     if (cjue.getMessage().contains("SessionFactory is not open")) {
-                        incrementRetryCount();
+                        retryCount.getAndIncrement();
                         sleep(300);
                     }
                 }
@@ -355,7 +351,7 @@ public void run() {
                 } catch (ClusterJUserException cjue) {
                     if (getDebug()) { System.out.println("StuffToDo: update orders caught " + cjue.getMessage()); }
                     if (cjue.getMessage().contains("SessionFactory is not open")) {
-                        incrementRetryCount();
+                        retryCount.getAndIncrement();
                         sleep(300);
                     }
                 }
@@ -372,7 +368,7 @@ public void run() {
                 } catch (ClusterJUserException cjue) {
                     if (getDebug()) { System.out.println("StuffToDo: delete order caught " + cjue.getMessage()); }
                     if (cjue.getMessage().contains("SessionFactory is not open")) {
-                        incrementRetryCount();
+                        retryCount.getAndIncrement();
                         sleep(300);
                     }
                 }