On Mon, May 18, 2015 at 04:11:34PM +0200, 'Klaus Aehlig' via ganeti-devel wrote:


commit fb1ab6a71e1fd319f64c3598782ab8d5eb1990bd
Merge: cb50990 4431be3
Author: Klaus Aehlig <[email protected]>
Date:   Mon May 18 16:07:23 2015 +0200

   Merge branch 'stable-2.12' into stable-2.13

   * stable-2.12
     Add a unit test for the Gluster storage type
     Add missing Gluster storage verification checks
     Add Gluster type to the node storage reporting set
     Introduce the Gluster storage type
     Revision bump to 2.12.4
     Update NEWS for 2.12.4
     Ignore *.dyn* files generated by GHC 7.8
     Replace HFLAGS_NOPROF with HFLAGS_DYNAMIC in the Makefile

   * stable-2.11
     (no changes)

   * stable-2.10
     Check for gnt-cluster before running gnt-cluster upgrade

   Conflicts:
        NEWS: take all additions
        configure.ac: ignore revision bump
        lib/cmdlib/cluster.py: trivial

diff --cc NEWS
index deeb367,c42553b..d9219ba
--- a/NEWS
+++ b/NEWS
@@@ -2,64 -2,21 +2,80 @@@ New
 ====


+Version 2.13.0
+--------------
+
+*(Released Tue, 28 Apr 2015)*
+
+Incompatible/important changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Ganeti now internally retries the instance creation opcode if opportunistic
+  locking did not acquire nodes with enough free resources. The internal retry
+  will not use opportunistic locking. In particular, instance creation, even
+  if opportunistic locking is set, will never fail with ECODE_TEMP_NORES.
+- The handling of SSH security had undergone a significant change. From
+  this version on, each node has an individual SSH key pair instead of
+  sharing one with all nodes of the cluster. From now on, we also
+  restrict SSH access to master candidates. This means that only master
+  candidates can ssh into other cluster nodes and all
+  non-master-candidates cannot. Refer to the UPGRADE notes
+  for further instructions on the creation and distribution of the keys.
+- Ganeti now checks hypervisor version compatibility before trying an instance
+  migration. It errors out if the versions are not compatible. Add the option
+  --ignore-hvversions to restore the old behavior of only warning.
+- Node tags starting with htools:migration: or htools:allowmigration: now have
+  a special meaning to htools(1). See hbal(1) for details.
+- The LXC hypervisor code has been repaired and improved. Instances cannot be
+  migrated and cannot have more than one disk, but should otherwise work as 
with
+  other hypervisors. OS script changes should not be necessary. LXC version
+  1.0.0 or higher required.
+
+New features
+~~~~~~~~~~~~
+
+- A new job filter rules system allows to define iptables-like rules for the
+  job scheduler, making it easier to (soft-)drain the job queue, perform
+  maintenance, and rate-limit selected job types. See gnt-filter(8) for
+  details.
+- Ganeti jobs can now be ad-hoc rate limited via the reason trail.
+  For a set of jobs queued with "--reason=rate-limit:n:label", the job
+  scheduler ensures that not more than n will be scheduled to run at the same
+  time. See ganeti(7), section "Options", for details.
+- The monitoring daemon has now variable sleep times for the data
+  collectors. This currently means that the granularity of cpu-avg-load
+  can be configured.
+- The 'gnt-cluster verify' command now has the option
+  '--verify-ssh-clutter', which verifies whether Ganeti (accidentally)
+  cluttered up the 'authorized_keys' file.
+- Instance disks can now be converted from one disk template to another for 
many
+  different template combinations. When available, more efficient conversions
+  will be used, otherwise the disks are simply copied over.
+
+New dependencies
+~~~~~~~~~~~~~~~~
+
+- The monitoring daemon uses the PSQueue library. Be sure to install it
+  if you use Mond.
+- The formerly optional regex-pcre is now an unconditional dependency because
+  the new job filter rules have regular expressions as a core feature.
+
++
+ Version 2.12.4
+ --------------
+
+ *(Released Tue, 12 May 2015)*
+
+ - Fixed Issue #1082: RAPI is unresponsive after master-failover
+ - Fixed Issue #1083: Cluster verify reports existing instance disks on
+   non-default VGs as missing
+ - Fixed a possible file descriptor leak when forking jobs
+ - Fixed missing private parameters in the environment for OS scripts
+ - Fixed a performance regression when handling configuration
+   (only upgrade it if it changes)
+ - Adapt for compilation with GHC7.8 (compiles with warnings;
+   cherrypicked from 2.14)
+
 Known issues
 ~~~~~~~~~~~~

diff --cc lib/cmdlib/cluster.py
index e2c73d4,6e1ba2e..e834e51
--- a/lib/cmdlib/cluster.py
+++ b/lib/cmdlib/cluster.py
@@@ -3546,28 -3421,7 +3546,28 @@@ class LUClusterVerifyGroup(LogicalUnit
     """
     return ([], list(self.my_node_info.keys()))

+  @staticmethod
+  def _VerifyOtherNotes(feedback_fn, i_non_redundant, i_non_a_balanced,
+                        i_offline, n_offline, n_drained):
+    feedback_fn("* Other Notes")
+    if i_non_redundant:
+      feedback_fn("  - NOTICE: %d non-redundant instance(s) found."
+                  % len(i_non_redundant))
+
+    if i_non_a_balanced:
+      feedback_fn("  - NOTICE: %d non-auto-balanced instance(s) found."
+                  % len(i_non_a_balanced))
+
+    if i_offline:
+      feedback_fn("  - NOTICE: %d offline instance(s) found." % i_offline)
+
+    if n_offline:
+      feedback_fn("  - NOTICE: %d offline node(s) found." % n_offline)
+
+    if n_drained:
+      feedback_fn("  - NOTICE: %d drained node(s) found." % n_drained)
+
-   def Exec(self, feedback_fn):
+   def Exec(self, feedback_fn): # pylint: disable=R0915
     """Verify integrity of the node group, performing various test on nodes.

     """

--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores

LGTM, thanks

Reply via email to