This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 253b217 HADOOP-13500. Synchronizing iteration of Configuration
properties object (#3775)
253b217 is described below
commit 253b217efa1650bbd6da35b0eeeb3d7504171ecb
Author: Dhananjay Badaya <[email protected]>
AuthorDate: Fri Dec 17 12:35:46 2021 +0530
HADOOP-13500. Synchronizing iteration of Configuration properties object
(#3775)
Signed-off-by: Akira Ajisaka <[email protected]>
(cherry picked from commit 4483607a4edc0f13264f4ea37abd90aba97e1ef0)
---
.../java/org/apache/hadoop/conf/Configuration.java | 10 +++++---
.../org/apache/hadoop/conf/TestConfiguration.java | 29 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
index 14af61c..7301af6 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
@@ -2906,11 +2906,13 @@ public class Configuration implements
Iterable<Map.Entry<String,String>>,
// methods that allow non-strings to be put into configurations are
removed,
// we could replace properties with a Map<String,String> and get rid of
this
// code.
- Map<String,String> result = new HashMap<String,String>();
- for(Map.Entry<Object,Object> item: getProps().entrySet()) {
- if (item.getKey() instanceof String &&
- item.getValue() instanceof String) {
+ Properties props = getProps();
+ Map<String, String> result = new HashMap<>();
+ synchronized (props) {
+ for (Map.Entry<Object, Object> item : props.entrySet()) {
+ if (item.getKey() instanceof String && item.getValue() instanceof
String) {
result.put((String) item.getKey(), (String) item.getValue());
+ }
}
}
return result.entrySet().iterator();
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
index aebefe0..209d0c9 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
@@ -38,6 +38,7 @@ import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.ConcurrentModificationException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -45,6 +46,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Random;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Pattern;
import static java.util.concurrent.TimeUnit.*;
@@ -2590,4 +2592,31 @@ public class TestConfiguration {
assertEquals(" prefix >cdata\nsuffix ", conf.get("cdata-whitespace"));
return conf;
}
+
+ @Test
+ public void testConcurrentModificationDuringIteration() throws
InterruptedException {
+ Configuration configuration = new Configuration();
+ new Thread(() -> {
+ while (true) {
+ configuration.set(String.valueOf(Math.random()),
String.valueOf(Math.random()));
+ }
+ }).start();
+
+ AtomicBoolean exceptionOccurred = new AtomicBoolean(false);
+
+ new Thread(() -> {
+ while (true) {
+ try {
+ configuration.iterator();
+ } catch (final ConcurrentModificationException e) {
+ exceptionOccurred.set(true);
+ break;
+ }
+ }
+ }).start();
+
+ Thread.sleep(1000); //give enough time for threads to run
+
+ assertFalse("ConcurrentModificationException occurred",
exceptionOccurred.get());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
