1. 08 Aug, 2011 5 commits
    • Guido Trotter's avatar
      cluster-merge: consider file storage enable state · bb074298
      Guido Trotter authored
      
      
      There's no point in checking whether the file storage dir in the two
      clusters is the same if file storage is not even enabled
      Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
      Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
      bb074298
    • Iustin Pop's avatar
      Allow fixing of split instances via relocate · e3a19474
      Iustin Pop authored
      
      
      Currently, the IAllocator code requests strictly that the (set of) groups of
      the nodes we're relocating from is equal to the set of groups we're
      relocating to.
      
      This, however, makes is impossible to fix split instances, since (by
      definition) the secondary of a split instance is not in the same group
      as the primary node, and after the fixing is it the same.
      
      The patch changes the test from group equality to check that the final
      group set (across both primary and secondary nodes) is a subset of the
      initial group set (again across both nodes). This means we can't
      "extend" the group of nodes but keeping the same or decreasing it is
      allowed.
      
      After this patch, one can finally fix (automatically) split instances
      via a gnt-instance replace-disks.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
      e3a19474
    • Iustin Pop's avatar
      Revert deprecation of evacuate mode in hail · 88df1fa9
      Iustin Pop authored
      As discussed offline, the new node-change mode could be used for
      evacuation, but it's not directly useful as it returns a list of
      opcodes; therefore, we need to partially revert commits fbe5fcf6 and
      5b53ca79
      
       that removed it (and multi-evacuate, which remains removed).
      
      The new version of relocate is actually just a wrapper over the
      tryNodeEvac (which does the node evacuate); we run that and then we do
      some extra checks that the nodes we got from that function are
      consistent with the instance's new state.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
      88df1fa9
    • Iustin Pop's avatar
      Further cleanup after multi-evacuate removal · f5fab862
      Iustin Pop authored
      Commit f0edfcf6
      
       removed the parsing of multi-evacuate result, but the
      code went from:
      
        if mode in (multi-evac, relocate):
          …
          if mode == relocate:
            …
      
      to:
      
        if mode == relocate:
          …
          if mode == relocate
            …
      
      This patch simply removes the nested if.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
      f5fab862
    • Iustin Pop's avatar
      Fix bug in IAllocator parsing of Evacuate result · 2f41ea77
      Iustin Pop authored
      Commit 342f9172
      
       added stricter checks for the iallocator result in
      evacuate mode, but it does this irrespective of the result
      status. When the result has failed and (according to the design) the
      list of nodes is empty, this code will trigger the following:
      
          node1# gnt-instance replace-disks -I hail instance14
          Failure: command execution error:
          Groups of nodes returned by iallocator () differ from original groups (default)
      
      After the patch, the result is:
      
          node1# gnt-instance replace-disks -I hail instance14
          Failure: prerequisites not met for this operation:
          error type: insufficient_resources, error details:
          Can't compute nodes using iallocator 'hail': Request failed: …
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
      2f41ea77
  2. 05 Aug, 2011 15 commits
  3. 04 Aug, 2011 17 commits
  4. 03 Aug, 2011 3 commits