summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Noma <gregory.noma@gmail.com>2021-06-09 10:10:53 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-06-09 14:24:15 +0000
commit2b6dd5eed03f10499355d0b864597a381035d472 (patch)
tree6bb1f7404321b8f5e59ed6acd955ab8b022b957b
parenta1f6788d1b48ecc62732f780b716d1f8848940ea (diff)
downloadmongo-2b6dd5eed03f10499355d0b864597a381035d472.tar.gz
SERVER-57192 Lower dbHash and background validation lock acquisition timeouts
-rw-r--r--src/mongo/db/catalog/collection_validation.cpp2
-rw-r--r--src/mongo/db/commands/dbhash.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/catalog/collection_validation.cpp b/src/mongo/db/catalog/collection_validation.cpp
index 5fc1c4e2b87..000e62bbc13 100644
--- a/src/mongo/db/catalog/collection_validation.cpp
+++ b/src/mongo/db/catalog/collection_validation.cpp
@@ -469,7 +469,7 @@ Status validate(OperationContext* opCtx,
// an index build that has just failed and is trying to write using the same timestamp we
// are using to read. Impose a generous maximum timeout to force validate to time out and
// allow the index build to make progress. See SERVER-53445.
- opCtx->lockState()->setMaxLockTimeout(duration_cast<Milliseconds>(Seconds(30)));
+ opCtx->lockState()->setMaxLockTimeout(duration_cast<Milliseconds>(Seconds(15)));
}
try {
diff --git a/src/mongo/db/commands/dbhash.cpp b/src/mongo/db/commands/dbhash.cpp
index fe7c1028c60..0ff604b8e78 100644
--- a/src/mongo/db/commands/dbhash.cpp
+++ b/src/mongo/db/commands/dbhash.cpp
@@ -220,7 +220,7 @@ public:
// just failed and is trying to write using the same timestamp we are using to read.
// Impose a generous maximum timeout to force dbHash to time out and allow the index
// build to make progress. See SERVER-53376.
- opCtx->lockState()->setMaxLockTimeout(duration_cast<Milliseconds>(Seconds(30)));
+ opCtx->lockState()->setMaxLockTimeout(duration_cast<Milliseconds>(Seconds(15)));
// Additionally, if we are performing a read at a timestamp, then we allow oplog
// application to proceed concurrently with the dbHash command. This is done