From d0fbc41338b139e83c6e607aa6aaccadaee31ec1 Mon Sep 17 00:00:00 2001 From: John King Date: Fri, 28 Jul 2017 18:50:32 -0700 Subject: [PATCH] set LOCK_AWARE on several transactions used for getting cluster info for the consistency check --- fdbserver/QuietDatabase.actor.cpp | 1 + fdbserver/workloads/ConsistencyCheck.actor.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/fdbserver/QuietDatabase.actor.cpp b/fdbserver/QuietDatabase.actor.cpp index 38f295f9e0..5fea70df12 100644 --- a/fdbserver/QuietDatabase.actor.cpp +++ b/fdbserver/QuietDatabase.actor.cpp @@ -139,6 +139,7 @@ ACTOR Future> getStorageServers( Database cx, boo state Transaction tr( cx ); if (use_system_priority) tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE); + tr.setOption(FDBTransactionOptions::LOCK_AWARE); loop { try { Standalone serverList = wait( tr.getRange( serverListKeys, CLIENT_KNOBS->TOO_MANY ) ); diff --git a/fdbserver/workloads/ConsistencyCheck.actor.cpp b/fdbserver/workloads/ConsistencyCheck.actor.cpp index df9da038c2..1341e131f4 100644 --- a/fdbserver/workloads/ConsistencyCheck.actor.cpp +++ b/fdbserver/workloads/ConsistencyCheck.actor.cpp @@ -171,6 +171,7 @@ struct ConsistencyCheckWorkload : TestWorkload state DatabaseConfiguration configuration; state Transaction tr(cx); + tr.setOption(FDBTransactionOptions::LOCK_AWARE); loop { try { Standalone res = wait( tr.getRange(configKeys, 1000) ); @@ -285,6 +286,7 @@ struct ConsistencyCheckWorkload : TestWorkload loop { state Transaction tr(cx); + tr.setOption(FDBTransactionOptions::LOCK_AWARE); try { Version version = wait(tr.getReadVersion()); @@ -532,6 +534,7 @@ struct ConsistencyCheckWorkload : TestWorkload ACTOR Future getDatabaseSize(Database cx) { state Transaction tr( cx ); + tr.setOption(FDBTransactionOptions::LOCK_AWARE); loop { try { StorageMetrics metrics = wait( tr.getStorageMetrics( KeyRangeRef(allKeys.begin, keyServersPrefix), 100000 ) );