MONGOCRYPT-749 Retry rewrapManyDataKey encrypt requests #922
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adriandole
force-pushed
the
retry-fix
branch
from
afd7d11 to
eb50469
Compare
adriandole
force-pushed
the
retry-fix
branch
from
eb50469 to
293ced9
Compare
kevinAlbs
requested changes
Dec 30, 2024
| ASSERT_STATE_EQUAL(mongocrypt_ctx_state(ctx), MONGOCRYPT_CTX_NEED_KMS); // To encrypt. | ||
| ASSERT((kms = mongocrypt_ctx_next_kms_ctx(ctx))); | ||
| ASSERT(mongocrypt_kms_ctx_fail(kms)); // Simulate driver-side network failure for an encrypt request. | ||
| ASSERT((kms = mongocrypt_ctx_next_kms_ctx(ctx))); // Assert fails. Expected KMS request to retry but did not. |
There was a problem hiding this comment.
Suggested change
| ASSERT((kms = mongocrypt_ctx_next_kms_ctx(ctx))); // Assert fails. Expected KMS request to retry but did not. | |
| ASSERT((kms = mongocrypt_ctx_next_kms_ctx(ctx))); // Expect KMS request to retry. |
| _mongocrypt_ctx_rmd_datakey_t *it = rmdctx->datakeys; | ||
| while (it != NULL) { | ||
| _mongocrypt_ctx_datakey_t *dkctx = (_mongocrypt_ctx_datakey_t *)it->dkctx; | ||
| if (dkctx->kms.should_retry) { |
There was a problem hiding this comment.
Suggested change
| if (dkctx->kms.should_retry) { | |
| if (dkctx->kms.should_retry) { | |
| dkctx->kms.should_retry = false; // Reset retry state. |
Similar to other contexts (example), reset should_retry before returning.
| ASSERT((kms = mongocrypt_ctx_next_kms_ctx(ctx))); | ||
| ASSERT(mongocrypt_kms_ctx_fail(kms)); // Simulate driver-side network failure for an encrypt request. | ||
| ASSERT((kms = mongocrypt_ctx_next_kms_ctx(ctx))); // Assert fails. Expected KMS request to retry but did not. | ||
|
|
There was a problem hiding this comment.
Suggested change
| ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/rmd/kms-encrypt-reply-a.txt")), kms); | |
| ASSERT(mongocrypt_kms_ctx_bytes_needed(kms) == 0); | |
| ASSERT_OK(!mongocrypt_ctx_next_kms_ctx(ctx), ctx); | |
| ASSERT_OK(mongocrypt_ctx_kms_done(ctx), ctx); | |
| ASSERT_STATE_EQUAL(mongocrypt_ctx_state(ctx), MONGOCRYPT_CTX_READY); |
Suggest testing feeding the retried KMS context. This catches the missing should_retry = false.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.