From 8357a82eeeeae5b233df1218fcddc350d8fd8c6b Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Tue, 21 Nov 2017 17:30:50 +0000
Subject: [PATCH] dropbox: change default chunk size to 48MB now we are
 buffering them in memory

---
 docs/content/dropbox.md |  9 +++++++--
 dropbox/dropbox.go      | 25 +++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/docs/content/dropbox.md b/docs/content/dropbox.md
index 49a3d7a75..9611081fb 100644
--- a/docs/content/dropbox.md
+++ b/docs/content/dropbox.md
@@ -113,8 +113,13 @@ system.
 
 #### --dropbox-chunk-size=SIZE ####
 
-Upload chunk size. Max 150M. The default is 128MB.  Note that this
-isn't buffered into memory.
+Any files larger than this will be uploaded in chunks of this
+size. The default is 48MB. The maximum is 150MB.
+
+Note that chunks are buffered in memory (one at a time) so rclone can
+deal with retries.  Setting this larger will increase the speed
+slightly (at most 10% for 128MB in tests) at the cost of using more
+memory.  It can be set smaller if you are tight on memory.
 
 ### Limitations ###
 
diff --git a/dropbox/dropbox.go b/dropbox/dropbox.go
index c4d6e78e7..49ce003d6 100644
--- a/dropbox/dropbox.go
+++ b/dropbox/dropbox.go
@@ -66,8 +66,29 @@ var (
 	// See https://www.dropbox.com/en/help/145 - Ignored files
 	ignoredFiles = regexp.MustCompile(`(?i)(^|/)(desktop\.ini|thumbs\.db|\.ds_store|icon\r|\.dropbox|\.dropbox.attr)$`)
 	// Upload chunk size - setting too small makes uploads slow.
-	// Chunks aren't buffered into memory though so can set large.
-	uploadChunkSize    = fs.SizeSuffix(128 * 1024 * 1024)
+	// Chunks are buffered into memory for retries.
+	//
+	// Speed vs chunk size uploading a 1 GB file on 2017-11-22
+	//
+	// Chunk Size MB, Speed Mbyte/s, % of max
+	// 1	1.364	11%
+	// 2	2.443	19%
+	// 4	4.288	33%
+	// 8	6.79	52%
+	// 16	8.916	69%
+	// 24	10.195	79%
+	// 32	10.427	81%
+	// 40	10.96	85%
+	// 48	11.828	91%
+	// 56	11.763	91%
+	// 64	12.047	93%
+	// 96	12.302	95%
+	// 128	12.945	100%
+	//
+	// Choose 48MB which is 91% of Maximum speed.  rclone by
+	// default does 4 transfers so this should use 4*48MB = 192MB
+	// by default.
+	uploadChunkSize    = fs.SizeSuffix(48 * 1024 * 1024)
 	maxUploadChunkSize = fs.SizeSuffix(150 * 1024 * 1024)
 )