On Thu, Jan 23, 2014 at 3:31 PM, Klaus Aehlig <[email protected]> wrote: >> LGTM >> >> Thanks, >> Guido >
LGTM again. Thanks, Guido > Sorry, I forgot again to add part of the local merge resolution into the > commit. The interdiff is > > diff --git a/lib/cmdlib/test.py b/lib/cmdlib/test.py > index 43cd931..2647fb7 100644 > --- a/lib/cmdlib/test.py > +++ b/lib/cmdlib/test.py > @@ -63,7 +63,7 @@ class LUTestDelay(NoHooksLU): > # more information. > (self.op.on_node_uuids, self.op.on_nodes) = \ > GetWantedNodes(self, self.op.on_nodes) > - self.needed_locks[locking.LEVEL_NODE] = self.op.on_node_uuids > + self.needed_locks[locking.LEVEL_NODE].extend(self.op.on_node_uuids) > > if self.op.on_master: > # The node lock should be acquired for the master as well. > > > and the full merge commit is following. > > commit 30f85ee6196890053b3d45bd13713a87793d148b > Merge: 091034b 9f7413a > Author: Klaus Aehlig <[email protected]> > Date: Thu Jan 23 14:24:08 2014 +0100 > > Merge branch 'stable-2.8' into stable-2.9 > > * stable-2.8 > Version bump for 2.8.4 and NEWS update > Update NEWS file with news about job cancellation bugfix > Fix QA flakiness > Linting fix: remove unused import > Add missing parameter entry to man file > Add QA test for job cancellation > Add correct locking of master node to gnt-debug delay > Add job id type assert to jqueue.py > Add job id transformation/check to Luxi Python client > Start-master/stop-master always fail if confd is disabled > Improve backwards compatibility of Issue 649 fix > Add missing NEWS entries from stable-2.8 > Change usb_devices separator to whitespace > > Conflicts: > NEWS: take both additions > configure.ac: ignore revision bump > lib/cmdlib/test.py: manually redo changes of stable-2.8 > on stable-2.9 version > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc NEWS > index 6aa10d8,8ce897c..26827e0 > --- a/NEWS > +++ b/NEWS > @@@ -2,184 -2,22 +2,200 @@@ New > ==== > > > +Version 2.9.3 > +------------- > + > +*(unreleased)* > + > +- Ensure that all the hypervisors exist in the config file (Issue 640) > +- Correctly recognise the role as master node (Issue 687) > +- configure: allow detection of Sphinx 1.2+ (Issue 502) > + > + > +Version 2.9.2 > +------------- > + > +*(Released Fri, 13 Dec 2013)* > + > +- use custom KVM path if set for version checking > +- SingleNotifyPipeCondition: don't share pollers > + > +Inherited from the 2.8 branch: > + > +- Fixed Luxi daemon socket permissions after master-failover > +- Improve IP version detection code directly checking for colons rather than > + passing the family from the cluster object > +- Fix NODE/NODE_RES locking in LUInstanceCreate by not acquiring NODE_RES > locks > + opportunistically anymore (Issue 622) > +- Allow link local IPv6 gateways (Issue 624) > +- Fix error printing (Issue 616) > +- Fix a bug in InstanceSetParams concerning names: in case no name is > passed in > + disk modifications, keep the old one. If name=none then set disk name to > + None. > +- Update build_chroot script to work with the latest hackage packages > +- Add a packet number limit to "fping" in master-ip-setup (Issue 630) > +- Fix evacuation out of drained node (Issue 615) > +- Add default file_driver if missing (Issue 571) > +- Fix job error message after unclean master shutdown (Issue 618) > +- Lock group(s) when creating instances (Issue 621) > +- SetDiskID() before accepting an instance (Issue 633) > +- Allow the ext template disks to receive arbitrary parameters, both at > creation > + time and while being modified > +- Xen handle domain shutdown (future proofing cherry-pick) > +- Refactor reading live data in htools (future proofing cherry-pick) > + > + > +Version 2.9.1 > +------------- > + > +*(Released Wed, 13 Nov 2013)* > + > +- fix bug, that kept nodes offline when readding > +- when verifying DRBD versions, ignore unavailable nodes > +- fix bug that made the console unavailable on kvm in split-user > + setup (issue 608) > +- DRBD: ensure peers are UpToDate for dual-primary (inherited 2.8.2) > + > + > +Version 2.9.0 > +------------- > + > +*(Released Tue, 5 Nov 2013)* > + > +Incompatible/important changes > +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > + > +- hroller now also plans for capacity to move non-redundant instances off > + any node to be rebooted; the old behavior of completely ignoring any > + non-redundant instances can be restored by adding the > --ignore-non-redundant > + option. > +- The cluster option '--no-lvm-storage' was removed in favor of the new > option > + '--enabled-disk-templates'. > +- On instance creation, disk templates no longer need to be specified > + with '-t'. The default disk template will be taken from the list of > + enabled disk templates. > +- The monitoring daemon is now running as root, in order to be able to > collect > + information only available to root (such as the state of Xen instances). > +- The ConfD client is now IPv6 compatible. > +- File and shared file storage is no longer dis/enabled at configure time, > + but using the option '--enabled-disk-templates' at cluster initialization > and > + modification. > +- The default directories for file and shared file storage are not anymore > + specified at configure time, but taken from the cluster's configuration. > + They can be set at cluster initialization and modification with > + '--file-storage-dir' and '--shared-file-storage-dir'. > +- Cluster verification now includes stricter checks regarding the > + default file and shared file storage directories. It now checks that > + the directories are explicitely allowed in the 'file-storage-paths' file > and > + that the directories exist on all nodes. > +- The list of allowed disk templates in the instance policy and the list > + of cluster-wide enabled disk templates is now checked for consistency > + on cluster or group modification. On cluster initialization, the ipolicy > + disk templates are ensured to be a subset of the cluster-wide enabled > + disk templates. > + > +New features > +~~~~~~~~~~~~ > + > +- DRBD 8.4 support. Depending on the installed DRBD version, Ganeti now uses > + the correct command syntax. It is possible to use different DRBD versions > + on different nodes as long as they are compatible to each other. This > + enables rolling upgrades of DRBD with no downtime. As permanent operation > + of different DRBD versions within a node group is discouraged, > + ``gnt-cluster verify`` will emit a warning if it detects such a situation. > +- New "inst-status-xen" data collector for the monitoring daemon, providing > + information about the state of the xen instances on the nodes. > +- New "lv" data collector for the monitoring daemon, collecting data about > the > + logical volumes on the nodes, and pairing them with the name of the > instances > + they belong to. > +- New "diskstats" data collector, collecting the data from /proc/diskstats > and > + presenting them over the monitoring daemon interface. > +- The ConfD client is now IPv6 compatible. > + > +New dependencies > +~~~~~~~~~~~~~~~~ > +The following new dependencies have been added. > + > +Python > + > +- ``python-mock`` (http://www.voidspace.org.uk/python/mock/) is now a > required > + for the unit tests (and only used for testing). > + > +Haskell > + > +- ``hslogger`` (http://software.complete.org/hslogger) is now always > + required, even if confd is not enabled. > + > +Since 2.9.0 rc3 > +~~~~~~~~~~~~~~~ > + > +- Correctly start/stop luxid during gnt-cluster master-failover (inherited > + from stable-2.8) > +- Improved error messsages (inherited from stable-2.8) > + > + > +Version 2.9.0 rc3 > +----------------- > + > +*(Released Tue, 15 Oct 2013)* > + > +The third release candidate in the 2.9 series. Since 2.9.0 rc2: > + > +- in implicit configuration upgrade, match ipolicy with enabled disk > templates > +- improved harep documentation (inherited from stable-2.8) > + > + > +Version 2.9.0 rc2 > +----------------- > + > +*(Released Wed, 9 Oct 2013)* > + > +The second release candidate in the 2.9 series. Since 2.9.0 rc1: > + > +- Fix bug in cfgupgrade that led to failure when upgrading from 2.8 with > + at least one DRBD instance. > +- Fix bug in cfgupgrade that led to an invalid 2.8 configuration after > + downgrading. > + > + > +Version 2.9.0 rc1 > +----------------- > + > +*(Released Tue, 1 Oct 2013)* > + > +The first release candidate in the 2.9 series. Since 2.9.0 beta1: > + > +- various bug fixes > +- update of the documentation, in particular installation instructions > +- merging of LD_* constants into DT_* constants > +- python style changes to be compatible with newer versions of pylint > + > + > +Version 2.9.0 beta1 > +------------------- > + > +*(Released Thu, 29 Aug 2013)* > + > +This was the first beta release of the 2.9 series. All important changes > +are listed in the latest 2.9 entry. > + > + > + Version 2.8.4 > + ------------- > + > + *(Released Thu, 23 Jan 2014)* > + > + - Change the list separator for the usb_devices parameter from comma to > space. > + Commas could not work because they are already the hypervisor option > + separator (Issue 649) > + - Add support for blktap2 file-driver (Issue 638) > + - Add network tag definitions to the haskell codebase (Issue 641) > + - Fix RAPI network tag handling > + - Add the network tags to the tags searched by gnt-cluster search-tags > + - Fix caching bug preventing jobs from being cancelled > + - Start-master/stop-master was always failing of ConfD was disabled. (Issue > 685) > + > + > Version 2.8.3 > ------------- > > diff --cc lib/cmdlib/test.py > index 4b02898,485a83d..2647fb7 > --- a/lib/cmdlib/test.py > +++ b/lib/cmdlib/test.py > @@@ -57,9 -61,12 +61,13 @@@ class LUTestDelay(NoHooksLU) > # _GetWantedNodes can be used here, but is not always appropriate to > use > # this way in ExpandNames. Check LogicalUnit.ExpandNames docstring for > # more information. > - self.op.on_nodes = GetWantedNodes(self, self.op.on_nodes) > - self.needed_locks[locking.LEVEL_NODE].extend(self.op.on_nodes) > + (self.op.on_node_uuids, self.op.on_nodes) = \ > + GetWantedNodes(self, self.op.on_nodes) > - self.needed_locks[locking.LEVEL_NODE] = self.op.on_node_uuids > ++ self.needed_locks[locking.LEVEL_NODE].extend(self.op.on_node_uuids) > + > + if self.op.on_master: > + # The node lock should be acquired for the master as well. > + self.needed_locks[locking.LEVEL_NODE].append(self.cfg.GetMasterNode()) > > def _TestDelay(self): > """Do the actual sleep. > > > > -- > 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 -- Guido Trotter Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
