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.2' into merge-release-6.2-into-release-6.3 

# Conflicts:
#	fdbcli/fdbcli.actor.cpp
This commit is contained in:
A.J. Beamon 2021-03-15 13:59:30 -07:00
parent f9d6594d44 259e8ce69e
commit 2f479a5ca2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
documentation/sphinx/source/release-notes/release-notes-620.rst
View File

@ -4,6 +4,7 @@ Release Notes
6.2.33
======
* Fixed an issue where storage servers could shutdown with ``unknown_error``. `(PR #4380) <https://github.com/apple/foundationdb/pull/4437>`_
* Fix backup agent stall when writing to local filesystem with slow metadata operations. `(PR #4428) <https://github.com/apple/foundationdb/pull/4428>`_
* Backup agent no longer uses 4k block caching layer on local output files so that write operations are larger. `(PR #4428) <https://github.com/apple/foundationdb/pull/4428>`_

11
fdbserver/storageserver.actor.cpp
View File

@ -367,12 +367,19 @@ public:
UID UIDofLongest;
for (const auto& kv : startTimeMap) {
const double currentRunningTime = currentTime - kv.second;
if (longest < currentRunningTime) {
if (longest <= currentRunningTime) {
longest = currentRunningTime;
UIDofLongest = kv.first;
}
}
return { longest, keyRangeMap.at(UIDofLongest) };
if (BUGGIFY) {
UIDofLongest = deterministicRandom()->randomUniqueID();
}
auto it = keyRangeMap.find(UIDofLongest);
if (it != keyRangeMap.end()) {
return { longest, it->second };
}
return { -1, emptyKeyRange };
}
int numRunning() const { return startTimeMap.size(); }