Skip to content

HDDS-5257. Avoid SCM call to get CA certs in non-HA from OM. #2273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bharatviswa504 merged 2 commits into from
May 21, 2021
Merged

HDDS-5257. Avoid SCM call to get CA certs in non-HA from OM. #2273

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87d28f7
HDDS-5257. Avoid SCM call to get CA certs in non-HA from OM.
bharatviswa504 May 20, 2021
609b354
little refactor
bharatviswa504 May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HAUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,42 +359,35 @@ public static File getMetaDir(DBDefinition definition,
*/
public static List<String> buildCAList(CertificateClient certClient,
ConfigurationSource configuration) throws IOException {
List<String> caCertPemList;
long waitDuration =
configuration.getTimeDuration(OZONE_SCM_CA_LIST_RETRY_INTERVAL,
OZONE_SCM_CA_LIST_RETRY_INTERVAL_DEFAULT, TimeUnit.SECONDS);
if (certClient != null) {
caCertPemList = new ArrayList<>();
if (!SCMHAUtils.isSCMHAEnabled(configuration)) {
if (certClient.getRootCACertificate() != null) {
caCertPemList.add(CertificateCodec.getPEMEncodedString(
certClient.getRootCACertificate()));
}
caCertPemList.add(CertificateCodec.getPEMEncodedString(
certClient.getCACertificate()));
return generateCAList(certClient);
} else {
Collection<String> scmNodes = SCMHAUtils.getSCMNodeIds(configuration);
int expectedCount = scmNodes.size() + 1;
if (scmNodes.size() > 1) {
// First check if cert client has ca list initialized.
// This is being done, when this method is called multiple times we
// don't make call to SCM, we return from in-memory.
caCertPemList = certClient.getCAList();
List<String> caCertPemList = certClient.getCAList();
if (caCertPemList != null && caCertPemList.size() == expectedCount) {
return caCertPemList;
}
caCertPemList = getCAListWithRetry(() ->
waitForCACerts(certClient::updateCAList, expectedCount),
return getCAListWithRetry(() ->
waitForCACerts(certClient::updateCAList, expectedCount),
waitDuration);
} else {
caCertPemList = certClient.listCA();
return generateCAList(certClient);
}
}
} else {
SCMSecurityProtocolClientSideTranslatorPB scmSecurityProtocolClient =
HddsServerUtil.getScmSecurityClient(configuration);
if (!SCMHAUtils.isSCMHAEnabled(configuration)) {
caCertPemList = new ArrayList<>();
List<String> caCertPemList = new ArrayList<>();
SCMGetCertResponseProto scmGetCertResponseProto =
scmSecurityProtocolClient.getCACert();
if (scmGetCertResponseProto.hasX509Certificate()) {
Expand All @@ -403,18 +396,32 @@ public static List<String> buildCAList(CertificateClient certClient,
if (scmGetCertResponseProto.hasX509RootCACertificate()) {
caCertPemList.add(scmGetCertResponseProto.getX509RootCACertificate());
}
return caCertPemList;
} else {
Collection<String> scmNodes = SCMHAUtils.getSCMNodeIds(configuration);
int expectedCount = scmNodes.size() + 1;
if (scmNodes.size() > 1) {
caCertPemList = getCAListWithRetry(() -> waitForCACerts(
return getCAListWithRetry(() -> waitForCACerts(
scmSecurityProtocolClient::listCACertificate,
expectedCount), waitDuration);
} else{
caCertPemList = scmSecurityProtocolClient.listCACertificate();
return scmSecurityProtocolClient.listCACertificate();
}
}
}
}

private static List<String> generateCAList(CertificateClient certClient)
throws IOException {
List<String> caCertPemList = new ArrayList<>();
if (certClient.getRootCACertificate() != null) {
caCertPemList.add(CertificateCodec.getPEMEncodedString(
certClient.getRootCACertificate()));
}
if (certClient.getCACertificate() != null) {
caCertPemList.add(CertificateCodec.getPEMEncodedString(
certClient.getCACertificate()));
}
return caCertPemList;
}

Expand Down