wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-6.3' into mengxu/fr-sched-PR

This commit is contained in:
Meng Xu 2020-08-18 17:41:31 -07:00
parent e1d150662f 8f9ae86212
commit 33f5ce98c7
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbclient/NativeAPI.actor.cpp
View File

@ -3755,9 +3755,9 @@ Future<Void> Transaction::onError( Error const& e ) {
return e; return e;
} }
ACTOR Future<StorageMetrics> getStorageMetricsLargeKeyRange(Database cx, KeyRangeRef keys); ACTOR Future<StorageMetrics> getStorageMetricsLargeKeyRange(Database cx, KeyRange keys);
ACTOR Future<StorageMetrics> doGetStorageMetrics(Database cx, KeyRangeRef keys, Reference<LocationInfo> locationInfo) { ACTOR Future<StorageMetrics> doGetStorageMetrics(Database cx, KeyRange keys, Reference<LocationInfo> locationInfo) {
loop { loop {
try { try {
WaitMetricsRequest req(keys, StorageMetrics(), StorageMetrics()); WaitMetricsRequest req(keys, StorageMetrics(), StorageMetrics());
@ -3779,7 +3779,7 @@ ACTOR Future<StorageMetrics> doGetStorageMetrics(Database cx, KeyRangeRef keys,
} }
} }
ACTOR Future<StorageMetrics> getStorageMetricsLargeKeyRange(Database cx, KeyRangeRef keys) { ACTOR Future<StorageMetrics> getStorageMetricsLargeKeyRange(Database cx, KeyRange keys) {
vector<pair<KeyRange, Reference<LocationInfo>>> locations = wait(getKeyRangeLocations( vector<pair<KeyRange, Reference<LocationInfo>>> locations = wait(getKeyRangeLocations(
cx, keys, std::numeric_limits<int>::max(), false, &StorageServerInterface::waitMetrics, TransactionInfo(TaskPriority::DataDistribution))); cx, keys, std::numeric_limits<int>::max(), false, &StorageServerInterface::waitMetrics, TransactionInfo(TaskPriority::DataDistribution)));

8
tests/CMakeLists.txt
View File

@ -167,11 +167,11 @@ if(WITH_PYTHON)
TEST_FILES restarting/from_7.0.0/ConfigureTestRestart-1.txt TEST_FILES restarting/from_7.0.0/ConfigureTestRestart-1.txt
restarting/from_7.0.0/ConfigureTestRestart-2.txt) restarting/from_7.0.0/ConfigureTestRestart-2.txt)
add_fdb_test( add_fdb_test(
TEST_FILES restarting/CycleTestRestart-1.txt TEST_FILES restarting/from_5.0.0/CycleTestRestart-1.txt
restarting/CycleTestRestart-2.txt) restarting/from_5.0.0/CycleTestRestart-2.txt)
add_fdb_test( add_fdb_test(
TEST_FILES restarting/StorefrontTestRestart-1.txt TEST_FILES restarting/from_5.0.0/StorefrontTestRestart-1.txt
restarting/StorefrontTestRestart-2.txt) restarting/from_5.0.0/StorefrontTestRestart-2.txt)
add_fdb_test( add_fdb_test(
TEST_FILES restarting/from_6.2.0/SnapTestAttrition-1.txt TEST_FILES restarting/from_6.2.0/SnapTestAttrition-1.txt
restarting/from_6.2.0/SnapTestAttrition-2.txt) restarting/from_6.2.0/SnapTestAttrition-2.txt)

0
tests/restarting/CycleTestRestart-1.txt → tests/restarting/from_5.0.0/CycleTestRestart-1.txt
View File

0
tests/restarting/CycleTestRestart-2.txt → tests/restarting/from_5.0.0/CycleTestRestart-2.txt
View File

0
tests/restarting/StorefrontTestRestart-1.txt → tests/restarting/from_5.0.0/StorefrontTestRestart-1.txt
View File

0
tests/restarting/StorefrontTestRestart-2.txt → tests/restarting/from_5.0.0/StorefrontTestRestart-2.txt
View File