From 584211347623f646aa99462cba4ad911a97ee4ab Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 18 Apr 2023 13:38:10 +0200
Subject: [PATCH 1/2] Merge pull request #4580 from
 dodona-edu/misc/docker-timings

Add additional timings to submission runner
---
 app/runners/submission_runner.rb | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/runners/submission_runner.rb b/app/runners/submission_runner.rb
index d28e5c0950..d02af52d31 100644
--- a/app/runners/submission_runner.rb
+++ b/app/runners/submission_runner.rb
@@ -64,6 +64,7 @@ def copy_or_create(from, to)
   end
 
   def prepare
+    @start = Time.zone.now
     # set the submission's status
     @submission.status = 'running'
     @submission.save
@@ -82,6 +83,10 @@ def prepare
     copy_or_create(@exercise.full_path.join('workdir'), @mountsrc.join('workdir'))
     copy_or_create(@exercise.full_path.join('evaluation'), @mountsrc.join(@hidden_path, 'resources'))
     copy_or_create(@judge.full_path, @mountsrc.join(@hidden_path, 'judge'))
+
+    end_preparing = Time.zone.now
+    @time_messages = []
+    @time_messages << build_message(format('<strong>Prepare:</strong> %<time>.2f seconds', time: (end_preparing - @start)), 'zeus', 'html')
   end
 
   def execute
@@ -214,10 +219,16 @@ def execute
       ]
     end
 
+    @time_messages << build_message(format('<strong>Runtime:</strong> %<time>.2f seconds', time: (after_time - before_time)), 'zeus', 'html')
+
     result = begin
+      start_rc = Time.zone.now
       rc = ResultConstructor.new @submission.user.lang
       rc.feed(stdout.force_encoding('utf-8'))
-      rc.result(timeout)
+      result = rc.result(timeout)
+      end_rc = Time.zone.now
+      @time_messages << build_message(format('<strong>Result construction:</strong> %<time>.2f seconds', time: (end_rc - start_rc)), 'zeus', 'html')
+      result
     rescue ResultConstructorError => e
       if [134, 137, 143].include? exit_status
         description = timeout ? 'time limit exceeded' : 'memory limit exceeded'
@@ -237,7 +248,6 @@ def execute
 
     result[:messages] ||= []
     result[:messages] << build_message("<strong>Worker:</strong> #{`hostname`.strip}", 'zeus', 'html')
-    result[:messages] << build_message(format('<strong>Runtime:</strong> %<time>.2f seconds', time: (after_time - before_time)), 'zeus', 'html')
     result[:messages] << build_message(format('<strong>Memory usage:</strong> %<memory>.2f MiB', memory: memory), 'zeus', 'html')
     result
   end
@@ -247,9 +257,13 @@ def add_runtime_metrics(result); end
   def finalize
     return if @mountsrc.nil?
 
+    start_final = Time.zone.now
+
     # remove path on file system used as temporary working directory for processing the submission
     FileUtils.remove_entry_secure(@mountsrc, verbose: true)
     @mountsrc = nil
+    end_final = Time.zone.now
+    @time_messages << build_message(format('<strong>Finalize:</strong> %<time>.2f seconds', time: (end_final - start_final)), 'zeus', 'html')
   end
 
   def run
@@ -261,6 +275,8 @@ def run
     ]
   ensure
     finalize
+    @time_messages << build_message(format('<strong>Total time:</strong> %<time>.2f seconds', time: (Time.zone.now - @start)), 'zeus', 'html')
+    result[:messages]&.concat @time_messages
     result
   end
 

From 6bf26bec25a0905da8638260c2836260005ba1a7 Mon Sep 17 00:00:00 2001
From: jorg-vr <jorg.vr@live.be>
Date: Tue, 18 Apr 2023 15:32:19 +0200
Subject: [PATCH 2/2] Bump version

---
 config/initializers/00_version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/00_version.rb b/config/initializers/00_version.rb
index ac48a9f1be..c07f498e37 100644
--- a/config/initializers/00_version.rb
+++ b/config/initializers/00_version.rb
@@ -3,7 +3,7 @@ class Application
     module Version
       MAJOR = 6
       MINOR = 7
-      PATCH = 1
+      PATCH = 2
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end