Revision 099ed3b2

b/lib/cmdlib/cluster.py
2618 2618
    node_disks = {}
2619 2619
    node_disks_devonly = {}
2620 2620
    diskless_instances = set()
2621
    nodisk_instances = set()
2621 2622
    diskless = constants.DT_DISKLESS
2622 2623

  
2623 2624
    for nuuid in node_uuids:
......
2630 2631
               for disk in instanceinfo[inst_uuid].disks]
2631 2632

  
2632 2633
      if not disks:
2634
        nodisk_instances.update(uuid for uuid in node_inst_uuids
2635
                                if instanceinfo[uuid].disk_template != diskless)
2633 2636
        # No need to collect data
2634 2637
        continue
2635 2638

  
......
2687 2690
    for inst_uuid in diskless_instances:
2688 2691
      assert inst_uuid not in instdisk
2689 2692
      instdisk[inst_uuid] = {}
2693
    # ...and disk-full instances that happen to have no disks
2694
    for inst_uuid in nodisk_instances:
2695
      assert inst_uuid not in instdisk
2696
      instdisk[inst_uuid] = {}
2690 2697

  
2691 2698
    assert compat.all(len(statuses) == len(instanceinfo[inst].disks) and
2692 2699
                      len(nuuids) <= len(instanceinfo[inst].all_nodes) and

Also available in: Unified diff