Commit bd5b2991 authored by Thomas Thrainer's avatar Thomas Thrainer
Browse files

Merge branch 'stable-2.11' into stable-2.12



* stable-2.11
  Bump revision to 2.11.1
  Prepare NEWS file for 2.11.1

* stable-2.10
  Postpone 2.10.4 release to May 15th
  Don't fail QA if submitting a job takes too long
  Revision bump for the 2.10.4 release
  Prepare NEWS file for 2.10.4 release

* stable-2.9
  On expanding jobs, extend reason trail
  Add LC_ALL=en_US.UTF-8 before running check-man-warnings

Conflicts:
	NEWS (take both additions)
	configure.ac (take stable-2.12 versions)
Signed-off-by: default avatarThomas Thrainer <thomasth@google.com>
Reviewed-by: default avatarHrvoje Ribicic <riba@google.com>
parents 5c4731eb bccc3658
......@@ -1864,7 +1864,7 @@ man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.rst
trap 'echo auto-removing $@; rm $@' EXIT; \
$(PANDOC) -s -f rst -t man $< man/footer.rst | \
sed -e 's/\\@/@/g' > $@; \
if test -n "$(MAN_HAS_WARNINGS)"; then $(CHECK_MAN_WARNINGS) $@; fi; \
if test -n "$(MAN_HAS_WARNINGS)"; then LC_ALL=en_US.UTF-8 $(CHECK_MAN_WARNINGS) $@; fi; \
$(CHECK_MAN_DASHES) $@; \
trap - EXIT
......
......@@ -39,6 +39,47 @@ New features
user-specified ones.
Version 2.11.1
--------------
*(Released Wed, 14 May 2014)*
- Add design-node-security.rst to docinput
- kvm: use a dedicated QMP socket for kvmd
Inherited from the 2.10 branch:
- Set correct Ganeti version on setup commands
- Add a utility to combine shell commands
- Add design doc for performance tests
- Fix failed DRBD disk creation cleanup
- Hooking up verification for shared file storage
- Fix --shared-file-storage-dir option of gnt-cluster modify
- Clarify default setting of 'metavg'
- Fix invocation of GetCommandOutput in QA
- Clean up RunWithLocks
- Add an exception-trapping thread class
- Wait for delay to provide interruption information
- Add an expected block option to RunWithLocks
- Track if a QA test was blocked by locks
- Add a RunWithLocks QA utility function
- Add restricted migration
- Add an example for node evacuation
- Add a test for parsing version strings
- Tests for parallel job execution
- Fail in replace-disks if attaching disks fails
- Fix passing of ispecs in cluster init during QA
- Move QAThreadGroup to qa_job_utils.py
- Extract GetJobStatuses and use an unified version
- Run disk template specific tests only if possible
Inherited from the 2.9 branch:
- If Automake version > 1.11, force serial tests
- KVM: set IFF_ONE_QUEUE on created tap interfaces
- Add configure option to pass GHC flags
Version 2.11.0
--------------
......@@ -204,6 +245,19 @@ This was the first beta release of the 2.11 series. All important changes
are listed in the latest 2.11 entry.
Version 2.10.4
--------------
*(Released Thu, 15 May 2014)*
- Support restricted migration in hbal
- Fix for the --shared-file-storage-dir of gnt-cluster modify (issue 811)
- Fail in replace-disks if attaching disks fails (issue 814)
- Set IFF_ONE_QUEUE on created tap interfaces for KVM
- Small fixes and enhancements in the build system
- Various documentation fixes (e.g. issue 810)
Version 2.10.3
--------------
......
......@@ -212,9 +212,9 @@ def _SetBaseOpParams(src, defcomment, dst):
if not getattr(dst, opcodes_base.COMMENT_ATTR, None):
dst.comment = defcomment
# FIXME: extend reason trail, showing the derivedness
if not getattr(dst, constants.OPCODE_REASON, None):
dst.reason = getattr(src, constants.OPCODE_REASON, [])
if hasattr(src, constants.OPCODE_REASON):
dst.reason = getattr(dst, constants.OPCODE_REASON, [])
dst.reason.extend(getattr(src, constants.OPCODE_REASON, []))
def _ProcessResult(submit_fn, op, result):
......
......@@ -214,9 +214,9 @@ def _ExecuteJobSubmittingCmd(cmd):
result = qa_job_utils.ExecuteJobProducingCommand(cmd)
duration = qa_utils.TimedeltaToTotalSeconds(datetime.datetime.now() - start)
if duration > MAX_JOB_SUBMISSION_DURATION:
raise qa_error.Error(
"Executing '%s' took %f seconds, only %f are allowed" %
(cmd, duration, MAX_JOB_SUBMISSION_DURATION))
print(qa_logging.FormatWarning(
"Executing '%s' took %f seconds, a maximum of %f was expected" %
(cmd, duration, MAX_JOB_SUBMISSION_DURATION)))
return result
......
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