This is an automated email from the ASF dual-hosted git repository.
neilj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 2281e06e92 HDDS-8521. Fix SCM certificate count check during OM &
Datanode startup. (#4654)
2281e06e92 is described below
commit 2281e06e921857991e9a6d111d50b1b34c7acb18
Author: Nandakumar <[email protected]>
AuthorDate: Sun May 7 07:42:50 2023 +0530
HDDS-8521. Fix SCM certificate count check during OM & Datanode startup.
(#4654)
---
.../framework/src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java
index 055b904d02..4009cbec8c 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java
@@ -463,7 +463,7 @@ public final class HAUtils {
}
/**
- * Retry for ever until CA list matches expected count.
+ * Retry forever until CA list matches expected count.
* @param task - task to get CA list.
* @return CA list.
*/
@@ -489,7 +489,7 @@ public final class HAUtils {
// For now when Client of SCM's are started we compare their node list
// size and ca list size if it is as expected, we return the ca list.
List<String> caCertPemList = applyFunction.get();
- boolean caListUpToDate = caCertPemList.size() == expectedCount;
+ boolean caListUpToDate = caCertPemList.size() >= expectedCount;
if (!caListUpToDate) {
LOG.info("Expected CA list size {}, where as received CA List size " +
"{}.", expectedCount, caCertPemList.size());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
