Revision d5cd389c

b/lib/cmdlib.py
7012 7012
      self.lu.LogStep(cstep, steps_total, "Removing old storage")
7013 7013
      cstep += 1
7014 7014
      self._RemoveOldStorage(self.target_node, iv_names)
7015
      # only release the lock if we're doing secondary replace, since
7016
      # we use the primary node later
7017
      if self.target_node != self.instance.primary_node:
7018
        self._ReleaseNodeLock(self.target_node)
7015
      # WARNING: we release both node locks here, do not do other RPCs
7016
      # than WaitForSync to the primary node
7017
      self._ReleaseNodeLock([self.target_node, self.other_node])
7019 7018

  
7020 7019
    # Wait for sync
7021 7020
    # This can fail as the old devices are degraded and _WaitForSync
......
7170 7169
      self.lu.LogStep(cstep, steps_total, "Removing old storage")
7171 7170
      cstep += 1
7172 7171
      self._RemoveOldStorage(self.target_node, iv_names)
7173
      self._ReleaseNodeLock([self.target_node, self.new_node])
7172
      # WARNING: we release all node locks here, do not do other RPCs
7173
      # than WaitForSync to the primary node
7174
      self._ReleaseNodeLock([self.instance.primary_node,
7175
                             self.target_node,
7176
                             self.new_node])
7174 7177

  
7175 7178
    # Wait for sync
7176 7179
    # This can fail as the old devices are degraded and _WaitForSync

Also available in: Unified diff