1. 21 Feb, 2011 1 commit
    • Iustin Pop's avatar
      Merge branch 'devel-2.4' into stable-2.4 · b31393a1
      Iustin Pop authored
      
      
      * devel-2.4: (23 commits)
        Fix pylint warnings
        Change the list formatting to a 'special' chars
        Add support for merging node groups
        Add option to rename groups on conflict
        Fix minor docstring typo
        Fix HV/OS parameter validation on non-vm nodes
        NodeQuery: mark live fields as UNAVAIL for non-vm_capable nodes
        NodeQuery: don't query non-vm_capable nodes
        Remove superfluous redundant requirement
        Don't remove master_candidate flag from merged nodes
        Use a consistent ECID base
        listrunner: convert from getopt to optparse
        listrunner: fix agent usage
        Revert "Disable the cluster-merge tool for the moment"
        Fix cluster-merging by not stopping noded
        Fix error msg for instances on offline nodes
        Minor reordering to match param order
        cluster verify and instance disks on offline nodes
        Cluster verify and N+1 warnings for offline nodes
        Handle gnt-instance shutdown --all for empty clusters
        Use gnt-node add --force-join to add foreign nodes
        Add --force-join option to gnt-node add
        Fix iterating over node groups
      
      Of the above commits present in the devel-2.4 branch, only the “Add
      --force-join option to gnt-node add” is a potential issue, but this
      has been QA-ed successfully. The other fixes are split in three
      groups:
      
      - non-core changes (cluster-merge, listrunner)
      - trivial fixes (docstrings, etc.)
      - bugs that we want fixed
      
      As such, instead of cherry-picking only individual patches, I propose
      that we unify stable and devel 2.4 and make a new RC out of the
      result.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
      b31393a1
  2. 18 Feb, 2011 8 commits
  3. 17 Feb, 2011 8 commits
  4. 16 Feb, 2011 2 commits
  5. 14 Feb, 2011 2 commits
  6. 10 Feb, 2011 1 commit
  7. 09 Feb, 2011 4 commits
    • Iustin Pop's avatar
      Fix error msg for instances on offline nodes · 11dcce87
      Iustin Pop authored
      
      
      Currently, for both primary and secondary offline nodes, we give the
      same message:
      - ERROR: instance instance14: instance lives on offline node(s) node3
      - ERROR: instance instance15: instance lives on offline node(s) node3
      - ERROR: instance instance16: instance lives on offline node(s) node3
      - ERROR: instance instance17: instance lives on offline node(s) node3
      
      This is confusing, as an offline primary is in a different category
      than a secondary. The patch changes the warnings to have different
      error messages:
      - ERROR: instance instance14: instance has offline secondary node(s) node3
      - ERROR: instance instance15: instance has offline secondary node(s) node3
      - ERROR: instance instance16: instance lives on offline node node3
      - ERROR: instance instance17: instance lives on offline node node3
      
      Thanks to Alexander Schreiber <als@google.com> for reporting this
      issue.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarAlexander Schreiber <als@google.com>
      11dcce87
    • Stephen Shirley's avatar
      3d2e7a27
    • Iustin Pop's avatar
      cluster verify and instance disks on offline nodes · a3de2ae7
      Iustin Pop authored
      
      
      Currently, cluster-verify says:
      
      - ERROR: instance instance14: couldn't retrieve status for disk/0 on node3: node offline
      - ERROR: instance instance14: instance lives on offline node(s) node3
      - ERROR: instance instance15: couldn't retrieve status for disk/0 on node3: node offline
      - ERROR: instance instance15: instance lives on offline node(s) node3
      
      This is redundant as the “lives on offline node” message should be all we need to
      understand the cluster situation.
      
      The patch fixes this and also corrects a very old idiom.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarStephen Shirley <diamond@google.com>
      a3de2ae7
    • Iustin Pop's avatar
      Cluster verify and N+1 warnings for offline nodes · f7661f6b
      Iustin Pop authored
      
      
      Currently, cluster verify shows warnings N+1 warnings for offline
      nodes having any redundant instances since the memory data that we
      have for those nodes is zero, so any instance will trigger the
      warning.
      
      As the comment says, we already list secondary instances on offline
      nodes, so that warning is enough, and we skip the N+1 one.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarStephen Shirley <diamond@google.com>
      f7661f6b
  8. 08 Feb, 2011 1 commit
  9. 04 Feb, 2011 5 commits
  10. 03 Feb, 2011 5 commits
    • Iustin Pop's avatar
      Bump up intra-cluster import connect timeout · 81635b5a
      Iustin Pop authored
      
      
      Currently, the export timeout is 10 times 20 seconds, but the import
      is only 30 seconds. I'm raising this to 60 seconds with two goals in
      mind:
      
      - when debugging manually, this allows for easier synchronisation of
        the processes
      - 60 equals to 3 full 20 second intervals, which I think is better
        than just one an a half
      
      This change shouldn't make a big difference either way (at most, it
      will possibly delay the job in case of failures by half a minute).
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
      81635b5a
    • Iustin Pop's avatar
      Import-export: fix logging of daemon output · c9300bb3
      Iustin Pop authored
      
      
      In case of failures, the recent daemon output is logged as %r on a
      list of unicode strings, which results in the (ugly):
      
      Thu Feb  3 05:13:34 2011 snapshot/0 failed to send data: Exited with status 1 (recent output: [u'  DUMP: Date of this level 0 dump: Thu Feb  3 05:13:18 2011', u'  DUMP: Dumping /dev/mapper/6369a5f7-1e67-4d0d-a4f0-956b3649c6d7.disk0_data.snap-1 (an unlisted file system) to standard output', u'  DUMP: Label: none', u'  DUMP: Writing 10 Kilobyte records', u'  DUMP: mapping (Pass I) [regular files]', u'  DUMP: mapping (Pass II) [directories]', u'  DUMP: estimated 54301 blocks.', u'  DUMP: Volume 1 started with block 1 at: Thu Feb  3 05:13:19 2011', u'  DUMP: dumping (Pass III) [directories]', u'  DUMP: dumping (Pass IV) [regular files]', u'socat: E SSL_write(): Connection reset by peer', u"dd: dd: writing `standard output': Broken pipe", u'  DUMP: Broken pipe', u'  DUMP: The ENTIRE dump is aborted.'])
      
      This patch joins this list and makes it a non-unicode string, thus
      resulting in the more readable (and ~10% shorter):
      
      Thu Feb  3 05:16:04 2011 snapshot/0 failed to send data: Exited with status 1 (recent output:   DUMP: Date of this level 0 dump: Thu Feb  3 05:15:58 2011\n  DUMP: Dumping /dev/mapper/6369a5f7-1e67-4d0d-a4f0-956b3649c6d7.disk0_data.snap-1 (an unlisted file system) to standard output\n  DUMP: Label: none\n  DUMP: Writing 10 Kilobyte records\n  DUMP: mapping (Pass I) [regular files]\n  DUMP: mapping (Pass II) [directories]\n  DUMP: estimated 54350 blocks.\n  DUMP: Volume 1 started with block 1 at: Thu Feb  3 05:15:59 2011\n  DUMP: dumping (Pass III) [directories]\nsocat: E SSL_write(): Connection reset by peer\ndd: dd: writing `standard output': Broken pipe\n  DUMP: Broken pipe\n  DUMP: The ENTIRE dump is aborted.)
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
      c9300bb3
    • Iustin Pop's avatar
      Fix handling of ^C in the CLI scripts · 8a53b55f
      Iustin Pop authored
      
      
      This adds a message and nice handling of ^C, especially useful for
      ``gnt-job watch``.
      Signed-off-by: default avatarIustin Pop <iustin@google.com>
      Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
      8a53b55f
    • Michael Hanselmann's avatar
      Merge branch 'devel-2.3' into devel-2.4 · ee841437
      Michael Hanselmann authored
      
      
      * devel-2.3:
        backend: Disable compression in export info file
      Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
      Reviewed-by: default avatarIustin Pop <iustin@google.com>
      ee841437
    • Michael Hanselmann's avatar
      backend: Disable compression in export info file · 775b8743
      Michael Hanselmann authored
      
      
      The new import/export infrastructure in Ganeti 2.2 and up handles
      compression differently. It no longer writes compressed files to the
      destination. Unfortunately changing this behaviour would be non-trivial,
      so in the meantime setting “compression = none” will hopefully avoid
      some confusion.
      Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
      Reviewed-by: default avatarIustin Pop <iustin@google.com>
      775b8743
  11. 02 Feb, 2011 3 commits