Commit Graph

5063 Commits

Author SHA1 Message Date
Stephen Atherton f21b2874a8 Merge branch 'release-5.0' 2017-06-22 16:56:39 -07:00
Stephen Atherton 03d2b1787a Merge branch 'release-4.6' into release-5.0
# Conflicts:
#	fdbrpc/sim2.actor.cpp
2017-06-22 16:56:25 -07:00
Alec Grieser 94bce335e7 Merge branch 'release-5.0' 2017-06-19 17:51:10 -07:00
Alec Grieser 1cce243840 Merge branch 'release-4.6' into release-5.0 2017-06-19 17:50:52 -07:00
Alvin Moore 6d19580789 Merge branch 'release-5.0' of github.com:apple/foundationdb into release-5.0
# Conflicts:
#	fdbrpc/simulator.h
2017-06-19 17:39:37 -07:00
Alvin Moore 96f40d8eb0 Added support for optionally re-including excluded servers
Removed unneeded code to protect coordinators
Ensured that simulation exclusion list is updated for excluded processes
2017-06-19 16:51:07 -07:00
Alvin Moore 9553458b78 Updated simulation to support managing exclusion and inclusion address
Added method for identifying acceptable availability process classes
Extended cluster availability function to ensure coordinators can be auto configured
Fixed availability function to allow protected processes to be considered as dead if not available
Added debug trace events for providing machine state when considering availability
Added trace event for protected coordinators
2017-06-19 16:48:15 -07:00
Stephen Atherton 5d13d845a7 Merge branch 'release-5.0' 2017-06-18 23:25:29 -07:00
Stephen Atherton 0e638e7ea2 Merge branch 'release-4.6' into release-5.0 2017-06-18 23:25:17 -07:00
Stephen Atherton 6d9e302487 Merge branch 'release-5.0' 2017-06-16 02:14:34 -07:00
Stephen Atherton 430bb6224e Merge branch 'release-4.6' into release-5.0
# Conflicts:
#	fdbrpc/AsyncFileKAIO.actor.h
#	fdbrpc/Net2FileSystem.cpp
#	fdbrpc/sim2.actor.cpp
2017-06-16 02:14:19 -07:00
Stephen Atherton 1c94e30e64 Merge branch 'release-5.0' 2017-06-15 17:40:40 -07:00
Stephen Atherton f405c8d88e Merge branch 'release-4.6' into release-5.0
# Conflicts:
#	fdbrpc/AsyncFileKAIO.actor.h
#	fdbrpc/sim2.actor.cpp
#	fdbserver/optimisttest.actor.cpp
#	versions.target
2017-06-15 17:40:19 -07:00
Stephen Atherton 5de6c703cf Fixed line endings which were changed to UNIX style during a recent merge. 2017-06-15 16:57:35 -07:00
Evan Tschannen cdd64ebc15 fix: asyncFileNonDurable could never complete deleting a file in rare situations 2017-06-15 13:30:15 -07:00
Evan Tschannen afdc125db9 Merge branch 'release-5.0' 2017-06-14 16:44:23 -07:00
Evan Tschannen 4bdcd8fc12 Merge branch 'release-4.6' into release-5.0
# Conflicts:
#	bindings/bindingtester/run_binding_tester.sh
#	fdbrpc/AsyncFileKAIO.actor.h
2017-06-14 16:43:53 -07:00
Alec Grieser c6817f5091 Merge pull request #117 from cie/fix-checksum-enabled-condition
Change checksum enabled condition
2017-06-13 15:16:50 -07:00
Yichi Chiang 02ee6d8cd1 Change checksum enabled condition 2017-06-13 11:03:25 -07:00
Stephen Atherton b65ad3563c Merge branch 'master' into feature-redwood
# Conflicts:
#	fdbserver/fdbserver.vcxproj
#	fdbserver/fdbserver.vcxproj.filters
2017-06-09 14:56:41 -07:00
Evan Tschannen cefaa2391d fix: tlog actor needs to be cancelled when worker shutdown 2017-06-02 17:56:47 -07:00
Evan Tschannen 766dc23e26 fix: do not use TLS in protectedAddresses 2017-06-02 13:52:21 -07:00
Evan Tschannen b108c1ea0d fix: do not delay before setting logData->version 2017-06-02 11:27:37 -07:00
Stephen Atherton ac8c289296 Merge branch 'release-5.0' 2017-06-01 16:03:02 -07:00
Evan Tschannen 2d0dbd57e8 randomized the delays in atomic switchover workload 2017-06-01 12:08:21 -07:00
Evan Tschannen bfcbb5623f fixed build from merge error 2017-06-01 12:07:30 -07:00
Evan Tschannen 6eeb453892 Merge branch 'release-5.0' 2017-06-01 11:55:22 -07:00
Evan Tschannen 276073d91b Merge branch 'release-4.6' into release-5.0 2017-06-01 11:54:54 -07:00
Stephen Atherton e318aabe55 Merge branch 'release-5.0' 2017-05-31 17:10:48 -07:00
Stephen Atherton fa4fdb1f1d Merge branch 'fix-io-timeout-handling' into release-5.0
# Conflicts:
#	fdbserver/optimisttest.actor.cpp
2017-05-31 17:03:15 -07:00
Evan Tschannen 4e7eabbd4a Merge branch 'release-5.0' 2017-05-31 16:24:08 -07:00
Evan Tschannen 1626e16377 Merge branch 'release-4.6' into release-5.0 2017-05-31 16:23:37 -07:00
Alvin Moore 333f2e4865 Added connection fault disabler within setup of backup submission. It should be reviewed to determine the amount of time to wait before disabling 2017-05-31 14:21:50 -07:00
A.J. Beamon 510914c7c1 Merge branch 'release-5.0' 2017-05-31 08:47:50 -07:00
Yichi Chiang 41d9bce2d7 Merge pull request #115 from cie/checksum-off-with-tls
Disable checksum when TLS is enabled
2017-05-30 11:43:53 -07:00
Stephen Atherton bc1e18535e Merge branch 'release-5.0' 2017-05-26 18:51:31 -07:00
Stephen Atherton 98604d33a0 Merge branch 'fix-io-timeout-handling'
# Conflicts:
#	fdbrpc/AsyncFileKAIO.actor.h
#	fdbrpc/sim2.actor.cpp
#	fdbserver/KeyValueStoreSQLite.actor.cpp
#	fdbserver/optimisttest.actor.cpp
#	fdbserver/worker.actor.cpp
#	fdbserver/workloads/MachineAttrition.actor.cpp
#	tests/fast/SidebandWithStatus.txt
#	tests/rare/LargeApiCorrectnessStatus.txt
#	tests/slow/DDBalanceAndRemoveStatus.txt
2017-05-26 18:43:08 -07:00
Stephen Atherton 7260e38545 Merge branch 'fix-io-timeout-handling'
# Conflicts:
#	fdbrpc/AsyncFileKAIO.actor.h
#	fdbrpc/sim2.actor.cpp
#	fdbserver/KeyValueStoreSQLite.actor.cpp
#	fdbserver/optimisttest.actor.cpp
#	fdbserver/worker.actor.cpp
#	fdbserver/workloads/MachineAttrition.actor.cpp
#	tests/fast/SidebandWithStatus.txt
#	tests/rare/LargeApiCorrectnessStatus.txt
#	tests/slow/DDBalanceAndRemoveStatus.txt
2017-05-26 17:43:28 -07:00
Yichi Chiang d2ad46680c Disable checksum when TLS is enabled 2017-05-26 15:34:40 -07:00
A.J. Beamon bffa1facb5 Merge branch 'release-5.0' 2017-05-26 15:21:08 -07:00
A.J. Beamon b0af820d61 Add back a cast that I shouldn’t have removed. 2017-05-26 15:20:47 -07:00
A.J. Beamon abdbd8b672 Merge branch 'release-5.0' 2017-05-26 15:00:38 -07:00
Alvin Moore 89a9c2bb72 Merge branch 'release-5.0' of github.com:apple/foundationdb into release-5.0 2017-05-26 14:52:22 -07:00
Alvin Moore ba606c2135 Removed NOT_IN_CLEAN macro from file 2017-05-26 14:52:06 -07:00
Alvin Moore b28ed397a2 Fixed printf field width specifier to reduce compilation warnings within OS X 2017-05-26 14:51:34 -07:00
Alec Grieser 0740d587dd Merge pull request #82 from cie/bindings-tuple-improvements
<rdar://problem/30053926> Bindings: Upstream Tuple2 changes from CK's fdbext
2017-05-26 14:38:43 -07:00
Alec Grieser 1bca602956 updated javadoc for fromStream with new types 2017-05-26 14:36:12 -07:00
A.J. Beamon bd3757ba90 We no longer need to cast int to int64_t when inserting into flow tuples. 2017-05-26 14:32:56 -07:00
Alec Grieser d9dffd39ac Merge pull request #111 from cie/java-remove-transaction-reset
Remove transaction reset from Java bindings.
2017-05-26 14:28:51 -07:00
Alvin Moore 0b9ed67e12 Fixed support for RemoveServers Workload
Added availability functions to simulation
2017-05-26 14:20:11 -07:00