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.1'

This commit is contained in:
Bhaskar Muppana 2018-02-16 13:36:25 -08:00
parent 2eeb714c4b fe3f0d9343
commit d48417da0d
10 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fdbbackup/fdbbackup.vcxproj
View File

@ -129,6 +129,5 @@
<Exec Command="copy /y &quot;$(OutDir)fdbbackup.exe&quot; &quot;$(OutDir)backup_agent.exe&quot;" />
<Exec Command="copy /y &quot;$(OutDir)fdbbackup.exe&quot; &quot;$(OutDir)dr_agent.exe&quot;" />
<Exec Command="copy /y &quot;$(OutDir)fdbbackup.exe&quot; &quot;$(OutDir)fdbdr.exe&quot;" />
<Exec Command="copy /y &quot;$(OutDir)fdbbackup.exe&quot; &quot;$(OutDir)fdbblob.exe&quot;" />
</Target>
</Project>

2
fdbbackup/local.mk
View File

@ -47,7 +47,7 @@ bin/fdbbackup: bin/coverage.fdbbackup.xml
bin/fdbbackup.debug: bin/fdbbackup
BACKUP_ALIASES = fdbrestore fdbblob fdbdr dr_agent backup_agent
BACKUP_ALIASES = fdbrestore fdbdr dr_agent backup_agent
$(addprefix bin/, $(BACKUP_ALIASES)): bin/fdbbackup
@[ -f $@ ] || (echo "SymLinking $@" && ln -s fdbbackup $@)

3
fdbcli/fdbcli.actor.cpp
View File

@ -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;

5
fdbclient/FileBackupAgent.actor.cpp
View File

@ -1748,9 +1748,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)) {
@ -1761,7 +1762,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);
}

1
packaging/deb/builddebs.sh
View File

@ -60,7 +60,6 @@ chmod 0644 $CLIENTSDIR/usr/share/doc/foundationdb-clients/README
install -m 0755 bin/fdbbackup $CLIENTSDIR/usr/lib/foundationdb/backup_agent/backup_agent
ln -s ../lib/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/bin/fdbbackup
ln -s ../lib/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/bin/fdbrestore
ln -s ../lib/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/bin/fdbblob
ln -s ../lib/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/bin/fdbdr
ln -s ../lib/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/bin/dr_agent

3
packaging/msi/FDBInstaller.wxs
View File

@ -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)'
@ -151,7 +151,6 @@
<Component Id='FDBBackupClientExecutable' Guid='{F5E0A796-EC21-406F-88E1-3195165E3078}' Win64='yes'>
<File Id='FDBBACKUPEXE' Name='fdbbackup.exe' DiskId='1' Source='$(var.bindir)fdbbackup.exe' KeyPath='yes'/>
<File Id='FDBRESTOREEXE' Name='fdbrestore.exe' DiskId='1' Source='$(var.bindir)fdbrestore.exe' KeyPath='no'/>
<File Id='FDBBLOBEXE' Name='fdbblob.exe' DiskId='1' Source='$(var.bindir)fdbblob.exe' KeyPath='no'/>
<File Id='FDBDREXE' Name='fdbdr.exe' DiskId='1' Source='$(var.bindir)fdbdr.exe' KeyPath='no'/>
</Component>

1
packaging/osx/buildpkg.sh
View File

@ -33,7 +33,6 @@ dos2unix README.md $CLIENTSDIR/usr/local/foundationdb/README
chmod 0644 $CLIENTSDIR/usr/local/foundationdb/README
ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/fdbbackup
ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/fdbrestore
ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/fdbblob
ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/fdbdr
ln -s /usr/local/foundationdb/backup_agent/backup_agent $CLIENTSDIR/usr/local/bin/dr_agent

2
packaging/osx/uninstall-FoundationDB.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash -x
rm -f /usr/local/libexec/{fdbserver,fdbmonitor}
rm -f /usr/local/bin/{fdbcli,fdbbackup,fdbrestore,fdbblob,fdbdr}
rm -f /usr/local/bin/{fdbcli,fdbbackup,fdbrestore,fdbdr}
rm -f /usr/local/lib/libfdb_c.dylib
rm -rf /usr/local/include/foundationdb
rm -rf /usr/local/foundationdb/backup_agent

1
packaging/rpm/buildrpms.sh
View File

@ -44,7 +44,6 @@ install -m 0755 packaging/make_public.py $INSTDIR/usr/lib/foundationdb
ln -s ../lib/foundationdb/backup_agent/backup_agent $INSTDIR/usr/bin/fdbbackup
ln -s ../lib/foundationdb/backup_agent/backup_agent $INSTDIR/usr/bin/fdbrestore
ln -s ../lib/foundationdb/backup_agent/backup_agent $INSTDIR/usr/bin/fdbblob
ln -s ../lib/foundationdb/backup_agent/backup_agent $INSTDIR/usr/bin/fdbdr
ln -s ../lib/foundationdb/backup_agent/backup_agent $INSTDIR/usr/bin/dr_agent

1
packaging/rpm/foundationdb.spec.in
View File

@ -133,6 +133,5 @@ ifdef(`RHEL6', `/usr/lib/foundationdb/argparse.py')
/usr/bin/fdbdr
/usr/bin/fdbbackup
/usr/bin/fdbrestore
/usr/bin/fdbblob
/usr/lib64/libfdb_c.so
/usr/include/*