HBASE-24074 ConcurrentModificationException occured in ReplicationSou…

…rceManager while refreshing the peer (apache#1471) Signed-off-by: Huaxiang Sun <[email protected]> Signed-off-by: stack <[email protected]>
thangTang · Apr 16, 2020 · 341f064 · 341f064
1 parent c997642
commit 341f064
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.../main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java b/.../main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
@@ -496,11 +496,13 @@ public void refreshSources(String peerId) throws IOException {
     // synchronized on oldsources to avoid race with NodeFailoverWorker
     synchronized (this.oldsources) {
       List<String> previousQueueIds = new ArrayList<>();
-      for (ReplicationSourceInterface oldSource : this.oldsources) {
+      for (Iterator<ReplicationSourceInterface> iter = this.oldsources.iterator(); iter
+          .hasNext();) {
+        ReplicationSourceInterface oldSource = iter.next();
         if (oldSource.getPeerId().equals(peerId)) {
           previousQueueIds.add(oldSource.getQueueId());
           oldSource.terminate(terminateMessage);
-          this.oldsources.remove(oldSource);
+          iter.remove();
         }
       }
       for (String queueId : previousQueueIds) {