Skip to content

HDDS-7355. non-primordial scm fail to get signed cert from primordial SCM when converting an unsecure cluster to secure #3859

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
kaijchen merged 3 commits into from
Oct 20, 2022
Merged

HDDS-7355. non-primordial scm fail to get signed cert from primordial SCM when converting an unsecure cluster to secure #3859

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18aa192
HDDS-7355. non-primordial scm fail to get signed cert from primordial…
Oct 19, 2022
212b3dd
Merge remote-tracking branch 'origin/master' into HDDS-7355
Oct 19, 2022
04e7a06
Merge remote-tracking branch 'origin/master' into HDDS-7355
Oct 19, 2022
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
15 changes: 9 additions & 6 deletions ...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,8 @@ public static boolean scmBootstrap(OzoneConfiguration conf)
scmStorageConfig.getScmId());

// Initialize security if security is enabled later.
initializeSecurityIfNeeded(conf, scmhaNodeDetails, scmStorageConfig);
initializeSecurityIfNeeded(
conf, scmhaNodeDetails, scmStorageConfig, false);

return true;
}
Expand All @@ -1097,7 +1098,8 @@ public static boolean scmBootstrap(OzoneConfiguration conf)
}

// Initialize security if security is enabled later.
initializeSecurityIfNeeded(conf, scmhaNodeDetails, scmStorageConfig);
initializeSecurityIfNeeded(
conf, scmhaNodeDetails, scmStorageConfig, false);

} else {
try {
Expand Down Expand Up @@ -1136,14 +1138,15 @@ public static boolean scmBootstrap(OzoneConfiguration conf)
* @param scmStorageConfig
* @throws IOException
*/
private static void initializeSecurityIfNeeded(OzoneConfiguration conf,
SCMHANodeDetails scmhaNodeDetails, SCMStorageConfig scmStorageConfig)
private static void initializeSecurityIfNeeded(
OzoneConfiguration conf, SCMHANodeDetails scmhaNodeDetails,
SCMStorageConfig scmStorageConfig, boolean isPrimordial)
throws IOException {
// Initialize security if security is enabled later.
if (OzoneSecurityUtil.isSecurityEnabled(conf)
&& scmStorageConfig.getScmCertSerialId() == null) {
HASecurityUtils.initializeSecurity(scmStorageConfig, conf,
getScmAddress(scmhaNodeDetails, conf), true);
getScmAddress(scmhaNodeDetails, conf), isPrimordial);
scmStorageConfig.forceInitialize();
LOG.info("SCM unsecure cluster is converted to secure cluster. " +
"Persisted SCM Certificate SerialID {}",
Expand Down Expand Up @@ -1233,7 +1236,7 @@ public static boolean scmInit(OzoneConfiguration conf,
final boolean isSCMHAEnabled = scmStorageConfig.isSCMHAEnabled();

// Initialize security if security is enabled later.
initializeSecurityIfNeeded(conf, haDetails, scmStorageConfig);
initializeSecurityIfNeeded(conf, haDetails, scmStorageConfig, true);

if (SCMHAUtils.isSCMHAEnabled(conf) && !isSCMHAEnabled) {
SCMRatisServerImpl.initialize(scmStorageConfig.getClusterID(),
Expand Down