Jingyu Zhou
ea27e4bd9c
Merge pull request #3772 from yliucode/rename
...
Rename master proxy as commit proxy
2020-09-16 20:06:50 -07:00
Young Liu
35bef73a1c
Rename proxy to commit proxy
2020-09-10 17:44:15 -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
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
Evan Tschannen
2f52c5f79b
Merge branch 'release-6.3'
...
# Conflicts:
# fdbserver/RestoreLoader.actor.cpp
2020-08-11 22:45:43 -07:00
Young Liu
79ce16650d
merge master branch
2020-08-11 19:22:10 -07:00
Russell Sears
92fe6abbf9
Merge pull request #3506 from sfc-gh-mpilman/bugfixes/spin-lock-false-sharing
...
Make ThreadSpinLock large to prevent false sharing
2020-08-10 12:02:04 -07:00
Evan Tschannen
18e53caf6e
Merge pull request #3489 from sfc-gh-tclinkenbeard/dont-throw-deque-relocate
...
Add exception-safety to Deque::grow
2020-08-06 10:33:49 -07:00
Meng Xu
3a3e5d6732
Merge pull request #3590 from sfc-gh-tclinkenbeard/expand-fdbbench
...
Expand flowbench benchmarks
2020-08-05 22:34:10 -07:00
Evan Tschannen
05306e9c12
Merge pull request #3581 from sfc-gh-anoyes/anoyes/remove-bogus-operator
...
I don't think 1 - <iter> makes sense, so let's remove this
2020-08-05 10:35:20 -07:00
Meng Xu
d55bb5e489
Merge pull request #3587 from sfc-gh-tclinkenbeard/update-mininvalidprotocolversion
...
Update minInvalidProtocolVersion to 7.2.0
2020-08-03 10:09:28 -07:00
Meng Xu
62a6e71626
Merge pull request #3591 from apple/release-6.3
...
Merge Release 6.3 to master
2020-08-02 12:45:02 -07:00
sfc-gh-tclinkenbeard
3346e751b4
Added bench_ref benchmarks to fdbbench
2020-08-01 21:51:06 -07:00
Chaoguang Lin
d9e5d65aaf
Merge remote-tracking branch 'upstream/master' into add-management-api-into-special-key-space
2020-08-01 00:31:26 -07:00
sfc-gh-tclinkenbeard
e1ee953a8a
Updated minInvalidProtocolVersion to 7.2.0
2020-07-31 20:15:27 -07:00
Evan Tschannen
5c7b4c7acf
Merge branch 'master' of github.com:apple/foundationdb
2020-07-31 15:58:13 -07:00
Chaoguang Lin
fa806c6cf9
Change \xff\xff to 0xff0xff in message
2020-07-31 15:46:38 -07:00
Chaoguang Lin
f2662a9a74
Merge remote-tracking branch 'upstream/master' into add-management-api-into-special-key-space
2020-07-30 19:01:11 -07:00
Chaoguang Lin
10540a3c73
Change error name and fix a bug in ExclusionInProgressRangeImpl::getRange()
2020-07-30 18:58:09 -07:00
Jingyu Zhou
587b845934
Merge pull request #3579 from jzhou77/fix
...
Fix unit test failure
2020-07-30 16:35:31 -07:00
Jingyu Zhou
cb582e58c9
Avoid iterator+2 or -2 passes over the boundary
2020-07-30 13:42:36 -07:00
Andrew Noyes
9ec91cd660
I don't think 1 - <iter> makes sense, so let's remove this
2020-07-30 20:02:44 +00:00
Jingyu Zhou
9a63882cd4
Fix unit test failure
2020-07-30 11:01:52 -07:00
Evan Tschannen
440d46bccc
Merge pull request #3523 from Daniel-B-Smith/global-data-races
...
Fix some unprotected accesses to global data
2020-07-29 11:44:11 -07:00
Young Liu
86148f1277
Merge branch 'master' into grv-proxy
2020-07-29 11:14:51 -07:00
Evan Tschannen
a49cb41de7
Merge branch 'release-6.3'
...
# Conflicts:
# CMakeLists.txt
# cmake/ConfigureCompiler.cmake
# fdbserver/Knobs.cpp
# fdbserver/StorageCache.actor.cpp
# fdbserver/storageserver.actor.cpp
# flow/ThreadHelper.actor.h
# flow/serialize.h
# tests/CMakeLists.txt
2020-07-29 00:31:55 -07:00
Trevor Clinkenbeard
602b0f9dea
Merge branch 'master' into vectorref-emplace-back
2020-07-28 17:17:11 -07:00