Merge branch 'mysql-5.7-cluster-7.5' into mysql-5.7-cluster-7.6

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);
                     }
                 }