Bug 37112885 - [36611680->25.03] Fix very intermittent concurrent acc…

…ess failure accessing pendingPolls as a thread unsafe InflatableMap (main->ce-main) Remote remote.full on coherence-ce/main success, changes 111654, synced @111654, job.9.20240927230714.29308 [git-p4: depot-paths = "//dev/coherence-ce/main/": change = 111656]
oracle · Sep 28, 2024 · 7fd018b · 7fd018b
1 parent e08f771
commit 7fd018b
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/...coherence-core-components/src/main/java/com/tangosol/coherence/component/net/Cluster.java b/...coherence-core-components/src/main/java/com/tangosol/coherence/component/net/Cluster.java
@@ -117,6 +117,7 @@
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.naming.NamingException;
 
 /**
@@ -13494,8 +13495,10 @@ public void __init()
                 // state initialization: public and protected properties
                 try
                     {
+                    // identified pendingPolls required thread-safe data structure and
+                    // verified that pendingConfigUpdates only accessed on single service thread, see details in COH-30132.
                     setPendingConfigUpdates(new java.util.LinkedList());
-                    setPendingPolls(new com.tangosol.util.LiteMap());
+                    setPendingPolls(new ConcurrentHashMap<>());
                     }
                 catch (java.lang.Exception e)
                     {
@@ -36849,8 +36852,10 @@ public void __init()
                 // state initialization: public and protected properties
                 try
                     {
+                    // identified pendingPolls required thread-safe data structure and
+                    // verified that pendingConfigUpdates only accessed on single service thread, see details in COH-30132.
                     setPendingConfigUpdates(new java.util.LinkedList());
-                    setPendingPolls(new com.tangosol.util.LiteMap());
+                    setPendingPolls(new ConcurrentHashMap<>());
                     }
                 catch (java.lang.Exception e)
                     {

diff --git a/...ce-core-components/src/main/java/com/tangosol/coherence/component/util/ServiceConfig.java b/...ce-core-components/src/main/java/com/tangosol/coherence/component/util/ServiceConfig.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -87,8 +87,10 @@ public void __init()
         // state initialization: public and protected properties
         try
             {
+            // identified pendingPolls required thread-safe data structure and
+            // verified that pendingConfigUpdates only accessed on single service thread, see details in COH-30132.
             setPendingConfigUpdates(new java.util.LinkedList());
-            setPendingPolls(new com.tangosol.util.LiteMap());
+            setPendingPolls(new ConcurrentHashMap<>());
             }
         catch (java.lang.Exception e)
             {

diff --git a/...c/main/java/com/tangosol/coherence/component/util/daemon/queueProcessor/service/Grid.java b/...c/main/java/com/tangosol/coherence/component/util/daemon/queueProcessor/service/Grid.java
@@ -14977,8 +14977,10 @@ public void __init()
             // state initialization: public and protected properties
             try
                 {
+                // identified pendingPolls required thread-safe data structure and
+                // verified that pendingConfigUpdates only accessed on single service thread, see details in COH-30132.
                 setPendingConfigUpdates(new java.util.LinkedList());
-                setPendingPolls(new com.tangosol.util.LiteMap());
+                setPendingPolls(new ConcurrentHashMap<>());
                 }
             catch (java.lang.Exception e)
                 {

diff --git a/...gosol/coherence/component/util/daemon/queueProcessor/service/grid/PartitionedService.java b/...gosol/coherence/component/util/daemon/queueProcessor/service/grid/PartitionedService.java
@@ -19616,8 +19616,10 @@ public void __init()
             // state initialization: public and protected properties
             try
                 {
+                // identified pendingPolls required thread-safe data structure and
+                // verified that pendingConfigUpdates only accessed on single service thread, see details in COH-30132.
                 setPendingConfigUpdates(new java.util.LinkedList());
-                setPendingPolls(new com.tangosol.util.LiteMap());
+                setPendingPolls(new ConcurrentHashMap<>());
                 }
             catch (java.lang.Exception e)
                 {

diff --git a/...omponent/util/daemon/queueProcessor/service/grid/partitionedService/PartitionedCache.java b/...omponent/util/daemon/queueProcessor/service/grid/partitionedService/PartitionedCache.java
@@ -39721,8 +39721,10 @@ public void __init()
             // state initialization: public and protected properties
             try
                 {
+                // identified pendingPolls required thread-safe data structure and
+                // verified that pendingConfigUpdates only accessed on single service thread, see details in COH-30132.
                 setPendingConfigUpdates(new java.util.LinkedList());
-                setPendingPolls(new com.tangosol.util.LiteMap());
+                setPendingPolls(new ConcurrentHashMap<>());
                 }
             catch (java.lang.Exception e)
                 {

diff --git a/...il/daemon/queueProcessor/service/grid/partitionedService/partitionedCache/PagedTopic.java b/...il/daemon/queueProcessor/service/grid/partitionedService/partitionedCache/PagedTopic.java
@@ -5208,8 +5208,10 @@ public void __init()
             // state initialization: public and protected properties
             try
                 {
+                // identified pendingPolls required thread-safe data structure and
+                // verified that pendingConfigUpdates only accessed on single service thread, see details in COH-30132.
                 setPendingConfigUpdates(new java.util.LinkedList());
-                setPendingPolls(new com.tangosol.util.LiteMap());
+                setPendingPolls(new ConcurrentHashMap<>());
                 }
             catch (java.lang.Exception e)
                 {