Commit Graph

17 Commits

Author SHA1 Message Date
Meng Xu 002cca5e58 Merge branch 'master' into tmp/merge-PR
Conflicts:
	fdbclient/NativeAPI.actor.cpp
	fdbserver/StorageMetrics.actor.h
2020-08-12 20:08:13 -07:00
Meng Xu 0d0efcfce7 FR:Fix incorrect ASSERT:batchIndex starts at 1 instead of 0 2020-08-12 10:36:31 -07:00
Evan Tschannen 2f52c5f79b Merge branch 'release-6.3'
# Conflicts:
#	fdbserver/RestoreLoader.actor.cpp
2020-08-11 22:45:43 -07:00
Meng Xu c89a62b935 FR:SampleBackup:Assert req.batchIndex < controller batch size 2020-08-07 16:52:07 -07:00
Meng Xu c27542d4e9 FR:SampleBackup:Send reply when receive duplicate msg 2020-08-07 16:50:36 -07:00
Meng Xu fe5902994c
Merge pull request #3605 from apple/release-6.3
Merge Release 6.3 to master
2020-08-05 23:37:44 -07:00
Meng Xu 859c3145e2 FR:Fix samples not send reply and false positive failures 2020-08-05 11:32:04 -07:00
Meng Xu 309f383be3 FR:Report error if controller throws error 2020-08-04 23:08:41 -07:00
Meng Xu 879998d01b FR:fix compilation error 2020-08-04 23:04:38 -07:00
Meng Xu 7992cef025 FR:Fix sample network pkg can be too big 2020-08-04 22:35:21 -07:00
Meng Xu e9adec421d FR:Add controller interface and send to roles 2020-08-03 15:06:15 -07:00
Meng Xu 0c49646486 Fix:FastRestore:rangeVersion must be 0 when no range file is used
otherwise, all mutations will be ignored by loaders as old mutations
2020-07-31 23:23:17 -07:00
Evan Tschannen 0e3f4285ec added missing paraetheses 2020-07-31 16:05:21 -07:00
Meng Xu 2f5293fcc7 Introduce knob FASTRESTORE_USE_LOG_FILE and FASTRESTORE_USE_RANGE_FILE 2020-07-31 10:40:29 -07:00
Meng Xu 99d8399f4e FastRestore:Add trace for file size and bc progress 2020-07-25 19:12:25 -07:00
Meng Xu d161d8f298 Merge branch 'release-6.3' into mengxu/fr-rename-master-PR 2020-07-16 16:46:32 -07:00
Meng Xu 8cffd30951 FastRestore:Replace master word with controller 2020-07-16 16:37:13 -07:00