← Back to branch summary

~ubuntu-branches/ubuntu/vivid/slurm-llnl/vivid

« back to all changes in this revision

Viewing changes to src/slurmctld/node_mgr.c

  • Committer: Bazaar Package Importer
  • Author(s): Gennaro Oliva
  • Date: 2011-05-06 10:48:55 UTC
  • mfrom: (3.3.17 sid)
  • Revision ID: james.westby@ubuntu.com-20110506104855-689k27p8y71vit5x
Tags: 2.2.5-1
New upstream release 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/slurmctld/node_mgr.c
399
399
                               node_name);
400
400
                } else if (state_only) {
401
401
                        uint16_t orig_flags;
402
 
                        orig_flags = node_ptr->node_state & NODE_STATE_FLAGS;
403
402
                        node_cnt++;
404
403
                        if (IS_NODE_UNKNOWN(node_ptr)) {
405
404
                                if (base_state == NODE_STATE_DOWN) {
 
405
                                        orig_flags = node_ptr->node_state &
 
406
                                                     NODE_STATE_FLAGS;
406
407
                                        node_ptr->node_state = NODE_STATE_DOWN
407
408
                                                | orig_flags;
408
409
                                }
413
414
                                        node_ptr->node_state |=
414
415
                                                NODE_STATE_FAIL;
415
416
                                if (node_state & NODE_STATE_POWER_SAVE) {
416
 
                                        if (power_save_mode) {
 
417
                                        if (power_save_mode &&
 
418
                                            IS_NODE_UNKNOWN(node_ptr)) {
 
419
                                                orig_flags = node_ptr->
 
420
                                                             node_state &
 
421
                                                             NODE_STATE_FLAGS;
 
422
                                                node_ptr->node_state =
 
423
                                                        NODE_STATE_IDLE |
 
424
                                                        orig_flags |
 
425
                                                        NODE_STATE_POWER_SAVE;
 
426
                                        } else if (power_save_mode) {
417
427
                                                node_ptr->node_state |=
418
428
                                                        NODE_STATE_POWER_SAVE;
419
429
                                        } else if (hs)