Merge pull request #418 from mp-access/dev

v0.14.0

Author: a-a-hofmann

.circleci/config.yml

@@ -83,8 +83,9 @@ jobs:
       - run:
           name: Send test coverage to Codacy
           command: |
-            curl -Ls -o codacy-coverage-reporter-assembly.jar $(curl -Ls https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r '.assets | map({content_type, browser_download_url} | select(.content_type | contains("java-archive"))) | .[0].browser_download_url')
-            java -jar codacy-coverage-reporter-assembly.jar report -l Java -r build/reports/jacoco/test/jacocoTestReport.xml
+            #curl -Ls -o codacy-coverage-reporter-assembly.jar $(curl -Ls https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r '.assets | map({content_type, browser_download_url} | select(.content_type | contains("java-archive"))) | .[0].browser_download_url')
+            #java -jar codacy-coverage-reporter-assembly.jar report -l Java -r build/reports/jacoco/test/jacocoTestReport.xml
+            echo "Codacy parsing disabled until it works again"
 
       - run:
           name: Create ACCESS local tester

src/main/java/ch/uzh/ifi/access/coderunner/CodeRunner.java

@@ -173,12 +173,28 @@ private boolean startContainerWithTimeout(String containerId, long timeout, Time
             logger.error("Failed to start and wait for container", e);
         } catch (TimeoutException e) {
             logger.debug("Execution of student code took longer than configured timeout. Stopping container {}", containerId);
-            docker.killContainer(containerId, DockerClient.Signal.SIGKILL);
+            killContainer(containerId);
             didTimeout = true;
         }
         return didTimeout;
     }
 
+    private void killContainer(final String containerId) {
+        try {
+            docker.killContainer(containerId, DockerClient.Signal.SIGKILL);
+        } catch (Exception nestedException) {
+            logger.error("Something unexpected happened while trying to kill the container {}. " +
+                    "It might be that the container stopped right after the timeout limit, " +
+                    "but before it could be killed programmatically. Trying to pull info on container...", containerId, nestedException);
+            try {
+                ContainerState containerInfo = docker.inspectContainer(containerId).state();
+                logger.warn("Container is still running: " + containerInfo.health().log());
+            } catch (Exception healthException) {
+                logger.error("Failed to pull health logs on container ${}. Will not attempt to dig any further.", containerId, healthException);
+            }
+        }
+    }
+
     private void copyDirectoryToContainer(String containerId, Path folder) throws InterruptedException, DockerException, IOException {
         docker.copyToContainer(folder, containerId, DOCKER_CODE_FOLDER);
         StringJoiner joiner = new StringJoiner("\n", String.format("Files copied to container @%s:\n", DOCKER_CODE_FOLDER), "").setEmptyValue("No files");

src/main/java/ch/uzh/ifi/access/student/evaluation/process/EvalMachineRepoService.java

@@ -47,7 +47,12 @@ public void removeMachinesOlderThan(Instant threshold) {
             // A machine which has never completed and has been running for too long, should be removed
             boolean isZombieMachine = startedTime != null && startedTime.isBefore(threshold) && completionTime == null;
             if (isZombieMachine) {
-                logger.info("Found a zombie machine {}. Started {}: {}", entry.getKey(), startedTime, machine.toString());
+                logger.info("Found a zombie machine {}, will forcibly set state to {}. Started {}: {}", entry.getKey(), EvalMachine.Events.FINISH, startedTime, machine.toString());
+                try {
+                    machine.sendEvent(EvalMachine.Events.FINISH);
+                } catch (Exception e) {
+                    logger.error("Failed to forcibly set the state of the zombie machine to {}", EvalMachine.Events.FINISH, e);
+                }
             }
 
             // A machine which has completed normally and has finished for longer than threshold, can be safely removed

src/main/java/ch/uzh/ifi/access/student/evaluation/process/step/DelegateCodeExecStep.java

@@ -52,7 +52,7 @@ public EvalMachine.Events execute(String submissionId) {
                         submissionService.saveSubmission(submission);
 
                     } catch (InterruptedException | DockerException | IOException e) {
-                        logger.error(e.getMessage());
+                        logger.error("Something unexpected happened while attempting to run student code", e);
                     }
                 } else {
                     logger.warn("Submission without registered exercise found (submissionId:" + submissionId + ").");