Skip to content

Commit 391b767

Browse files
laneserbwmis
andauthored
fix: remove scala-tools.org from pom.xml due to shutdown of scala-tools.org repository (#1201)
* fix: remove scala-tools.org * fix: scala mismatch version * fix: add wait for DaemonWorker Listen * fix: rollback logerror * fix: rollback logerror * fix: simplfied listenerReadyTcs --------- Co-authored-by: lane <lane@bridgewell.com>
1 parent 91212b9 commit 391b767

File tree

5 files changed

+17
-35
lines changed

5 files changed

+17
-35
lines changed

benchmark/scala/pom.xml

+1-15
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,11 @@
77
<inceptionYear>2019</inceptionYear>
88
<properties>
99
<encoding>UTF-8</encoding>
10-
<scala.version>2.11.8</scala.version>
10+
<scala.version>2.11.12</scala.version>
1111
<scala.binary.version>2.11</scala.binary.version>
1212
<spark.version>2.4.4</spark.version>
1313
</properties>
1414

15-
<pluginRepositories>
16-
<pluginRepository>
17-
<id>scala</id>
18-
<name>Scala Tools</name>
19-
<url>http://scala-tools.org/repo-releases/</url>
20-
<releases>
21-
<enabled>true</enabled>
22-
</releases>
23-
<snapshots>
24-
<enabled>false</enabled>
25-
</snapshots>
26-
</pluginRepository>
27-
</pluginRepositories>
28-
2915
<dependencies>
3016
<dependency>
3117
<groupId>org.scala-lang</groupId>

src/csharp/Microsoft.Spark.Worker.UnitTest/DaemonWorkerTests.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,23 @@ public DaemonWorkerTests()
2525

2626
[Theory]
2727
[MemberData(nameof(TestData.VersionData), MemberType = typeof(TestData))]
28-
public void TestsDaemonWorkerTaskRunners(string version)
28+
public async void TestsDaemonWorkerTaskRunners(string version)
2929
{
3030
ISocketWrapper daemonSocket = SocketFactory.CreateSocket();
31-
31+
3232
int taskRunnerNumber = 2;
3333
var typedVersion = new Version(version);
3434
var daemonWorker = new DaemonWorker(typedVersion);
35-
36-
Task.Run(() => daemonWorker.Run(daemonSocket));
35+
36+
var _dummyTask = Task.Run(() => daemonWorker.Run(daemonSocket));
37+
await daemonWorker.WaitForListenerReadyAsync();
3738

3839
var clientSockets = new List<ISocketWrapper>();
3940
for (int i = 0; i < taskRunnerNumber; ++i)
4041
{
4142
CreateAndVerifyConnection(daemonSocket, clientSockets, typedVersion);
4243
}
43-
44+
4445
Assert.Equal(taskRunnerNumber, daemonWorker.CurrentNumTaskRunners);
4546
}
4647

src/csharp/Microsoft.Spark.Worker/DaemonWorker.cs

+9
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Linq;
1010
using System.Net;
1111
using System.Threading;
12+
using System.Threading.Tasks;
1213
using Microsoft.Spark.Interop.Ipc;
1314
using Microsoft.Spark.Network;
1415
using Microsoft.Spark.Services;
@@ -46,6 +47,8 @@ internal sealed class DaemonWorker
4647

4748
private readonly Version _version;
4849

50+
private readonly TaskCompletionSource<bool> _listenerReadyTcs = new TaskCompletionSource<bool>();
51+
4952
internal DaemonWorker(Version version)
5053
{
5154
_version = version;
@@ -73,6 +76,7 @@ internal void Run(ISocketWrapper listener)
7376
try
7477
{
7578
listener.Listen();
79+
_listenerReadyTcs.TrySetResult(true);
7680

7781
// Communicate the server port back to the Spark using standard output.
7882
Stream outputStream = Console.OpenStandardOutput();
@@ -100,6 +104,11 @@ internal void Run(ISocketWrapper listener)
100104
}
101105
}
102106

107+
internal Task WaitForListenerReadyAsync()
108+
{
109+
return _listenerReadyTcs.Task;
110+
}
111+
103112
/// <summary>
104113
/// Starts listening to any connection from JVM.
105114
/// </summary>

src/scala/microsoft-spark-2-4/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<inceptionYear>2019</inceptionYear>
1111
<properties>
1212
<encoding>UTF-8</encoding>
13-
<scala.version>2.11.8</scala.version>
13+
<scala.version>2.11.12</scala.version>
1414
<scala.binary.version>2.11</scala.binary.version>
1515
<spark.version>2.4.4</spark.version>
1616
</properties>

src/scala/pom.xml

-14
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,4 @@
1818
<module>microsoft-spark-3-3</module>
1919
<module>microsoft-spark-3-5</module>
2020
</modules>
21-
22-
<pluginRepositories>
23-
<pluginRepository>
24-
<id>scala</id>
25-
<name>Scala Tools</name>
26-
<url>http://scala-tools.org/repo-releases/</url>
27-
<releases>
28-
<enabled>true</enabled>
29-
</releases>
30-
<snapshots>
31-
<enabled>false</enabled>
32-
</snapshots>
33-
</pluginRepository>
34-
</pluginRepositories>
3521
</project>

0 commit comments

Comments
 (0)