This is an automated email from the ASF dual-hosted git repository. madhan pushed a commit to branch ranger-2.7 in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 31546fde6cbc91a5b011f9a046dec0fc11db8a50 Author: Vikas Kumar <[email protected]> AuthorDate: Fri Apr 11 22:28:14 2025 +0530 RANGER-5169: Error while migrating Masterkey from older format to external key store (#556) (cherry picked from commit 1b8482a02de45cc32cf8c5c675d7c59e339e153f) --- kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java index 7e4880011..83b82cf65 100755 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java @@ -74,11 +74,12 @@ public class RangerMasterKey implements RangerKMSMKI { private final RangerMasterKeyDao masterKeyDao; public RangerMasterKey() { - this.masterKeyDao = null; + this(null); } public RangerMasterKey(DaoManager daoManager) { this.masterKeyDao = daoManager != null ? daoManager.getRangerMasterKeyDao() : null; + init(); } protected static String getConfig(String key, String defaultValue) { @@ -232,7 +233,6 @@ public void generateMKFromHSMMK(String password, byte[] key) throws Throwable { logger.debug("==> RangerMasterKey.generateMKFromHSMMK()"); } - init(); if( ! checkMKExistence(this.masterKeyDao)) { logger.info("Master Key doesn't exist in DB, Generating the Master Key"); String encryptedMasterKey = encryptMasterKey(password, key); @@ -305,7 +305,6 @@ public void generateMKFromKeySecureMK(String password, byte[] key) throws Throwa logger.debug("==> RangerMasterKey.generateMKFromKeySecureMK()"); } - init(); if( ! checkMKExistence(this.masterKeyDao)) { logger.info("Master Key doesn't exist in DB, Generating the Master Key"); String encryptedMasterKey = encryptMasterKey(password, key);
