sync-monitor

Merge lp://qastaging/~renatofilho/sync-monitor/check-network into lp://qastaging/sync-monitor

check-network
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2014-10-28

Status:

Merged

Approved by:

Bill Filler on 2014-11-06

Approved revision:

Merged at revision:

Proposed branch:

lp://qastaging/~renatofilho/sync-monitor/check-network

Merge into:

lp://qastaging/sync-monitor

Diff against target:

837 lines (+338/-74)

13 files modified

CMakeLists.txt (+1/-0)
src/CMakeLists.txt (+4/-2)
src/eds-helper.cpp (+9/-4)
src/eds-helper.h (+1/-1)
src/sync-account.cpp (+11/-3)
src/sync-account.h (+1/-2)
src/sync-daemon.cpp (+155/-54)
src/sync-daemon.h (+10/-2)
src/sync-dbus.cpp (+14/-2)
src/sync-network.cpp (+51/-0)
src/sync-network.h (+48/-0)
src/sync-queue.cpp (+29/-4)
src/sync-queue.h (+4/-0)

To merge this branch:

bzr merge lp://qastaging/~renatofilho/sync-monitor/check-network

Related bugs:

Bug #1380094: sync failing and retries in a loop	High	Fix Released
Bug #1384707: sync monitor reports error on boot when no network	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Bill Filler (community)		2014-10-28	Approve on 2014-11-06
PS Jenkins bot	continuous-integration		Approve on 2014-11-06
Review via email: mp+239851@code.qastaging.launchpad.net

Commit message

Check for network connection before sync.
Append sync request to run later if no network.

lp://qastaging/~renatofilho/sync-monitor/check-network updated on 2014-10-28

39. By Renato Araujo Oliveira Filho on 2014-10-28: Append sync request to run later if no network.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-28:

PASSED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/71/rebuild

review: Approve (continuous-integration)

lp://qastaging/~renatofilho/sync-monitor/check-network updated on 2014-10-28

40. By Renato Araujo Oliveira Filho on 2014-10-28: avoid infinity loop.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-28:

PASSED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/72/rebuild

review: Approve (continuous-integration)

lp://qastaging/~renatofilho/sync-monitor/check-network updated on 2014-10-28

41. By Renato Araujo Oliveira Filho on 2014-10-28: set m_syncing to false after cancel sync due network status.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-28:

PASSED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/73/rebuild

review: Approve (continuous-integration)

lp://qastaging/~renatofilho/sync-monitor/check-network updated on 2014-10-28

42. By Renato Araujo Oliveira Filho on 2014-10-28: Reverted to 60 ms wait before a sync;
Removed some debug messages from network helper class.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-28:

PASSED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/74/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/74/rebuild

