chore(storage): Add retry tests for appends. (#12096)

* chore(storage): Add retry tests for appends.

Some append retry tests were lost. Re-add them, and increase the size of
the objects in the append tests to exercise more interesting message
flows.

* test higher emulator timeout

* revert increased timeout

---------

Co-authored-by: Chris Cotter <[email protected]>

Author: cjc25

storage/internal/test/conformance/retry_tests.json

@@ -288,10 +288,10 @@
       "description": "appendable_handle_retries_after_first_response",
       "cases": [
         {
-          "instructions": ["return-503-after-2048K"]
+          "instructions": ["return-503-after-4097K"]
         },
         {
-          "instructions": ["return-503-after-2048K", "return-408"]
+          "instructions": ["return-503-after-4097K", "return-408"]
         }
       ],
       "methods": [
@@ -330,6 +330,34 @@
       ],
       "preconditionProvided": true,
       "expectSuccess": false
+    },
+    {
+      "id": 12,
+      "description": "appendable_retry_with_redirect_token",
+      "cases": [
+        {
+          "instructions": ["redirect-send-token-abc", "redirect-expect-token-abc"]
+        }
+      ],
+      "methods": [
+        {"name": "storage.objects.insert", "group": "storage.appendable.upload", "resources": []}
+      ],
+      "preconditionProvided": false,
+      "expectSuccess": true
+    },
+    {
+      "id": 13,
+      "description": "appendable_retry_with_handle_and_redirect_token",
+      "cases": [
+        {
+          "instructions": ["redirect-send-handle-and-token-abc", "redirect-expect-token-abc"]
+        }
+      ],
+      "methods": [
+        {"name": "storage.objects.insert", "group": "storage.appendable.upload", "resources": []}
+      ],
+      "preconditionProvided": false,
+      "expectSuccess": true
     }
   ]
 }

storage/retry_conformance_test.go

@@ -643,11 +643,13 @@ var methods = map[string][]retryFunc{
 			}
 
 			objW := obj.NewWriter(ctx)
-			objW.ChunkSize = MiB
+			// Force multiple messages per chunk, and multiple chunks in the object.
+			objW.ChunkSize = 2 * maxPerMessageWriteSize
+			toWrite := generateRandomBytes(objW.ChunkSize * 2)
 			objW.Append = true
 			objW.FinalizeOnClose = true
 
-			if _, err := objW.Write(randomBytes3MiB); err != nil {
+			if _, err := objW.Write(toWrite); err != nil {
 				return fmt.Errorf("Writer.Write: %v", err)
 			}
 			if err := objW.Close(); err != nil {
@@ -666,10 +668,10 @@ var methods = map[string][]retryFunc{
 			}
 
 			gotMd5 := md5.Sum(content)
-			expectedMd5 := md5.Sum(randomBytes3MiB)
+			expectedMd5 := md5.Sum(toWrite)
 			if d := cmp.Diff(gotMd5, expectedMd5); d != "" {
 				return fmt.Errorf("content mismatch, got %v bytes (md5: %v), want %v bytes (md5: %v)",
-					len(content), gotMd5, len(randomBytes3MiB), expectedMd5)
+					len(content), gotMd5, len(toWrite), expectedMd5)
 			}
 			return nil
 		},
@@ -688,10 +690,12 @@ var methods = map[string][]retryFunc{
 			}
 
 			objW := obj.NewWriter(ctx)
+			// Force multiple messages per chunk, and multiple chunks in the object.
+			objW.ChunkSize = 2 * maxPerMessageWriteSize
+			toWrite := generateRandomBytes(objW.ChunkSize * 2)
 			objW.Append = true
-			objW.ChunkSize = MiB
 
-			if _, err := objW.Write(randomBytes3MiB); err != nil {
+			if _, err := objW.Write(toWrite); err != nil {
 				return fmt.Errorf("Writer.Write: %w", err)
 			}
 			if _, err := objW.Flush(); err != nil {
@@ -715,10 +719,10 @@ var methods = map[string][]retryFunc{
 			}
 
 			gotMd5 := md5.Sum(content)
-			expectedMd5 := md5.Sum(randomBytes3MiB)
+			expectedMd5 := md5.Sum(toWrite)
 			if d := cmp.Diff(gotMd5, expectedMd5); d != "" {
 				return fmt.Errorf("content mismatch, got %v bytes (md5: %v), want %v bytes (md5: %v)",
-					len(content), gotMd5, len(randomBytes3MiB), expectedMd5)
+					len(content), gotMd5, len(toWrite), expectedMd5)
 			}
 			return nil
 		},