87693cae81
merge master branch and resolve conflicts
2020-09-02 13:44:33 -07:00
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
cbded48b70
Merge branch 'release-6.3' of github.com:apple/foundationdb into release-6.3
2020-08-31 11:06:13 -07:00
1883f0d21f
Merge branch 'release-6.2' into release-6.3
2020-08-31 10:40:52 -07:00
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
8994719e46
Merge branch 'master' into grv-proxy
2020-08-31 10:21:32 -07:00
b4a1c269b8
lastConnectTime was not being set for incomingConnections
2020-08-31 09:10:30 -07:00
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
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
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
e8e24a8ed6
Resolve comments
2020-08-26 21:04:35 -07:00
a2ab709a0c
BackupContainer:Use processId as the process filename
...
instead of using a randomly generated string which change every time
when a file is open.
Having too many files will trigger TOO_MANY_FILES error
2020-08-26 15:54:34 -07:00
63b3612ad5
Merge master branch and resolve conflicts
2020-08-24 16:42:31 -07:00
0239d612d1
Verbose printf cleanup
2020-08-23 13:35:00 +05:30
6a8da71e80
Issue 1647 Resolution
2020-08-21 06:12:39 -05:00
6e0df3b9ac
Fix AsyncFileWinASIO build
2020-08-19 21:05:56 -07:00
c8b774a30a
Explicitly mark IAsyncFile functions as overrided
2020-08-19 18:17:32 -07:00
157700e5b6
Make IAsyncFile const-correct
2020-08-19 17:34:56 -07:00
9e2ee1ed4c
fixed lastedZeroBusy; added a knob
2020-08-17 23:16:59 -07:00
7c84e04028
fixed compiler errors
2020-08-12 17:22:37 -07:00
c72068d6b5
clients load balance across proxies based on process busyness instead of number of requests
2020-08-12 17:17:21 -07:00
8953cc5f98
Merge master again
2020-08-12 16:59:07 -07:00
79ce16650d
merge master branch
2020-08-11 19:22:10 -07:00
ba803a5ea3
Fixed formatting issues and removed GRV related code in MasterProxy
2020-08-11 18:54:54 -07:00
3192984309
Remove unused zlib library
2020-08-11 17:15:07 -07:00
104bac3cbd
Add trace to debug
2020-08-07 13:02:41 -07:00
d6a23a4d6b
Resolve comments to make GRV proxy a separate process class
2020-08-06 00:01:57 -07:00
5c7b4c7acf
Merge branch 'master' of github.com:apple/foundationdb
2020-07-31 15:58:13 -07:00
ea2837dd5e
Remove bogus function that is never used
2020-07-30 09:24:08 -07:00
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
a2089b354a
RemoveServersSafely:Safety check toKill1 to avoid cluster getting stuck
...
toKill1 and toKill2 are a random subset of all processes. If simply kill all processes in toKill1 or toKill2,
we may kill too many processes to make the cluster unavailable and stuck.
Similar as what toKill2 were modified if it can cause cluster unavailable,
we should do the same thing for toKill1
2020-07-28 21:07:31 -07:00
229ab0d5f1
Fix some conflicts and remote debugging trace events
2020-07-22 23:35:46 -07:00
525f10e30c
Merge master branch
2020-07-22 16:08:49 -07:00
302cf5c45f
Remove debug trace events
2020-07-22 12:20:22 -07:00
ab0d8b0626
Merge pull request #3509 from sfc-gh-anoyes/anoyes/remove-using-relops
...
Remove using namespace std::rel_ops
2020-07-22 11:58:25 -07:00
abaae40453
Modified ComposedIdentifier to prevent file identifier conflicts at
...
compile-time
2020-07-20 18:52:44 -07:00
38cade1146
Merged tag release-6.3.3 into tls-background-handshake.
2020-07-17 23:39:57 -07:00
2703cedac5
Fixed known bugs
2020-07-17 22:24:52 -07:00
d375ee7939
Rolled back the knob and logic for doing multiple write() calls in write loops before yielding, because they are not necessary. The testing that suggested otherwise was in error.
2020-07-16 22:54:14 -07:00
c4f3553826
TLS handshake limit changed to regular flow lock, added new knob for simultaneous handshakes limit and removed old knobs. Added knob to control how much data the FlowTransport connectionWriter() can write using multiple write() calls before yielding to other tasks, and updated p2p network test to use the same logic. Changed knob defaults for send limit on single writes and TLS handshake thread count.
2020-07-16 02:31:17 -07:00
5b06d69d25
Pass watches test
2020-07-15 00:37:41 -07:00
47ae66bd61
Merge branch 'master' into mengxu/tmp-minor-comment-PR
...
Resolve conflict at waitFailureClient
2020-07-13 16:17:50 -07:00
8ae0d9b73d
Resolve merge conflict
2020-07-13 10:21:53 -07:00
ef8c1060a2
Merge branch 'master' into mengxu/tmp-merge-6.3
2020-07-13 10:15:56 -07:00
6f2e12be42
Minor improvement on comments
2020-07-12 18:32:47 -07:00
a3245d5cc2
Address review comments
2020-07-10 19:04:35 -07:00
f470ba8316
Remove using namespace std::rel_ops
...
This causes the following to not compile anymore
\#include <utility>
\#include <vector>
using namespace std::rel_ops;
int main() {
std::vector<int> xs;
return xs.rbegin() != xs.rend();
}
See https://godbolt.org/z/s1977n
2020-07-10 22:58:15 +00:00
b09dddc07e
Merge branch 'release-6.2' into merge-release-6.2-into-release-6.3
...
# Conflicts:
# cmake/ConfigureCompiler.cmake
# documentation/sphinx/source/downloads.rst
# fdbrpc/FlowTransport.actor.cpp
# fdbrpc/fdbrpc.vcxproj
# fdbserver/DataDistributionQueue.actor.cpp
# fdbserver/Knobs.cpp
# fdbserver/Knobs.h
# fdbserver/LogSystemPeekCursor.actor.cpp
# fdbserver/MasterProxyServer.actor.cpp
# fdbserver/Status.actor.cpp
# fdbserver/storageserver.actor.cpp
# flow/flow.vcxproj
2020-07-10 15:06:34 -07:00
2e5ae8eed5
Change iterator name to small case
2020-07-10 10:56:41 -07:00
1a57d88179
Add const iterator for RangeMap
2020-07-10 10:56:41 -07:00
Young Liu