From a9afc998b3b4d72834443d5bd897a1e9822ecc2e Mon Sep 17 00:00:00 2001 From: Zuul Date: Wed, 31 Mar 2021 08:31:53 +0000 Subject: [PATCH] Update git submodules * Update keystone from branch 'master' to 10057702ac361213e74472ec1d0d4e4c4a041f09 - Merge "Retry update_user when sqlalchemy raises StaleDataErrors" - Retry update_user when sqlalchemy raises StaleDataErrors Keystone's update_user() method in the SQL driver processes a lot of information about how to update users. This includes evaluating password logic and authentication attempts for PSI-DSS. This logic is evaluated after keystone pulls the user record from SQL and before it exits the context manager, which performs the write. When multiple clients are all updating the same user reference, it's more likely they will see an HTTP 500 because of race conditions exiting the context manager. The HTTP 500 is due to stale data when updating password expiration for old passwords, which happens when setting a new password for a user. This commit attempts to handle that case more gracefully than throwing a 500 by detecting StaleDataErrors from sqlalchemy and retrying. The identity sql backend will retry the request for clients that have stale data change from underneath them. Change-Id: I75590c20e90170ed862f46f0de7d61c7810b5c90 Closes-Bug: 1885753 --- keystone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystone b/keystone index 47df4ab8c1..10057702ac 160000 --- a/keystone +++ b/keystone @@ -1 +1 @@ -Subproject commit 47df4ab8c1aafb050c0389fd94b43e1279380d32 +Subproject commit 10057702ac361213e74472ec1d0d4e4c4a041f09