Commit Graph

1704 Commits

Author SHA1 Message Date
sfc-gh-tclinkenbeard 8571dcfe28 Use override where applicable in fdbserver 2020-10-07 18:41:19 -07:00
sfc-gh-tclinkenbeard a3de8c333b Use override where applicable in fdbclient 2020-10-07 16:57:38 -07:00
sfc-gh-tclinkenbeard 4005abdeb3 Replace virtual with override in flow 2020-10-07 15:55:11 -07:00
Markus Pilman 268ba0bddc Merge remote-tracking branch 'origin/release-6.3' into merge-6.3 2020-10-01 14:14:06 -06:00
A.J. Beamon d72d3d6593 Explicit instantiations of internal_error were not logging the usual details about the error. 2020-09-25 08:39:34 -07:00
Evan Tschannen 4042e9c52f missed a conflict 2020-09-24 17:20:02 -07:00
Evan Tschannen 2d788b309f Merge branch 'release-6.2' into release-6.3
# Conflicts:
#	documentation/sphinx/source/api-error-codes.rst
#	flow/ThreadHelper.actor.h
#	flow/error_definitions.h
2020-09-24 17:16:58 -07:00
Evan Tschannen 9f549f755e updated the error code for blocked_from_network_thread because 2025 was already in use in release-6.3 2020-09-24 17:11:26 -07:00
Meng Xu 862336de8f Merge branch 'master' into mengxu/merge-to-master-PR 2020-09-24 17:06:00 -07:00
sfc-gh-tclinkenbeard 40f750ca55 Fix Windows CMake build 2020-09-20 11:33:18 -07:00
sfc-gh-tclinkenbeard 0ac08f6a9b Replace NULL with nullptr in flow 2020-09-20 11:31:49 -07:00
Young Liu 71309a79f9 Merge branch 'release-6.3' into range 2020-09-17 17:54:33 -07:00
Andrew Noyes d6e6e96e1f Weaken claims in documentation
In some cases with the multiversion client the deadlock won't be
detected
2020-09-17 20:51:08 +00:00
Andrew Noyes 01998a238f Add blockUntilReadyCheckOnMainThread 2020-09-17 20:26:28 +00:00
Jingyu Zhou ea27e4bd9c
Merge pull request #3772 from yliucode/rename
Rename master proxy as commit proxy
2020-09-16 20:06:50 -07:00
Andrew Noyes fb49257295 Revert trace change now that blocking on a ready future is ok 2020-09-16 21:53:14 +00:00
Andrew Noyes f6412c9f82 Only throw if the future is not ready 2020-09-16 21:34:13 +00:00
Andrew Noyes 734bdb72e1 Fix simulation trace impl occurence 2020-09-15 16:49:31 +00:00
Andrew Noyes 0beab42b78 Add blocked_from_network_thread error 2020-09-15 16:49:12 +00:00
Andrew Noyes 3c3943f64f Disallow calling blockUntilReady from main thread
Also fix a data race that apparently hasn't been ported to 6.2 yet
2020-09-14 16:01:45 +00:00
Young Liu 35bef73a1c Rename proxy to commit proxy 2020-09-10 17:44:15 -07:00
Andrew Noyes 81ac8211d1 Add comment 2020-09-10 08:32:52 -07:00
Xin Dong 0c25a953be Fix compiler error. This cast is safe as it's only used locally so the data layout doesn't matter at all. 2020-09-08 16:05:38 -07:00
Young Liu 3728ed03dd Resolve comments 2020-09-05 18:55:09 -07:00
Andrew Noyes 0e49542d59 Fix data race described in #3749 2020-09-05 13:58:22 -07:00
Young Liu 1ad5e17458 add support for comparing original and current impls 2020-09-05 11:14:59 -07:00
Young Liu 87693cae81 merge master branch and resolve conflicts 2020-09-02 13:44:33 -07:00
Evan Tschannen 12edadd059 Merge branch 'release-6.3'
# Conflicts:
#	CMakeLists.txt
#	fdbclient/Knobs.cpp
#	fdbclient/MasterProxyInterface.h
#	fdbrpc/simulator.h
#	fdbserver/MasterProxyServer.actor.cpp
#	tests/fast/CycleAndLock.txt
#	tests/fast/TxnStateStoreCycleTest.txt
#	tests/fast/VersionStamp.txt
#	tests/slow/ParallelRestoreOldBackupApiCorrectnessAtomicRestore.txt
#	tests/slow/ParallelRestoreOldBackupCorrectnessCycle.txt
#	versions.target
2020-08-31 19:33:34 -07:00
Evan Tschannen e7a1892947 fixed a compiler warning 2020-08-31 15:01:19 -07:00
Evan Tschannen 5c97461d18
Merge pull request #3653 from etschannen/feature-proxy-busy-loadbalance
Changed proxy load balancing to balance on CPU usage
2020-08-31 10:39:08 -07:00
Young Liu 8994719e46 Merge branch 'master' into grv-proxy 2020-08-31 10:21:32 -07:00
Evan Tschannen 2f5359fa13 fix: lastRunLoopBusyness did count the currently active time 2020-08-31 09:21:44 -07:00
Evan Tschannen 29eec30183 Merge branch 'release-6.2' into release-6.3
# Conflicts:
#	CMakeLists.txt
#	build/Dockerfile
#	build/Dockerfile.devel
#	documentation/sphinx/source/downloads.rst
#	fdbserver/Knobs.cpp
#	fdbserver/LogSystem.h
#	fdbserver/MasterProxyServer.actor.cpp
#	fdbserver/TagPartitionedLogSystem.actor.cpp
#	fdbserver/WaitFailure.actor.cpp
#	fdbserver/fdbserver.vcxproj
#	fdbserver/fdbserver.vcxproj.filters
#	packaging/msi/FDBInstaller.wxs
2020-08-31 01:10:29 -07:00
Evan Tschannen c9ff450a36 do not reject a connection as redundant if our existing connection is more than 15 seconds old 2020-08-30 18:49:49 -07:00
Young Liu e87327b33b Merge master branch and keep master proxy reporting txn cost estimation to ratekeeper 2020-08-29 12:47:35 -07:00
Evan Tschannen f6f9aea09e fix: runLoopBusyness was always zero 2020-08-28 09:29:54 -07:00
Evan Tschannen 939f59d989
Merge pull request #3672 from sfc-gh-tclinkenbeard/make-iasyncfile-const-correct
Make IAsyncFile const-correct
2020-08-27 11:22:46 -07:00
Young Liu 63b3612ad5 Merge master branch and resolve conflicts 2020-08-24 16:42:31 -07:00
Xiaoxi Wang 4e4fa0fded merge with master 2020-08-24 21:04:53 +00:00
Trevor Clinkenbeard e7662eecda
Merge pull request #3669 from sfc-gh-xwang/tag-report
Report recommended tx tag to be throttled to status json
2020-08-24 12:06:25 -07:00
Evan Tschannen 947a625968
Update flow/Knobs.cpp
Co-authored-by: A.J. Beamon <ajbeamon@users.noreply.github.com>
2020-08-24 11:33:49 -07:00
XiaoxiWang 0d65e1e0e0 update ProtocolVersion 2020-08-23 21:03:26 +00:00
Xiaoxi Wang e375761581 Merge branch 'master' of https://github.com/apple/foundationdb 2020-08-20 20:29:14 +00:00
sfc-gh-tclinkenbeard 157700e5b6 Make IAsyncFile const-correct 2020-08-19 17:34:56 -07:00
sfc-gh-tclinkenbeard 7b210aee24 Use =delete to disable special member functions
This has the benefits of:
- Easier to understand compiler error messages
- Moves some errors from link-time to compile-time
- NonCopyable classes can still specify default move constructors
2020-08-18 11:07:00 -07:00
Evan Tschannen 9e2ee1ed4c fixed lastedZeroBusy; added a knob 2020-08-17 23:16:59 -07:00
Xiaoxi Wang 548ba06510 change map to deque; code style problem 2020-08-14 18:30:58 +00:00
Xiaoxi Wang 475d4cca72 solve some cr comments 2020-08-14 16:40:16 +00:00
Evan Tschannen c72068d6b5 clients load balance across proxies based on process busyness instead of number of requests 2020-08-12 17:17:21 -07:00
Young Liu 8953cc5f98 Merge master again 2020-08-12 16:59:07 -07:00