RANGER-5337: Exception/Error handling in FIPS MK creation failure flow (#698)

vikaskr22 · web-flow · commit e16ce56edeab · 2025-10-08T19:43:02.000+05:30
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
@@ -239,7 +239,7 @@ public RangerKeyStoreProvider(Configuration conf) throws Throwable {
                 try {
                     tempMK = masterKeyProvider.getMasterKey(password).toCharArray();
                 } catch (Throwable e) {
-                    throw new RuntimeException("Error while getting Ranger Master key, Error - " + e.getMessage());
+                    throw new RuntimeException("Error while getting Ranger Master key", e);
                 }
             }
 
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
@@ -362,7 +362,7 @@ public void generateMKFromKeySecureMK(String password, byte[] key) throws Throwa
             String savedKey           = saveEncryptedMK(paddingString + "," + encryptedMasterKey);
 
             if (savedKey != null && !savedKey.trim().equals("")) {
-                logger.debug("Master Key Created with id = " + savedKey);
+                logger.debug("Master Key Created with id = {}", savedKey);
             }
         } else {
             logger.debug("Ranger Master Key already exists in the DB, returning.");

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ public RangerKeyStoreProvider(Configuration conf) throws Throwable {`
`239`	`239`	`try {`
`240`	`240`	`tempMK = masterKeyProvider.getMasterKey(password).toCharArray();`
`241`	`241`	`} catch (Throwable e) {`
`242`		`- throw new RuntimeException("Error while getting Ranger Master key, Error - " + e.getMessage());`
	`242`	`+ throw new RuntimeException("Error while getting Ranger Master key", e);`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ public void generateMKFromKeySecureMK(String password, byte[] key) throws Throwa`
`362`	`362`	`String savedKey = saveEncryptedMK(paddingString + "," + encryptedMasterKey);`
`363`	`363`
`364`	`364`	`if (savedKey != null && !savedKey.trim().equals("")) {`
`365`		`- logger.debug("Master Key Created with id = " + savedKey);`
	`365`	`+ logger.debug("Master Key Created with id = {}", savedKey);`
`366`	`366`	`}`
`367`	`367`	`} else {`
`368`	`368`	`logger.debug("Ranger Master Key already exists in the DB, returning.");`