Revision 153d9724 lib/cmdlib.py

b/lib/cmdlib.py
3223 3223
    # the device exists now
3224 3224
    # call the primary node to add the mirror to md
3225 3225
    logger.Info("adding new mirror component to md")
3226
    if not rpc.call_blockdev_addchild(instance.primary_node,
3227
                                           disk, new_drbd):
3226
    if not rpc.call_blockdev_addchildren(instance.primary_node,
3227
                                         disk, [new_drbd]):
3228 3228
      logger.Error("Can't add mirror compoment to md!")
3229 3229
      self.cfg.SetDiskID(new_drbd, remote_node)
3230 3230
      if not rpc.call_blockdev_remove(remote_node, new_drbd):
......
3316 3316
    child = self.child
3317 3317
    logger.Info("remove mirror component")
3318 3318
    self.cfg.SetDiskID(disk, instance.primary_node)
3319
    if not rpc.call_blockdev_removechild(instance.primary_node,
3320
                                              disk, child):
3319
    if not rpc.call_blockdev_removechildren(instance.primary_node,
3320
                                            disk, [child]):
3321 3321
      raise errors.OpExecError("Can't remove child from mirror.")
3322 3322

  
3323 3323
    for node in child.logical_id[:2]:
......
3427 3427
      # the device exists now
3428 3428
      # call the primary node to add the mirror to md
3429 3429
      logger.Info("adding new mirror component to md")
3430
      if not rpc.call_blockdev_addchild(instance.primary_node, dev,
3431
                                        new_drbd):
3430
      if not rpc.call_blockdev_addchildren(instance.primary_node, dev,
3431
                                           [new_drbd]):
3432 3432
        logger.Error("Can't add mirror compoment to md!")
3433 3433
        cfg.SetDiskID(new_drbd, remote_node)
3434 3434
        if not rpc.call_blockdev_remove(remote_node, new_drbd):
......
3462 3462
      dev, child, new_drbd = iv_names[name]
3463 3463
      logger.Info("remove mirror %s component" % name)
3464 3464
      cfg.SetDiskID(dev, instance.primary_node)
3465
      if not rpc.call_blockdev_removechild(instance.primary_node,
3466
                                                dev, child):
3465
      if not rpc.call_blockdev_removechildren(instance.primary_node,
3466
                                              dev, [child]):
3467 3467
        logger.Error("Can't remove child from mirror, aborting"
3468 3468
                     " *this device cleanup*.\nYou need to cleanup manually!!")
3469 3469
        continue

Also available in: Unified diff