review: Approve (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-10-28:

Issues:
- if I turn off wifi, the sync still happens
- when wifi is on, as soon as I modify a contact the sync button goes gray but sync monitor delays 60 seconds until it starts the sync. The button shouldn't go gray until an actual sync is in progress. The delay before starting the sync seems much larger now.
- When I turn on flight mode, then sync monitor thinks I'm offline correctly. If I modify a contact during that time the sync button turns gray even though it's not syncing.

review: Needs Fixing

Revision history for this message

Bill Filler (bfiller) wrote on 2014-10-28:

Also, I rebooted with wifi turned off and I got a sync error. This was in the log:

"[10/28/14 6:48 PM] Start sync: <email address hidden> (contacts)"^M
Progress 0^M
Sync Report^M
         "dir" : "/home/phablet/.cache/syncevolution/google_+contacts_+14-2014-10-28-18-48
"^M
         "end" : "1414536541"^M
         "error" : "error code from SyncEvolution fatal error (local, status 10500): no so
urces active, check configuration"^M
         "peer" : "google-contacts-14"^M
         "start" : "1414536538"^M
         "status" : "10500"^M
"[10/28/14 6:49 PM] Sync done: <email address hidden> (contacts) Status: 10500 Error: Unknown s
tatus Duration: 2s"^M

This is with this MR installed to start sync-monitor after address-book and unity8: https://code.launchpad.net/~renatofilho/sync-monitor/start-after-unity8/+merge/239207

review: Needs Fixing

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-10-29:

> Issues:
> - if I turn off wifi, the sync still happens
> - when wifi is on, as soon as I modify a contact the sync button goes gray but
> sync monitor delays 60 seconds until it starts the sync. The button shouldn't
> go gray until an actual sync is in progress. The delay before starting the
> sync seems much larger now.
> - When I turn on flight mode, then sync monitor thinks I'm offline correctly.
> If I modify a contact during that time the sync button turns gray even though
> it's not syncing.

Yes I increased the delay to start the automatic sync. But it should not affect the manual sync ( I will check that).

Could you paste the sync-monitor log. It should show if the sync really happens or if it was postponed due the network.

The correct steps should be:

1 - Contact change
2 - Sync monitor waits 1 min (to avoid multiple syncs) before start the sync
3 - Sync monitor starts to sync
4 - Sync monitor checks network status
5 - If network is down postpone the sync until the network became available

Probably you are seeing the button gray (but this does not mean that the sync is happening, this mean that there is a sync in the queue). I will try to make the button gray only when syncing, to avoid problems.

lp://qastaging/~renatofilho/sync-monitor/check-network updated on 2014-10-29

43. By Renato Araujo Oliveira Filho on 2014-10-29: Update dbus helper class to only return state "syncing" when the sync is running and not during a pending sync.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-29:

PASSED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/75/rebuild

review: Approve (continuous-integration)

lp://qastaging/~renatofilho/sync-monitor/check-network updated on 2014-10-29

44. By Renato Araujo Oliveira Filho on 2014-10-29: Fixed sync state report.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-29:

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/76/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/76/rebuild

review: Approve (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-10-29:

Here is the full log when the sync fails at startup:

"[10/29/14 7:49 AM] Start sync: <email address hidden> (contacts)"
Progress 0
Progress 0
Loaded tempaltes: ("google", "yahoo")
Loading accounts...
Found account: "<email address hidden>"
Supported sevices for protocol: "google" ("calendar", "contacts")
Services available for: "<email address hidden>" QMap(("calendar", false)("contacts", true))
Found account: "<email address hidden>"
Supported sevices for protocol: "google" ("calendar", "contacts")
Services available for: "<email address hidden>" QMap(("calendar", false)("contacts", true))
Found account: "bill.filler"
Found account: "bfiller"
Found account: "<email address hidden>"
syn requested for account: "<email address hidden>" "contacts"
Pushed into queue
Network state changed: Online
Network is online sync pending changes
Sync requested service: "<email address hidden>" "contacts"
Configure account for service: "<email address hidden>" "contacts" "disabled"
start configure for services ("contacts")
config session created "google-contacts-14" "idle"
account config done "<email address hidden>" "contacts"
"[10/29/14 11:55 AM] Start sync: <email address hidden> (contacts)"
Progress 0
Sync Report
  "dir" : "/home/phablet/.cache/syncevolution/google_+contacts_+14-2014-10-29-11-55"
  "end" : "1414598124"
  "error" : "error code from SyncEvolution fatal error (local, status 10500): no sources active, check configuration"
  "peer" : "google-contacts-14"
  "start" : "1414598121"
  "status" : "10500"
"[10/29/14 11:55 AM] Sync done: <email address hidden> (contacts) Status: 10500 Error: Unknown status Duration: 2s"
Network state changed: Offline
Network state changed: Online
Network is online sync pending changes
Sync error "<email address hidden>" "contacts" "canceled"

lp://qastaging/~renatofilho/sync-monitor/check-network updated on 2014-10-30

45. By Renato Araujo Oliveira Filho on 2014-10-29: Check queue size before start sync after network state changed.
46. By Renato Araujo Oliveira Filho on 2014-10-30: disable sync option is the server is not online.