Merge lp:~facundo/ubuntuone-client/stable-1-6--more-simult-transfers into lp:ubuntuone-client/stable-1-6

Proposed by Facundo Batista
Status: Rejected
Rejected by: Facundo Batista
Proposed branch: lp:~facundo/ubuntuone-client/stable-1-6--more-simult-transfers
Merge into: lp:ubuntuone-client/stable-1-6
Diff against target: 12 lines (+1/-1)
1 file modified
ubuntuone/syncdaemon/action_queue.py (+1/-1)
To merge this branch: bzr merge lp:~facundo/ubuntuone-client/stable-1-6--more-simult-transfers
Reviewer Review Type Date Requested Status
dobey (community) Needs Information
Facundo Batista (community) Approve
Lucio Torre (community) Approve
Review via email: mp+58330@code.launchpad.net

Commit message

More simultaneous transfers (LP:#766102).

Description of the change

More simultaneous transfers.

To post a comment you must log in.
Revision history for this message
Lucio Torre (lucio.torre) :
review: Approve
Revision history for this message
Facundo Batista (facundo) wrote :

Approving with one review

review: Approve
Revision history for this message
Natalia Bidart (nataliabidart) wrote :
Download full text (208.5 KiB)

The attempt to merge lp:~facundo/ubuntuone-client/stable-1-6--more-simult-transfers into lp:ubuntuone-client/stable-1-6 failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
(B testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
(B testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
(B testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
(B testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
(B testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
(B testing gtkdocize... found 1.16
Checking for required M4 macros...
(BChecking for forbidden M4 macros...
(BProcessing ./configure.ac
(BRunning libtoolize...
(Blibtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
(BRunning gtkdocize...
(BRunning aclocal-1.11...
(BRunning autoconf...
(BRunning autoheader...
(BRunning automake-1.11...
(BRunning ./configure --with-protocol=/home/nessita/canonical/tarmac/ubuntuone-storage-protocol/trunk ...
(Bchecking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of...

Revision history for this message
dobey (dobey) wrote :

Can we please have a little more testing with this on trunk first, rather than rushing it into stable-1-6?

review: Needs Information
Revision history for this message
Facundo Batista (facundo) wrote :

Unmerged revisions

959. By Facundo Batista

More simult transfers.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/syncdaemon/action_queue.py'
2--- ubuntuone/syncdaemon/action_queue.py 2011-04-12 19:46:23 +0000
3+++ ubuntuone/syncdaemon/action_queue.py 2011-04-19 15:32:25 +0000
4@@ -70,7 +70,7 @@
5 TRANSFER_PROGRESS_THRESHOLD = 64*1024*1024
6
7 # no more than this uploads are executed simultaneously
8-SIMULT_TRANSFERS = 3
9+SIMULT_TRANSFERS = 10
10
11 def passit(func):
12 """Pass the value on for the next deferred, while calling func with it."""

Subscribers

People subscribed via source and target branches