From b047c0ae0d553f84a10eaa369554d30aeb40cf37 Mon Sep 17 00:00:00 2001 From: Sammi Chen Date: Wed, 12 Jul 2023 21:08:15 +0800 Subject: [PATCH] HDDS-8983. Intermittent failure in test-root-ca-rotation.sh due to null certId --- .../apache/hadoop/hdds/scm/security/RootCARotationManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java index 61e032ea0b0e..064691609119 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java @@ -587,6 +587,7 @@ private void sendRotationPrepareAck(String newRootCACertId, String newSubCACertId) { // Send ack to rotationPrepare request try { + handler.setSubCACertId(newSubCACertId); handler.rotationPrepareAck(newRootCACertId, newSubCACertId, scm.getScmId()); LOG.info("SubCARotationPrepareTask[rootCertId = {}] - " + @@ -598,8 +599,6 @@ private void sendRotationPrepareAck(String newRootCACertId, e.getMessage() + ") when sending out rotationPrepare ack"; scm.shutDown(message); } - - handler.setSubCACertId(newSubCACertId); } /**