wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-5.0' of github.com:apple/foundationdb into release-5.0

This commit is contained in:
Alec Grieser 2017-06-27 13:55:34 -07:00
parent 15cb498aa7 41769bcd6c
commit f71de985d8
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fdbclient/NativeAPI.actor.cpp
View File

@ -2424,6 +2424,7 @@ ACTOR static Future<Void> commitDummyTransaction( Database cx, KeyRange range, T
tr.info.taskID = info.taskID;
tr.setOption( FDBTransactionOptions::ACCESS_SYSTEM_KEYS );
tr.setOption( FDBTransactionOptions::CAUSAL_WRITE_RISKY );
tr.setOption( FDBTransactionOptions::LOCK_AWARE );
tr.addReadConflictRange(range);
tr.addWriteConflictRange(range);
Void _ = wait( tr.commit() );

8
flow/Net2.actor.cpp
View File

@ -52,7 +52,7 @@ using namespace boost::asio::ip;
// These impact both communications and the deserialization of certain zookeeper, database and IKeyValueStore keys
// xyzdev
// vvvv
uint64_t currentProtocolVersion = 0x0FDB00A470010001LL;
uint64_t currentProtocolVersion = 0x0FDB00A550010001LL;
uint64_t compatibleProtocolVersionMask = 0xffffffffffff0000LL;
uint64_t minValidProtocolVersion = 0x0FDB00A200060001LL;
@ -550,7 +550,7 @@ void Net2::run() {
timeOffsetLogger = logTimeOffset();
startProfiling(this);
// Get the address to the launch function
typedef void (*runCycleFuncPtr)();
runCycleFuncPtr runFunc = reinterpret_cast<runCycleFuncPtr>(reinterpret_cast<flowGlobalType>(g_network->global(INetwork::enRunCycleFunc)));
@ -606,7 +606,7 @@ void Net2::run() {
taskBegin = timer_monotonic();
numYields = 0;
int minTaskID = TaskMaxPriority;
while (!ready.empty()) {
++countTasks;
currentTaskID = ready.top().taskID;
@ -671,7 +671,7 @@ void Net2::run() {
}
#endif
if ((nnow-now) > FLOW_KNOBS->SLOW_LOOP_CUTOFF && g_nondeterministic_random->random01() < (nnow-now)*FLOW_KNOBS->SLOW_LOOP_SAMPLING_RATE)
if ((nnow-now) > FLOW_KNOBS->SLOW_LOOP_CUTOFF && g_nondeterministic_random->random01() < (nnow-now)*FLOW_KNOBS->SLOW_LOOP_SAMPLING_RATE)
TraceEvent("SomewhatSlowRunLoopBottom").detail("Elapsed", nnow - now); // This includes the time spent running tasks
trackMinPriority( minTaskID, nnow );

2
packaging/msi/FDBInstaller.wxs
View File

@ -32,7 +32,7 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Name='$(var.Title)'
Id='{E93B02C4-7D41-458E-9117-1C6FCF6F4D41}'
Id='{C87FA777-8E67-4298-809C-925758C3FCA4}'
UpgradeCode='{A95EA002-686E-4164-8356-C715B7F8B1C8}'
Version='$(var.Version)'
Manufacturer='$(var.Manufacturer)'

2
versions.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Version>5.0.0</Version>
<Version>5.0.1</Version>
<PackageName>5.0</PackageName>
</PropertyGroup>
</Project>