From 6294fc45df855e2e337ba6406d9ca109661b3d41 Mon Sep 17 00:00:00 2001
From: mattison chao <mattisonchao@gmail.com>
Date: Wed, 9 Feb 2022 16:51:18 +0800
Subject: [PATCH 1/5] Fix performance issue to avoid unnessary loop.

---
 .../main/java/org/apache/bookkeeper/tls/BookieAuthZFactory.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/BookieAuthZFactory.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/BookieAuthZFactory.java
index c047977c383..be55ca18f3f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/BookieAuthZFactory.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/BookieAuthZFactory.java
@@ -95,6 +95,7 @@ public void onProtocolUpgrade() {
                         for (String allowedRole : allowedRoles) {
                             if (certRole[0].equals(allowedRole)) {
                                 authorized = true;
+                                break;
                             }
                         }
                         if (authorized) {

From 3add1a439bb3941164c7a8c8eabcf109eb59c72b Mon Sep 17 00:00:00 2001
From: mattison chao <mattisonchao@gmail.com>
Date: Thu, 10 Feb 2022 09:14:53 +0800
Subject: [PATCH 2/5] Flaky-test

---
 .github/ISSUE_TEMPLATE/flaky_test.md          | 31 +++++++++++++++++++
 .../DefaultEnsemblePlacementPolicy.java       |  4 +--
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/flaky_test.md

diff --git a/.github/ISSUE_TEMPLATE/flaky_test.md b/.github/ISSUE_TEMPLATE/flaky_test.md
new file mode 100644
index 00000000000..5a47191a9c7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/flaky_test.md
@@ -0,0 +1,31 @@
+---
+name: Flaky test
+about: Report a flaky test failure
+title: 'Flaky-test: test_class.test_method'
+labels: ["component/test", "flaky-tests"]
+assignees: ''
+---
+<!--- 
+
+Instructions for reporting a flaky test using this issue template:
+
+1. Replace test_class in title and body with the short test class name WITHOUT the package name.
+2. Replace test_method in title and body with the test method that failed. Multiple methods are flaky, remove the content that refers to the test method.
+3. Replace "relevant parts of the exception stacktrace here" with the a few lines of the stack trace that shows at least the exception message and the line of test code where the stacktrace occurred.
+4. Replace "full exception stacktrace here" with the full exception stacktrace from logs. This section will be hidden by default.
+5. Remove all unused fields / content to unclutter the reported issue. Remove this comment too.
+
+-->
+test_class.test_method is flaky. It fails sporadically.
+
+```
+[relevant parts of the exception stacktrace here]
+```
+
+<!-- optionally provide the full stacktrace ->
+<details>
+<summary>Full exception stacktrace</summary>
+<code><pre>
+full exception stacktrace here
+</pre></code>
+</details>
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java
index 811766ba88d..0da51698832 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java
@@ -206,9 +206,7 @@ public EnsemblePlacementPolicy initialize(ClientConfiguration conf,
     public void updateBookieInfo(Map<BookieId, BookieInfo> bookieInfoMap) {
         rwLock.writeLock().lock();
         try {
-            for (Map.Entry<BookieId, BookieInfo> e : bookieInfoMap.entrySet()) {
-                this.bookieInfoMap.put(e.getKey(), e.getValue());
-            }
+            this.bookieInfoMap.putAll(bookieInfoMap);
             this.weightedSelection.updateMap(this.bookieInfoMap);
         } finally {
             rwLock.writeLock().unlock();

From bc01f04bbf69aa633dcee1c9e1ec0f5c7bde8b32 Mon Sep 17 00:00:00 2001
From: mattison chao <mattisonchao@gmail.com>
Date: Thu, 10 Feb 2022 09:18:43 +0800
Subject: [PATCH 3/5] Revert "Fix performance issue to avoid unnessary loop."

This reverts commit 6294fc45df855e2e337ba6406d9ca109661b3d41.
---
 .../main/java/org/apache/bookkeeper/tls/BookieAuthZFactory.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/BookieAuthZFactory.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/BookieAuthZFactory.java
index be55ca18f3f..c047977c383 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/BookieAuthZFactory.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/tls/BookieAuthZFactory.java
@@ -95,7 +95,6 @@ public void onProtocolUpgrade() {
                         for (String allowedRole : allowedRoles) {
                             if (certRole[0].equals(allowedRole)) {
                                 authorized = true;
-                                break;
                             }
                         }
                         if (authorized) {

From d3000a269d274518ff4f7cceac702ff0dbf21bf0 Mon Sep 17 00:00:00 2001
From: mattison chao <mattisonchao@gmail.com>
Date: Thu, 10 Feb 2022 09:19:07 +0800
Subject: [PATCH 4/5] Revert useless commit

---
 .../bookkeeper/client/DefaultEnsemblePlacementPolicy.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java
index 0da51698832..811766ba88d 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/DefaultEnsemblePlacementPolicy.java
@@ -206,7 +206,9 @@ public EnsemblePlacementPolicy initialize(ClientConfiguration conf,
     public void updateBookieInfo(Map<BookieId, BookieInfo> bookieInfoMap) {
         rwLock.writeLock().lock();
         try {
-            this.bookieInfoMap.putAll(bookieInfoMap);
+            for (Map.Entry<BookieId, BookieInfo> e : bookieInfoMap.entrySet()) {
+                this.bookieInfoMap.put(e.getKey(), e.getValue());
+            }
             this.weightedSelection.updateMap(this.bookieInfoMap);
         } finally {
             rwLock.writeLock().unlock();

From b190f869c8878d9469b84bf0e9d74db971f6550e Mon Sep 17 00:00:00 2001
From: mattison chao <mattisonchao@gmail.com>
Date: Thu, 10 Feb 2022 09:24:38 +0800
Subject: [PATCH 5/5] Fixes label

---
 .github/ISSUE_TEMPLATE/flaky_test.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/flaky_test.md b/.github/ISSUE_TEMPLATE/flaky_test.md
index 5a47191a9c7..fc8159776c7 100644
--- a/.github/ISSUE_TEMPLATE/flaky_test.md
+++ b/.github/ISSUE_TEMPLATE/flaky_test.md
@@ -2,7 +2,7 @@
 name: Flaky test
 about: Report a flaky test failure
 title: 'Flaky-test: test_class.test_method'
-labels: ["component/test", "flaky-tests"]
+labels: ["area/tests", "flaky-tests"]
 assignees: ''
 ---
 <!---