Commit Graph

357 Commits

Author SHA1 Message Date
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 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
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 ce1139e588 added missing dumpToken trace events 2020-08-27 17:17:27 -07:00
Young Liu 79ce16650d merge master branch 2020-08-11 19:22:10 -07:00
Young Liu 2e41391690 Merge master branch 2020-08-06 00:11:00 -07:00
Young Liu fad18ad85a Remove more debug traces 2020-07-29 08:06:15 -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
Young Liu 06c081c714 Merge master branch and resolve conflicts 2020-07-23 22:41:10 -07:00
Young Liu 229ab0d5f1 Fix some conflicts and remote debugging trace events 2020-07-22 23:35:46 -07:00
Young Liu 525f10e30c Merge master branch 2020-07-22 16:08:49 -07:00
Evan Tschannen 6a38f81269 do not kill the master unless we have a dbInfo from the current cluster controller 2020-07-17 14:59:38 -07:00
Young Liu 5b06d69d25 Pass watches test 2020-07-15 00:37:41 -07:00
Meng Xu 1b68665228 Merge branch 'master' into release-6.3 2020-07-08 18:52:05 -07:00
Young Liu 7afee53f4c Clean up code that serves GRV through other proxies 2020-07-07 21:19:11 -07:00
Daniel Smith 9c2937d4d0 Only check for files/directories when needed 2020-06-29 16:25:36 +00:00
Daniel Smith b53faa1695 Actually check directory suffix 2020-06-18 17:21:14 +00:00
Daniel Smith 73091b212c Allow detection of storage engines by presense of directory. 2020-06-17 21:50:06 +00:00
Young Liu 4dfb903a3a tmp merge 2020-06-16 20:32:07 -07:00
Meng Xu 96206a8032
Merge pull request #3368 from apple/release-6.3
Merge Release 6.3 to master
2020-06-15 20:15:22 -07:00
Evan Tschannen 4c7d43271a merge 6.3 into 7.0 2020-06-15 11:14:11 -07:00
Daniel Smith a959c6eb23 Fix copy/paste error 2020-06-15 16:48:19 +00:00
Daniel Smith acbfe2e4c9
Revert "Revert "Initial RocksDB"" 2020-06-15 12:45:36 -04:00
Evan Tschannen beab24de76 Merge branch 'release-6.3' of github.com:apple/foundationdb into release-6.3 2020-06-14 22:38:37 -07:00
Evan Tschannen c56d97cc9f randomize the coordinator a storage worker connects to 2020-06-14 22:26:06 -07:00
Young Liu f211a54593 Merged from upstream master 2020-06-13 16:47:12 -07:00
Young Liu f8c457d74d Minor fix against Meng's comments 2020-06-13 16:27:08 -07:00
Meng Xu 8595813b7d
Merge pull request #3355 from apple/release-6.3
Merge Release 6.3 into master branch
2020-06-12 20:08:47 -07:00
Jingyu Zhou 9cd1614c82
Revert "Initial RocksDB" 2020-06-11 15:29:46 -07:00
Daniel Smith a4dbb5dd01 Merge branch 'trace-batch-thread-hostile' into rocksdb-6.3 2020-06-11 15:53:57 +00:00
Young Liu a47806a966 Fixed locked and metadataVersion in GetReadVersion 2020-06-10 15:55:23 -07:00
A.J. Beamon 739767b838 Delay cluster controller candidacy for all worst fit processes, not just storage servers. 2020-06-10 09:59:56 -07:00
Young Liu 3a37e0af75 Serve GetReadVersion through master instead of peer proxies 2020-06-09 20:47:34 -07:00
negoyal 23a565ec63 Few bug fixes. 2020-06-05 16:27:04 -07:00
Evan Tschannen 30bfd606c0 Merge branch 'release-6.2' into release-6.3
# Conflicts:
#	CMakeLists.txt
#	documentation/sphinx/source/downloads.rst
#	documentation/sphinx/source/release-notes.rst
#	fdbserver/worker.actor.cpp
#	packaging/msi/FDBInstaller.wxs
#	versions.target
2020-06-04 19:21:32 -07:00
A.J. Beamon 9edc872041 Don't attempt to become a cluster controller on any process with a class that has NeverAssign fitness. 2020-06-03 16:05:21 -07:00
negoyal cf13e00a8f Merge remote-tracking branch 'origin/release-6.3' into fdb_cache_wo_allocator 2020-06-01 17:38:31 -07:00
A.J. Beamon 8329a242d2 Merge branch 'release-6.2' into merge-release-6.2-into-release-6.3
# Conflicts:
#	documentation/sphinx/source/downloads.rst
#	documentation/sphinx/source/release-notes.rst
2020-05-29 15:51:56 -07:00
Evan Tschannen e938d741e3 kill the process when a shared tlog throws an io_error 2020-05-29 09:02:55 -07:00
Daniel Smith 8731700d80 Merge remote-tracking branch 'upstream/release-6.3' into rocksdb-6.3 2020-05-27 20:02:25 +00:00
Evan Tschannen 4b6e1d8a57 fix compile problem 2020-05-22 17:16:59 -07:00
Evan Tschannen ced65cd30b finished explicitly versioning everything stored in the database 2020-05-22 17:14:21 -07:00
Daniel Smith 5d361fe532 Copy/paste rebase onto 6.3 2020-05-22 15:02:51 +00:00
Markus Pilman eaaceab845 fixed compiler issues 2020-05-14 13:48:19 -07:00
Markus Pilman c2bc75516f Merge branch 'release-6.3' of github.com:apple/foundationdb into features/trace-roles 2020-05-14 10:34:53 -07:00
Evan Tschannen 07111f0e41 add a large random delay on failure detection so that not all storage servers need to attempt to become the cluster controller 2020-05-10 17:09:33 -07:00
Evan Tschannen 048201717c Fixed a number of problems with monitorLeaderRemotely 2020-05-10 14:20:50 -07:00
Evan Tschannen 6fca885b9d revert strage class monitor leader because of correctness issues 2020-05-09 18:03:59 -07:00
Evan Tschannen f9518c3441
Merge pull request #3069 from alexmiller-apple/tls-connection-count
YOLO at reducing TLS connection count via doing monitorLeader on coordinators
2020-05-09 17:12:27 -07:00