no locking for small chunks, add bigger timeframe in that case

Author: NickOvt

lib/attachments/gridstore-storage.js

@@ -231,6 +231,11 @@ class GridstoreStorage {
                             return done();
                         }
 
+                        if (attachment.body.length < 255 * 1024) {
+                            // a single chunk attachment, no need for locking
+                            return done();
+                        }
+
                         // Try to get a lock
                         // Using locks is required to prevent multiple messages storing the same large attachment at
                         // the same time.
@@ -265,8 +270,8 @@ class GridstoreStorage {
                                 return;
                             }
                             // most probably a race condition, try again
-                            if (tryCount++ < 5) {
-                                if (/\.chunks /.test(err.message)) {
+                            if (tryCount++ < 20) {
+                                if (/\.chunks /.test(err.message) || err.code === 11000) {
                                     // Partial chunks detected. Might be because of:
                                     // * another process is inserting the same attachment and thus no "files" entry yet (should not happened though due to locking)
                                     // * previously deleted attachment that has not been properly removed
@@ -294,8 +299,8 @@ class GridstoreStorage {
 
                                             // Check how old is the previous chunk
                                             let timestamp = data._id.getTimestamp();
-                                            if (timestamp && typeof timestamp.getTime === 'function' && timestamp.getTime() >= Date.now() - 5 * 60 * 1000) {
-                                                // chunk is newer than 5 minutes, assume race condition and try again after a while
+                                            if (timestamp && typeof timestamp.getTime === 'function' && timestamp.getTime() >= Date.now() - 30 * 60 * 1000) {
+                                                // chunk is newer than 30 minutes, assume race condition and try again after a while
                                                 return setTimeout(tryStore, 300 + 200 * Math.random());
                                             }