LAVA Scheduler (deprecated)

Merge lp:~fu-wei/lava-scheduler/lmp into lp:lava-scheduler

  1. lmp
  2. Merge into trunk
Proposed by Fu Wei
Status: Rejected
Rejected by: Neil Williams
Proposed branch: lp:~fu-wei/lava-scheduler/lmp
Merge into: lp:lava-scheduler
Diff against target: 42 lines (+13/-11)
1 file modified
lava_scheduler_app/utils.py (+13/-11)
To merge this branch: bzr merge lp:~fu-wei/lava-scheduler/lmp
Reviewer Review Type Date Requested Status
Neil Williams Disapprove
Review via email: mp+186348@code.launchpad.net

Description of the change

Fix the bug of LMP init value in Multi-Node 2

To post a comment you must log in.
Revision history for this message
Neil Williams (codehelp) wrote :

Merged into git.

review: Disapprove

Unmerged revisions

265. By Fu Wei

Fix the bug of LMP init value in Multi-Node 2

264. By Fu Wei

Fix the bug of LMP init value in Multi-Node

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_scheduler_app/utils.py'
2--- lava_scheduler_app/utils.py 2013-09-17 14:59:18 +0000
3+++ lava_scheduler_app/utils.py 2013-09-18 14:47:33 +0000
4@@ -75,17 +75,18 @@
5 node_actions[role].append(new_action)
6
7 # For LMP init in multinode case
8- all_lmp_modules = json_jobdata["lmp_module"]
9- for role in node_lmp.keys():
10- for lmp in all_lmp_modules:
11- new_lmp = copy.deepcopy(lmp)
12- if 'parameters' in new_lmp \
13- and 'role' in new_lmp["parameters"]:
14- if new_lmp["parameters"]["role"] == role:
15- new_lmp["parameters"].pop('role', None)
16+ if "lmp_module" in json_jobdata:
17+ all_lmp_modules = json_jobdata["lmp_module"]
18+ for role in node_lmp.keys():
19+ for lmp in all_lmp_modules:
20+ new_lmp = copy.deepcopy(lmp)
21+ if 'parameters' in new_lmp \
22+ and 'role' in new_lmp["parameters"]:
23+ if new_lmp["parameters"]["role"] == role:
24+ new_lmp["parameters"].pop('role', None)
25+ node_lmp[role].append(new_lmp)
26+ else:
27 node_lmp[role].append(new_lmp)
28- else:
29- node_lmp[role].append(new_lmp)
30
31 group_count = 0
32 for clients in json_jobdata["device_group"]:
33@@ -106,7 +107,8 @@
34 node_json[role][c]["group_size"] = group_count
35 node_json[role][c]["target_group"] = target_group
36 node_json[role][c]["actions"] = node_actions[role]
37- node_json[role][c]["lmp_module"] = node_lmp[role]
38+ if "lmp_module" in json_jobdata:
39+ node_json[role][c]["lmp_module"] = node_lmp[role]
40
41 node_json[role][c]["role"] = role
42 # multinode node stage 2

Subscribers

People subscribed via source and target branches