Use more conservative pool_size

.github/workflows/main.yml

@@ -16,6 +16,8 @@ jobs:
     env:
       NOT_CRAN: true
       R_LANGSVR_LOG: /tmp/languageserver/log
+      R_LANGSVR_POOL_SIZE: 1
+      R_LANGSVR_TEST_FAST: NO
     steps:
     - uses: actions/checkout@v1
     - name: Install apt-get dependencies
@@ -49,6 +51,8 @@ jobs:
     env:
       NOT_CRAN: true
       R_LANGSVR_LOG: /tmp/languageserver/log
+      R_LANGSVR_POOL_SIZE: 1
+      R_LANGSVR_TEST_FAST: NO
     steps:
     - uses: actions/checkout@v1
     - uses: r-lib/actions/setup-r@v1
@@ -78,6 +82,8 @@ jobs:
     env:
       NOT_CRAN: true
       R_LANGSVR_LOG: C:/tmp/languageserver/log
+      R_LANGSVR_POOL_SIZE: 1
+      R_LANGSVR_TEST_FAST: NO
     steps:
     - uses: actions/checkout@v1
     - uses: r-lib/actions/setup-r@v1
@@ -92,9 +98,7 @@ jobs:
     - name: Running Tests
       run: |
         New-Item -ItemType directory -Path C:/tmp/languageserver
-        # rcmdcheck is not working very well with the task session
-        # Rscript -e "rcmdcheck::rcmdcheck(args = c('--as-cran', '--no-manual', '--timings'), error_on = 'error')"
-        Rscript -e "devtools::test()"
+        Rscript -e "rcmdcheck::rcmdcheck(args = c('--as-cran', '--no-manual', '--timings'), error_on = 'error')"
     - uses: actions/upload-artifact@v1
       if: failure()
       with:

R/languageclient.R

@@ -23,7 +23,7 @@ LanguageClient <- R6::R6Class("LanguageClient",
 
         finalize = function() {
             if (!is.null(self$process)) {
-                self$process$kill()
+                self$process$kill_tree()
             }
             super$finalize()
         },

R/languageserver.R

@@ -53,7 +53,8 @@ LanguageServer <- R6::R6Class("LanguageServer",
             self$outputcon <- outputcon
 
             cpus <- parallel::detectCores()
-            pool_size <- min(max(cpus, 2), 3)
+            pool_size <- as.integer(
+                Sys.getenv("R_LANGSVR_POOL_SIZE", min(max(floor(cpus / 2), 1), 3)))
             # parse pool
             parse_pool <- SessionPool$new(pool_size, "parse")
             # diagnostics is slower, so use a seperated pool

R/session.R

@@ -73,7 +73,8 @@ Session <- R6::R6Class("Session",
             private$id <- id
 
             private$session <- callr::r_session$new(
-                callr::r_session_options(system_profile = TRUE, user_profile = TRUE),
+                callr::r_session_options(
+                    system_profile = TRUE, user_profile = TRUE, supervise = TRUE),
                 # skip waiting
                 wait = FALSE
             )

tests/testthat/helper-utils.R

@@ -38,13 +38,17 @@ language_client <- function(working_dir = getwd(), diagnostics = FALSE, capabili
     client %>% notify(
         "workspace/didChangeConfiguration", list(settings = list(diagnostics = diagnostics)))
     withr::defer_parent({
-        if (Sys.getenv("R_COVR", "") == "true") {
-            # it is necessary to shutdown the server in covr
-            # we skip this for other times for speed
+        # it is sometimes necessary to shutdown the server probably
+        # we skip this for other times for speed
+        if (Sys.getenv("R_LANGSVR_TEST_FAST", "YES") == "NO") {
             client %>% respond("shutdown", NULL, retry = FALSE)
-            client$process$wait()
+            client$process$wait(30)
+            if (client$process$is_alive()) {
+                client$process$kill_tree()
+                fail("server did not shutdown peacefully")
+            }
         } else {
-            client$stop()
+            client$process$kill_tree()
         }
     })
     client