This is an automated email from the ASF dual-hosted git repository.

pifta 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 b6ee694156 HDDS-8983. Intermittent failure in test-root-ca-rotation.sh 
due to null certId (#5052)
b6ee694156 is described below

commit b6ee694156762271a96855bcafd8987debe68b32
Author: Sammi Chen <[email protected]>
AuthorDate: Thu Jul 13 09:54:58 2023 +0800

    HDDS-8983. Intermittent failure in test-root-ca-rotation.sh due to null 
certId (#5052)
---
 .../org/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 61e032ea0b..0646916091 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 @@ public class RootCARotationManager implements SCMService {
       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 @@ public class RootCARotationManager implements SCMService {
           e.getMessage() + ") when sending out rotationPrepare ack";
       scm.shutDown(message);
     }
-
-    handler.setSubCACertId(newSubCACertId);
   }
 
   /**


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to