Skip to content

[SPARK-53825] Use Java MessageDigest instead of org.apache.commons.codec #373

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

Closed
dongjoon-hyun wants to merge 1 commit into from
Closed

[SPARK-53825] Use Java MessageDigest instead of org.apache.commons.codec #373

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 deletions ...bmission-worker/src/main/java/org/apache/spark/k8s/operator/SparkAppSubmissionWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,17 @@

package org.apache.spark.k8s.operator;

import static java.nio.charset.StandardCharsets.UTF_8;

import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.List;
import java.util.Map;

import scala.Option;

import io.fabric8.kubernetes.client.KubernetesClient;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.collections4.MapUtils;

import org.apache.spark.SparkConf;
Expand Down Expand Up @@ -68,6 +71,17 @@ public class SparkAppSubmissionWorker {
/** Property name for the Spark master URL prefix. */
public static final String MASTER_URL_PREFIX_PROPS_NAME = "spark.master.url.prefix";

/** SHA256 Message Digest when generating hash-based identifier. */
private static final ThreadLocal<MessageDigest> SHA_256_THREAD_LOCAL =
ThreadLocal.withInitial(
() -> {
try {
return MessageDigest.getInstance("SHA-256");
} catch (NoSuchAlgorithmException e) {
throw new UnsupportedOperationException(e);
}
});

/**
* Build secondary resource spec for given app with Spark developer API, with defaults / overrides
* as:
Expand Down Expand Up @@ -202,8 +216,9 @@ public static String generateSparkAppId(final SparkApplication app) {
* @return The generated hash-based ID.
*/
public static String generateHashBasedId(final String prefix, final String... identifiers) {
final MessageDigest sha256 = SHA_256_THREAD_LOCAL.get();
String sha256Hash =
new BigInteger(1, DigestUtils.sha256(String.join("/", identifiers)))
new BigInteger(1, sha256.digest(String.join("/", identifiers).getBytes(UTF_8)))
.toString(DEFAULT_ENCODE_BASE);
String truncatedIdentifiersHash =
sha256Hash.substring(0, DEFAULT_HASH_BASED_IDENTIFIER_LENGTH_LIMIT);
Expand Down
Loading