Revert "Reland "lib: Batch hash signing + split parallelism for paygen payload""
This reverts commit e7df76e9b7028dc8f665a721e11885e1b485c5d9.
Reason for revert: b/241565562#comment19
Original change's description:
> Reland "lib: Batch hash signing + split parallelism for paygen payload"
>
> This is a reland of commit 450d373d8f193e813ca9e0bf57053aa385f7c565
>
> Fix Rubik build failures of empty paygen payload list.
>
> Squashing in:
> Significant amount of time is spent creating the payloads, which is
> amplified with multiple signers running in sequence.
> Batched signing requests get bottlenecked due to this, since each signer
> runs only after running the batched set to paygen payloads to gen+sign.
>
> This parallelizes per signer to bring paygen times down.
>
> Original change's description:
> > lib: Batch hash signing + split parallelism for paygen payload
> >
> > Calls into paygen payload used to individually send hashes (payload +
> > metadata) per paygen payload to signers, this is batched now.
> >
> > This will reduce the # of signing requests sent, but callers into paygen
> > payload should bundle/batch the payloads to sign when calling into
> > paygen_payload_lib.
> >
> > ```
> > Generate update payload
> > w/|w/o private key
> > w/|w/o verification
> > w/|w/o src image
> > ```
> >
> > BUG=b:241565562
> > TEST=./run_tests -- -x lib/paygen/ service/ api/controller/
> > TEST=comment
> >
> > Change-Id: I243fb6d26a151b0591811698a8cbbc36c75fab0c
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3818783
> > Reviewed-by: Mike Frysinger <vapier@chromium.org>
> > Tested-by: Jae Hoon Kim <kimjae@chromium.org>
> > Commit-Queue: Jae Hoon Kim <kimjae@chromium.org>
>
> BUG=b:241565562
> TEST=./run_tests -- -x lib/paygen/ service/ api/controller/
>
> Change-Id: I529aa90b4fa103577fdc00593cce2df9e863317f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3845086
> Tested-by: Jae Hoon Kim <kimjae@chromium.org>
> Reviewed-by: Mike Frysinger <vapier@chromium.org>
> Commit-Queue: Jae Hoon Kim <kimjae@chromium.org>
Bug: b:241565562
Change-Id: I47316db0c9e22996d658da97d312aaf3834148be
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3857455
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: George Engelbrecht <engeg@google.com>
Tested-by: George Engelbrecht <engeg@google.com>
diff --git a/api/controller/payload_unittest.py b/api/controller/payload_unittest.py
index 6606d98..2b9254d 100644
--- a/api/controller/payload_unittest.py
+++ b/api/controller/payload_unittest.py
@@ -65,7 +65,8 @@
def testCallSucceeds(self):
"""Check that a call is made successfully."""
# Deep patch the paygen lib, this is a full run through service as well.
- self.PatchObject(paygen_payload_lib, 'GeneratePayloads')
+ patch_obj = self.PatchObject(paygen_payload_lib, 'PaygenPayload')
+ patch_obj.return_value.Run.return_value = 'gs://something'
res = payload.GeneratePayload(self.req, self.result, self.api_config)
self.assertEqual(res, controller.RETURN_CODE_SUCCESS)
@@ -89,7 +90,8 @@
def testMiniOSSuccess(self):
"""Test a miniOS paygen request."""
- self.PatchObject(paygen_payload_lib, 'GeneratePayloads')
+ patch = self.PatchObject(paygen_payload_lib, 'PaygenPayload')
+ patch.return_value.Run.return_value = 'gs://minios/something'
res = payload.GeneratePayload(self.minios_req, self.result, self.api_config)
self.assertEqual(res, controller.RETURN_CODE_SUCCESS)