azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make daemon connection more reliable by retrying on certain exceptions

Browse Source 
(cherry picked from commit 74a0711)
This commit is contained in:
Ilya Chernikov
2017-02-17 11:52:06 +03:00
parent c7a2422314
commit 4202bde550
1 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
+34 -11
View File
@@ -28,6 +28,9 @@ import org.jetbrains.kotlin.utils.addToStdlib.check
import java.io.File import java.io.File
import java.io.OutputStream import java.io.OutputStream
import java.io.PrintStream import java.io.PrintStream
import java.net.SocketException
import java.rmi.ConnectException
import java.rmi.UnmarshalException
import java.rmi.server.UnicastRemoteObject import java.rmi.server.UnicastRemoteObject
import java.util.concurrent.Semaphore import java.util.concurrent.Semaphore
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@@ -73,19 +76,39 @@ object KotlinCompilerClient {
): CompileService? { ): CompileService? {
var attempts = 0 var attempts = 0
fun retryOrRethrow(e: Exception) {
if (attempts < DAEMON_CONNECT_CYCLE_ATTEMPTS) {
reportingTargets.report(DaemonReportCategory.INFO, "retrying($attempts) on:" + e.toString())
}
else throw e
}
try { try {
while (attempts++ < DAEMON_CONNECT_CYCLE_ATTEMPTS) { while (attempts < DAEMON_CONNECT_CYCLE_ATTEMPTS) {
val (service, newJVMOptions) = tryFindSuitableDaemonOrNewOpts(File(daemonOptions.runFilesPath), compilerId, daemonJVMOptions, { cat, msg -> reportingTargets.report(cat, msg) }) try {
if (service != null) { attempts += 1
// the newJVMOptions could be checked here for additional parameters, if needed val (service, newJVMOptions) = tryFindSuitableDaemonOrNewOpts(File(daemonOptions.runFilesPath), compilerId, daemonJVMOptions, { cat, msg -> reportingTargets.report(cat, msg) })
service.registerClient(clientAliveFlagFile.absolutePath) if (service != null) {
reportingTargets.report(DaemonReportCategory.DEBUG, "connected to the daemon") // the newJVMOptions could be checked here for additional parameters, if needed
return service service.registerClient(clientAliveFlagFile.absolutePath)
reportingTargets.report(DaemonReportCategory.DEBUG, "connected to the daemon")
return service
}
reportingTargets.report(DaemonReportCategory.DEBUG, "no suitable daemon found")
if (autostart) {
startDaemon(compilerId, newJVMOptions, daemonOptions, reportingTargets)
reportingTargets.report(DaemonReportCategory.DEBUG, "new daemon started, trying to find it")
}
} }
reportingTargets.report(DaemonReportCategory.DEBUG, "no suitable daemon found") catch (e: SocketException) {
if (autostart) { retryOrRethrow(e)
startDaemon(compilerId, newJVMOptions, daemonOptions, reportingTargets) }
reportingTargets.report(DaemonReportCategory.DEBUG, "new daemon started, trying to find it") catch (e: ConnectException) {
retryOrRethrow(e)
}
catch (e: UnmarshalException) {
retryOrRethrow(e)
} }
} }
} }