Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit 436482e

Browse files
committed
Fix: changed signature of ExternalShuffleClient
Please enter the commit message for your changes. Lines starting
1 parent 823bf0e commit 436482e

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/kubernetes/KubernetesExternalShuffleClient.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ public class KubernetesExternalShuffleClient extends ExternalShuffleClient {
4747
public KubernetesExternalShuffleClient(
4848
TransportConf conf,
4949
SecretKeyHolder secretKeyHolder,
50-
boolean saslEnabled,
51-
boolean saslEncryptionEnabled) {
52-
super(conf, secretKeyHolder, saslEnabled, saslEncryptionEnabled);
50+
boolean saslEnabled) {
51+
super(conf, secretKeyHolder, saslEnabled);
5352
}
5453

55-
public void registerDriverWithShuffleService(String host, int port) throws IOException {
54+
public void registerDriverWithShuffleService(String host, int port)
55+
throws IOException, InterruptedException {
5656
checkInit();
5757
ByteBuffer registerDriver = new RegisterDriver(appId, 0).toByteBuffer();
5858
TransportClient client = clientFactory.createClient(host, port);

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/kubernetes/KubernetesClusterSchedulerBackend.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,7 @@ private[spark] class KubernetesClusterSchedulerBackend(
279279
new KubernetesExternalShuffleClient(
280280
SparkTransportConf.fromSparkConf(conf, "shuffle"),
281281
sc.env.securityManager,
282-
sc.env.securityManager.isAuthenticationEnabled(),
283-
sc.env.securityManager.isSaslEncryptionEnabled())
282+
sc.env.securityManager.isAuthenticationEnabled())
284283
}
285284

286285
private def getInitialTargetExecutorNumber(defaultNumExecutors: Int = 1): Int = {

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/kubernetes/submit/KubernetesExternalShuffleServiceSuite.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ private[spark] class KubernetesExternalShuffleServiceSuite extends SparkFunSuite
3535
val shuffleClient = new KubernetesExternalShuffleClient(
3636
SparkTransportConf.fromSparkConf(SPARK_CONF, "shuffle"),
3737
new SecurityManager(SPARK_CONF),
38-
false,
3938
false)
4039

4140
shuffleService.start()

0 commit comments

Comments
 (0)