Merge lp:~stylesen/lava-dispatcher/fix-bug-1224260 into lp:lava-dispatcher

Proposed by Senthil Kumaran S on 2013-09-12
Status: Merged
Approved by: Senthil Kumaran S on 2013-09-12
Approved revision: 682
Merged at revision: 682
Proposed branch: lp:~stylesen/lava-dispatcher/fix-bug-1224260
Merge into: lp:lava-dispatcher
Diff against target: 14 lines (+3/-1)
1 file modified
lava_dispatcher/actions/lava_test_shell.py (+3/-1)
To merge this branch: bzr merge lp:~stylesen/lava-dispatcher/fix-bug-1224260
Reviewer Review Type Date Requested Status
Neil Williams 2013-09-12 Approve on 2013-09-12
Review via email: mp+185210@code.launchpad.net

Description of the change

Fix bug #1224260 - split_multi_job makes assumptions about the job JSON that are not enforced by the schema.

Always do not assume we have logging_level specified in the job JSON.

To post a comment you must log in.
Neil Williams (codehelp) wrote :

This change doesn't cover the second part of the bug which is the presence or lack of tags in the original submission which needs a change in scheduler.

I'll sort out the schema validation for this and #1224033 and to prevent similar bugs in the future.

Let's merge this part because it is still necessary.

review: Approve
Senthil Kumaran S (stylesen) wrote :

Hi Neil,

On Thursday 12 September 2013 01:17 PM, Neil Williams wrote:
> This change doesn't cover the second part of the bug which is the presence or lack of tags in the original submission which needs a change in scheduler.
>
> I'll sort out the schema validation for this and #1224033 and to prevent similar bugs in the future.
>
> Let's merge this part because it is still necessary.

I request you to check the following MP for scheduler related changes:

https://code.launchpad.net/~stylesen/lava-scheduler/fix-bug-1224260/+merge/185211

Thank You.
--
Senthil Kumaran
http://www.stylesen.org/
http://www.sasenthilkumaran.com/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_dispatcher/actions/lava_test_shell.py'
2--- lava_dispatcher/actions/lava_test_shell.py 2013-08-28 14:55:50 +0000
3+++ lava_dispatcher/actions/lava_test_shell.py 2013-09-12 07:12:28 +0000
4@@ -648,7 +648,9 @@
5 else:
6 fout.write("LAVA_TEST_BIN='%s/bin'\n" % target.deployment_data['lava_test_dir'])
7 fout.write("LAVA_MULTI_NODE_CACHE='%s'\n" % LAVA_MULTI_NODE_CACHE_FILE)
8- if self.context.test_data.metadata['logging_level'] == 'DEBUG':
9+ logging_level = self.context.test_data.metadata.get(\
10+ 'logging_level', None)
11+ if logging_level and logging_level == 'DEBUG':
12 fout.write("LAVA_MULTI_NODE_DEBUG='yes'\n")
13 fout.write(fin.read())
14 os.fchmod(fout.fileno(), XMOD)

Subscribers

People subscribed via source and target branches