Commit 39c54b84 authored by Klaus Aehlig's avatar Klaus Aehlig

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
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
parents cb50990b 4431be3e
......@@ -11,9 +11,11 @@
*.o
*.hpc_o
*.prof_o
*.dyn_o
*.hi
*.hpc_hi
*.prof_hi
*.dyn_hi
*.hp
*.tix
*.prof
......
......@@ -1320,7 +1320,7 @@ test/hs/%.o: hs-pkg-versions
%.o: hs-pkg-versions
@echo '[GHC]: $@ <- $^'
@$(GHC) -c $(HFLAGS) $(HFLAGS_NOPROF) \
@$(GHC) -c $(HFLAGS) $(HFLAGS_DYNAMIC) \
$(shell cat hs-pkg-versions) \
$(HS_PARALLEL3) $(HS_REGEX_PCRE) $(HEXTRA_COMBINED) $(@:%.o=%.hs)
......
......@@ -60,11 +60,27 @@ New dependencies
- 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
~~~~~~~~~~~~
- GHC 7.8 introduced some incompatible changes, so currently Ganeti
2.12. doesn't compile on GHC 7.8
Pending since 2.12.2:
- Under certain conditions instance doesn't get unpaused after live
migration (issue #1050)
- GlusterFS support breaks at upgrade to 2.12 - switches back to
......
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
# On reboot, continue a Ganeti upgrade, if one was in progress
@reboot root @SBINDIR@/gnt-cluster upgrade --resume
@reboot root [ -x @SBINDIR@/gnt-cluster ] && @SBINDIR@/gnt-cluster upgrade --resume
# Restart failed instances (every 5 minutes)
*/5 * * * * root [ -x @SBINDIR@/ganeti-watcher ] && @SBINDIR@/ganeti-watcher
......
......@@ -3567,7 +3567,7 @@ class LUClusterVerifyGroup(LogicalUnit, _VerifyErrors):
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.
"""
......
......@@ -472,6 +472,7 @@ class XenHypervisor(hv_base.BaseHypervisor):
VIF_BRIDGE_SCRIPT,
]
ANCILLARY_FILES_OPT = [
XEND_CONFIG_FILE,
XL_CONFIG_FILE,
]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment