Merge lp://qastaging/~fboucault/dee/schema_passing into lp://qastaging/dee
Proposed by
Florian Boucault
Status: | Merged |
---|---|
Merged at revision: | 231 |
Proposed branch: | lp://qastaging/~fboucault/dee/schema_passing |
Merge into: | lp://qastaging/dee |
Diff against target: |
293 lines (+56/-30) 11 files modified
dee/dbus/com.canonical.Dee.Model.xml (+2/-0) dee/dee-shared-model.c (+54/-21) examples/slave-model.c (+0/-1) examples/slave-model.py (+0/-1) tests/model-helper-add3rows.c (+0/-1) tests/model-helper-change3rows.c (+0/-1) tests/model-helper-clear3rows.c (+0/-1) tests/model-helper-clone3rows.c (+0/-1) tests/model-helper-insert1row.c (+0/-1) tests/model-helper-remove3rows.c (+0/-1) tests/model-helper-uninitialized.c (+0/-1) |
To merge this branch: | bzr merge lp://qastaging/~fboucault/dee/schema_passing |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mikkel Kamstrup Erlandsen (community) | Approve | ||
Review via email:
|
Description of the change
Added passing the schema over the wire so that if a leader is already present it is not necessary to set the schema manually.
To post a comment you must log in.
The protocol has been amended to carry the schema as an array of strings ('as') as second argument, after the swarm name. This is used by DeeSharedModel of a swarm for which the schema was not manually set.
The unit tests have been modified so that they do not set a schema when we know it is not necessary.
The examples have been updated to take advantage of that as well.
There is one case that is currently broken and for which no unit test is written. If a DeeSharedModel is created and no schema is set, it becomes the leader and will receive clone requests that will fail. It is easy to reproduce with the master/slave example doing the following:
$ ./slave-model
$ ./master-model