Commit Graph

11750 Commits

Author SHA1 Message Date
Evan Tschannen 3623b28df5 fixed merge conflict 2020-07-29 00:36:12 -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
Evan Tschannen 314d0a5255
Merge pull request #3573 from etschannen/post-release-cleanup-6.3.4
Post release cleanup 6.3.4
2020-07-28 23:56:59 -07:00
Evan Tschannen 0c8bec5e43 update installer WIX GUID following release 2020-07-28 23:17:10 -07:00
Evan Tschannen 7cdf0b5c31 update version to 6.3.5 2020-07-28 23:17:10 -07:00
Meng Xu 35ebdec9d2
Merge pull request #3558 from sfc-gh-anoyes/anoyes/remove-redundant-cast
Remove redundant cast
2020-07-28 17:01:48 -07:00
Meng Xu 2b8aa296bb
Merge pull request #3482 from sfc-gh-tclinkenbeard/support-downgrades
Support and test downgrades
2020-07-28 17:00:54 -07:00
Meng Xu 6b28687c65
Merge pull request #3570 from sfc-gh-anoyes/anoyes/enable-Wall-Wextra
Re-enable -Wall -Wextra for clang
2020-07-28 14:35:38 -07:00
Andrew Noyes d2cf700bd4 Fix compiler warnings 2020-07-28 18:30:26 +00:00
Andrew Noyes 1d22a21510 Revert "temporarily disable compiler warnings"
This reverts commit 29142fa382.
2020-07-28 17:19:52 +00:00
Balachandar Namasivayam 9c569c6ecf
Merge pull request #3569 from xumengpanda/mengxu/fr-fix-frtool-PR
FastRestoreTool: Fix --dest_cluster_file option
2020-07-28 09:56:00 -07:00
Steve Atherton f065cbbd2d
Merge pull request #3534 from sfc-gh-xwang/master
Throttling related workload improvements
2020-07-28 00:40:06 -07:00
Meng Xu e232f805ee FastRestoreTool: Consume restoreClusterFileDest as fdbrestore does 2020-07-27 22:16:35 -07:00
Meng Xu 1a34f5c20e FastRestoreTool: Fix option list 2020-07-27 21:40:20 -07:00
Jingyu Zhou 417183067b
Merge pull request #3568 from sfc-gh-anoyes/anoyes/small-vector-ref-memory-error
Fix memory error in SmallVectorRef
2020-07-27 14:45:53 -07:00
Meng Xu ec5783ec5a
Merge pull request #3499 from bnamasivayam/master
Deserialize report_conflicting_keys in 6.3
2020-07-27 14:29:30 -07:00
Markus Pilman c6a2043d53
Merge pull request #3450 from sfc-gh-tclinkenbeard/6.3-use-vector-mutations
Replace VersionUpdateRef with VerUpdateRef
2020-07-27 15:21:47 -06:00
Andrew Noyes 4c17019f37 Fix memory error in SmallVectorRef 2020-07-27 21:11:50 +00:00
Evan Tschannen 6b1092be0b
Merge pull request #3567 from etschannen/release-6.3
Changed a few default knob values to improve recovery speeds
2020-07-27 12:10:15 -07:00
Evan Tschannen 3f1e51c821
Merge pull request #3543 from dongxinEric/doc/add-explanation-about-accuracy-of-estiamted-range-size-api
Added some explanation about the accuracy about the get estimated ran…
2020-07-27 11:03:17 -07:00
Evan Tschannen c3348be3a0 changed knobs to improve master recovery speeds 2020-07-27 10:59:06 -07:00
Evan Tschannen ee9b3d1a9d do not let a single failed handshake prevent reconnection for 10 seconds 2020-07-27 10:58:30 -07:00
Evan Tschannen e0db748fb3
Merge pull request #3403 from satherton/tls-background-handshake
TLS handshaking in background threads
2020-07-27 10:55:00 -07:00
Evan Tschannen 9b683f8309
Merge pull request #3537 from etschannen/feature-lifetimetoken-fix
A master process would die immediately if dbInfo did not contain the correct cluster controller
2020-07-27 10:53:27 -07:00
Evan Tschannen 937df4f839 Merge branch 'release-6.3' of github.com:apple/foundationdb into feature-lifetimetoken-fix
# Conflicts:
#	documentation/sphinx/source/release-notes/release-notes-630.rst
2020-07-27 10:03:02 -07:00
Xin Dong 2ac7df8a18
Merge pull request #3563 from xumengpanda/mengxu/fr-filesize-PR
FastRestore:Add trace for file size and bc progress
2020-07-25 20:08:57 -07:00
Meng Xu 99d8399f4e FastRestore:Add trace for file size and bc progress 2020-07-25 19:12:25 -07:00
Xiaoxi Wang 436b6d823e use hyphen 2020-07-25 22:49:08 +00:00
Meng Xu 9d3b1cc4e4
Merge pull request #3562 from sfc-gh-anoyes/anoyes/memory-error
Fix memory error in report conflicting keys special keys
2020-07-24 21:11:42 -07:00
Evan Tschannen 792eaa2174
Merge pull request #3560 from etschannen/release-6.3
Merge Release 6.2 into Release 6.3
2020-07-24 17:06:15 -07:00
Evan Tschannen cb00879c62
Merge pull request #3561 from satherton/feature-redwood
Redwood pager remapped page cleanup now coalesces writes within a large trailing version window.
2020-07-24 16:56:22 -07:00
Andrew Noyes 57b29fd4cd Fix memory error 2020-07-24 23:31:16 +00:00
Andrew Noyes bc412f39a6 Augment ReportConflictingKeys test to catch memory error 2020-07-24 23:31:00 +00:00
Evan Tschannen 29142fa382 temporarily disable compiler warnings 2020-07-24 12:37:15 -07:00
Evan Tschannen d3093f50bb attempt to get rid of compiler warnings 2020-07-24 12:24:42 -07:00
Evan Tschannen e1dedff7b3 Merge branch 'release-6.2' into release-6.3
# Conflicts:
#	CMakeLists.txt
#	bindings/c/test/mako/mako.c
#	cmake/ConfigureCompiler.cmake
#	documentation/sphinx/source/downloads.rst
#	fdbcli/fdbcli.actor.cpp
#	fdbclient/FileBackupAgent.actor.cpp
#	packaging/msi/FDBInstaller.wxs
#	versions.target
2020-07-24 12:10:44 -07:00
Evan Tschannen 3d3a13f535
Merge pull request #3559 from etschannen/post-release-cleanup-6.2.24
Post release cleanup 6.2.24
2020-07-24 11:51:59 -07:00
Evan Tschannen 62c26862ac update installer WIX GUID following release 2020-07-24 11:49:09 -07:00
Evan Tschannen 52e3db8135 update version to 6.2.25 2020-07-24 11:49:09 -07:00
Evan Tschannen 1bb09b11c8
Merge pull request #3557 from sears/external-committers
Update CONTRIBUTING.md to allow external committers
2020-07-24 11:14:27 -07:00
Russell Sears 5e8a01ef52
add missing word. 2020-07-24 11:01:21 -07:00
Andrew Noyes c15ae7ff02 Remove redundant cast
We don't need to cast away constness here. It's already not const
2020-07-24 16:20:38 +00:00
Markus Pilman 50a478b5d0
Merge pull request #3516 from sfc-gh-anoyes/anoyes/vector-tests
Add unit tests for SmallVectorRef and VectorRef
2020-07-24 10:16:33 -06:00
Jingyu Zhou b37a5037ae
Merge pull request #3556 from sfc-gh-ljoswiak/visibility-time-format
Fix request tracing time format
2020-07-23 16:55:35 -07:00
Russell Sears 33abcc6ecd Update CONTRIBUTING.md to allow external committers 2020-07-23 15:21:49 -07:00
Lukas Joswiak 26661d0657 Fix trace time format, add end time 2020-07-23 14:33:51 -07:00
Evan Tschannen 2a5fb92f7f
Merge pull request #3550 from etschannen/feature-cli-suspend
added the ability to suspend processes from fdbcli
2020-07-23 11:25:04 -07:00
Evan Tschannen 5a8a8153ce updated documentation 2020-07-23 11:22:16 -07:00
Alec Grieser 37009e34de
Merge pull request #3552 from sfc-gh-anoyes/anoyes/fix-java-warnings
Fix a few java warnings
2020-07-23 11:16:33 -07:00
Evan Tschannen f5e7ee23a8 updated text of fdbcli output 2020-07-23 11:09:59 -07:00