lp://qastaging/~tribaal/landscape-client/fix-registration-timeout

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/~landscape/landscape-client/trunk at revision 698

Jerry Seutter (community): Approve on 2013-07-09

Free Ekanayaka (community): Approve on 2013-07-09

Diff: 67 lines (+35/-1)

3 files modified

landscape/broker/tests/test_server.py (+9/-0)
landscape/reactor.py (+5/-1)
landscape/tests/test_reactor.py (+21/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1197901: Registration succeeds, but tool exits with error and backtrace

Critical

Fix Released

Link a bug report

Related blueprints

700. By Chris Glass on 2013-07-10

Typo fix

699. By Chris Glass on 2013-07-09

Added direct reactor test

698. By Chris Glass on 2013-07-08

COmmitting free's fix for the problem

697. By Geoff Teale on 2013-07-05

Merged add-session-ids-to-activity-responses [r=jseutter,free.ekanayaka] [f=1158822].

This branch implements the client side parts of a mechanism described here: https://wiki.canonical.com/Landscape/SpecRegistry/0047

In landscape.broker.store.MessageStore I've added three methods, get_session_id, is_valid_session_id, and drop_session_ids, they respectively create and store a new ID (with optional scope), check for existence of a given ID in the store, and delete all IDs within a certain scope. As I write this I suspect it might be sensible to remove scope as the work that requires it is unlikely to get scheduled soon (currently it always uses the default scope, None).

landscape.broker.server.BrokerServer has a get_session_id method that essentially is a pass-through to the MessageStore method. The send_message method on the BrokerServer has been modified to always require a session_id, which it will validate. If the session_id is not known to the message store then the message will be dropped, silently.

landscape.broker.exchange.MessageExchange will now drop all session-ids when it handles a resynchronize request. This means that any messages that are sent with IDs generated before that request will simply be dropped.

696. By Geoff Teale on 2013-06-28

Merge add-comms-docs [f=1194479] [r=free.ekanayaka,ack] [a=Geoff Teale]
This branch embeds some of the content from sequence
diagrams I made to describe the following
 client/server processes:

   - Ping
   - Message exchange
   - Resynchronisation

The intent has been to, as far as possible, limit
the scope to what is relevant to the file in which it
is being embedded. I have however branched out a
little in places where that seemed useful or
worthwhile.

695. By Alberto Donato on 2013-06-28

Merge detect-openstack-vm [f=1191843] [r=tealeg,bjornt] [a=Alberto Donato]
This changes the detection logic for kvm virtual machines, looking for the "Bochs" as reported by OpenStack Folsom) or "OpenStack" (as reported by Grizzly) vendor in /sys rather than the CPU model.
It also refactors a bit the existing logic, and only tries to detect HyperV/VmWare/KVM if the "hypervisor" flag is present in /proc/cpuinfo, which is meant to report that the machine is running under an hypervisor.

694. By Alberto Donato on 2013-06-26

Update UPSTERAM_VERSION to 13.06 [trivial] [r=andreas].

693. By Andreas Hasenack on 2013-06-19

Fix version number.

692. By Chris Glass on 2013-06-19

Fixed debian/changelog to be consistent with the name of the release

691. By Free Ekanayaka on 2013-06-19

Merge use-upstream-gather-results [f=1192138] [r=jseutter,ack] [a=Free Ekanayaka]
This mostly a trivial branch, just replaces our landscape.lib.twisted_utils.gather_results function with Twisted's official twisted.internet.defer.gatherResults.