Keeper

Merge lp:~xavi-garcia-mena/keeper/keeper-tar-creator-step-all-files into lp:keeper/devel

  1. keeper-tar-creator-step-all-files
  2. Merge into devel
Proposed by Xavi Garcia
Status: Merged
Merged at revision: 124
Proposed branch: lp:~xavi-garcia-mena/keeper/keeper-tar-creator-step-all-files
Merge into: lp:keeper/devel
Prerequisite: lp:~xavi-garcia-mena/keeper/restore
Diff against target: 11 lines (+1/-1)
1 file modified
src/tar/tar-creator.cpp (+1/-1)
To merge this branch: bzr merge lp:~xavi-garcia-mena/keeper/keeper-tar-creator-step-all-files
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve
Charles Kerr Pending
Review via email: mp+311912@code.launchpad.net

Commit message

Change to avoid waiting to process all the files in the first step of keeper-tar-create.

Description of the change

Change to avoid waiting to process all the files in the first step of keeper-tar-create.

When doing big backups the "step" method in keeper-tar-create is taking a lot of time, which triggers the inactivity timer in the service side.

This small change tries to minimize the time we have to wait until the helper starts sending data to keeper's service.

We should also think a way of not waiting so long when we are backing up big files. In that case this change doesn't fix the inactivity issue.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:143
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/141/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1193
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1200
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/986
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/986/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/986
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/986/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/986
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/986/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/986
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/986/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/986
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/986/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/986
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/986/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/141/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Agree with the assessment, but I think the better fix would be to just not loop inside of TarCreator::step().

Alternate proposal @ https://code.launchpad.net/~charlesk/keeper/fix-slow-tar-creator-test/+merge/311984

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/tar/tar-creator.cpp'
2--- src/tar/tar-creator.cpp 2016-09-05 18:38:36 +0000
3+++ src/tar/tar-creator.cpp 2016-11-28 09:36:39 +0000
4@@ -139,7 +139,7 @@
5 {
6 // loop to next file
7 step_file_.reset();
8- continue;
9+ break;
10 }
11 }
12

Subscribers

People subscribed via source and target branches

to all changes: