Revision f9518d38 lib/cmdlib.py

b/lib/cmdlib.py
2923 2923 
  """
2924 2924 
  port = cfg.AllocatePort()
2925 2925 
  vgname = cfg.GetVGName()
2926 
  shared_secret = cfg.GenerateDRBDSecret()
2926 2927 
  dev_data = objects.Disk(dev_type=constants.LD_LV, size=size,
2927 2928 
                          logical_id=(vgname, names[0]))
2928 2929 
  dev_meta = objects.Disk(dev_type=constants.LD_LV, size=128,
2929 2930 
                          logical_id=(vgname, names[1]))
2930 2931 
  drbd_dev = objects.Disk(dev_type=constants.LD_DRBD8, size=size,
2931 2932 
                          logical_id=(primary, secondary, port,
2932 
                                      p_minor, s_minor),
2933 
                                      p_minor, s_minor,
2934 
                                      shared_secret),
2933 2935 
                          children=[dev_data, dev_meta],
2934 2936 
                          iv_name=iv_name)
2935 2937 
  return drbd_dev
......
4050 4052 
      # create new devices on new_node
4051 4053 
      if pri_node == dev.logical_id[0]:
4052 4054 
        new_logical_id = (pri_node, new_node,
4053 
                          dev.logical_id[2], dev.logical_id[3], new_minor)
4055 
                          dev.logical_id[2], dev.logical_id[3], new_minor,
4056 
                          dev.logical_id[5])
4054 4057 
      else:
4055 4058 
        new_logical_id = (new_node, pri_node,
4056 
                          dev.logical_id[2], new_minor, dev.logical_id[4])
4059 
                          dev.logical_id[2], new_minor, dev.logical_id[4],
4060 
                          dev.logical_id[5])
4057 4061 
      iv_names[dev.iv_name] = (dev, dev.children, new_logical_id)
4058 4062 
      logging.debug("Allocated new_minor: %s, new_logical_id: %s", new_minor,
4059 4063 
                    new_logical_id)
......
4079 4083 
    done = 0
4080 4084 
    for dev in instance.disks:
4081 4085 
      cfg.SetDiskID(dev, pri_node)
4082 
      # set the physical (unique in bdev terms) id to None, meaning
4083 
      # detach from network
4084 
      dev.physical_id = (None, None, None, None, dev.physical_id[4])
4086 
      # set the network part of the physical (unique in bdev terms) id
4087 
      # to None, meaning detach from network
4088 
      dev.physical_id = (None, None, None, None) + dev.physical_id[4:]
4085 4089 
      # and 'find' the device, which will 'fix' it to match the
4086 4090 
      # standalone state
4087 4091 
      if rpc.call_blockdev_find(pri_node, dev):

Also available in: Unified diff