Fix result manifest request failures due to exceeding request size limit

1 files changed, 19 insertions, 2 deletions

diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx
index 982f67c..3cfc4b8 100644
--- a/bbot/agent/agent.cxx
+++ b/bbot/agent/agent.cxx
@@ -1432,7 +1432,11 @@ try
 
           try
           {
-            serialize_manifest (tq, c.out, u, "task request", false);
+            serialize_manifest (tq,
+                                c.out,
+                                u,
+                                "task request",
+                                false /* fail_hard */);
           }
           catch (const failed&) {f = true;}
 
@@ -1629,7 +1633,20 @@ try
 
         try
         {
-          serialize_manifest (rq, c.out, u, "task request");
+          // Don't break lines in the manifest values not to further increase
+          // the size of the result request manifest encoded representation.
+          // Note that this manifest can contain quite a few lines in the
+          // operation logs, potentially truncated to fit the upload limit
+          // (see worker/worker.cxx for details). Breaking these lines can
+          // increase the request size beyond this limit and so we can end up
+          // with the request failure.
+          //
+          serialize_manifest (rq,
+                              c.out,
+                              u,
+                              "result request",
+                              true /* fail_hard */,
+                              true /* long_lines */);
         }
         catch (const failed&) {f = true;}