Skip to content
Snippets Groups Projects
Commit 3a49ab14 authored by Philip ABBET's avatar Philip ABBET
Browse files

Update to beat.core 1.3.0

parent 791c1de7
No related branches found
No related tags found
No related merge requests found
...@@ -1389,7 +1389,7 @@ class JobSplit(models.Model): ...@@ -1389,7 +1389,7 @@ class JobSplit(models.Model):
self.executor = None self.executor = None
config = simplejson.loads(self.job.block.command) config = simplejson.loads(str(self.job.block.command))
# setup range if necessary # setup range if necessary
if self.job.block.required_slots > 1: if self.job.block.required_slots > 1:
......
...@@ -1140,6 +1140,15 @@ class Block(models.Model): ...@@ -1140,6 +1140,15 @@ class Block(models.Model):
statistics = self.job.result.stats statistics = self.job.result.stats
result_stdout = self.job.result.stdout
result_stderr = self.job.result.stderr
if result_stdout == '\n':
result_stdout = ''
if result_stderr == '\n':
result_stderr = ''
info = dict( info = dict(
cpu_time = statistics.cpu['user'] + statistics.cpu['system'], cpu_time = statistics.cpu['user'] + statistics.cpu['system'],
max_memory = statistics.memory['rss'], max_memory = statistics.memory['rss'],
...@@ -1149,8 +1158,8 @@ class Block(models.Model): ...@@ -1149,8 +1158,8 @@ class Block(models.Model):
data_written_size = statistics.data['volume']['write'], data_written_size = statistics.data['volume']['write'],
data_written_nb_blocks = statistics.data['blocks']['write'], data_written_nb_blocks = statistics.data['blocks']['write'],
data_written_time = statistics.data['time']['write'], data_written_time = statistics.data['time']['write'],
stdout = self.job.result.stdout, stdout = result_stdout,
stderr = self.job.result.stderr, stderr = result_stderr,
error_report = self.job.result.usrerr, error_report = self.job.result.usrerr,
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment