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

fdbcli/fdbcli.actor.cpp

@@ -624,7 +624,8 @@ void getBackupDRTags(StatusObjectReader &statusObjCluster, const char *context,
 		for(auto itr : tags.obj()) {
 			JSONDoc tag(itr.second);
 			bool running = false;
-			if(tag.tryGet("running_backup", running)) {
+			tag.tryGet("running_backup", running);
+			if(running) {
 				std::string uid;
 				if(tag.tryGet("mutation_stream_id", uid)) {
 					tagMap[itr.first] = uid;

fdbclient/FileBackupAgent.actor.cpp

@@ -1749,9 +1749,10 @@ namespace fileBackup {
 			state Version beginVersion = Params.beginVersion().get(task);
 			state Version endVersion = Params.endVersion().get(task);
 			state Reference<TaskFuture> taskFuture = futureBucket->unpack(task->params[Task::reservedTaskParamKeyDone]);
+			state BackupConfig config(task);
 
 			if(Params.fileSize().exists(task)) {
-				BackupConfig(task).logBytesWritten().atomicOp(tr, Params.fileSize().get(task), MutationRef::AddValue);
+				config.logBytesWritten().atomicOp(tr, Params.fileSize().get(task), MutationRef::AddValue);
 			}
 
 			if (Params.addBackupLogRangeTasks().get(task)) {
@@ -1762,7 +1763,7 @@ namespace fileBackup {
 			}
 
 			if(endVersion > beginVersion) {
-				Standalone<VectorRef<KeyRangeRef>> ranges = getLogRanges(beginVersion, endVersion, task->params[FileBackupAgent::keyConfigLogUid]);
+				Standalone<VectorRef<KeyRangeRef>> ranges = getLogRanges(beginVersion, endVersion, config.getUidAsKey());
 				for (auto & rng : ranges)
 					tr->clear(rng);
 			}

packaging/msi/FDBInstaller.wxs

@@ -32,7 +32,7 @@
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <Product Name='$(var.Title)'
-           Id='{999DE80B-0F53-490D-849B-E8C7620939E2}'
+           Id='{61C46988-7589-4B8A-9BB9-D850FD5B8B05}'
            UpgradeCode='{A95EA002-686E-4164-8356-C715B7F8B1C8}'
            Version='$(var.Version)'
            Manufacturer='$(var.Manufacturer)'

versions.target

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