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

Merge branch 'master' into feature-redwood

This commit is contained in:
Stephen Atherton 2017-08-31 00:24:58 -07:00
parent 7f46dfd829 6e9de8f35a
commit 1e11353603
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fdbrpc/Platform.cpp
View File

@ -89,15 +89,11 @@ void eraseDirectoryRecursive( std::string const& dir ) {
INJECT_FAULT( platform_error, "eraseDirectoryRecursive" );
#ifdef _WIN32
system( ("rd /s /q \"" + dir + "\"").c_str() );
#elif defined(__linux__)
#elif defined(__linux__) || defined(__APPLE__)
int error =
nftw(dir.c_str(),
[](const char *fpath, const struct stat *sb, int typeflag,
struct FTW *ftwbuf) -> int {
if (remove(fpath))
return FTW_STOP;
return FTW_CONTINUE;
}, 64, FTW_DEPTH | FTW_PHYS | FTW_ACTIONRETVAL);
[](const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf) -> int { return remove(fpath); }
, 64, FTW_DEPTH | FTW_PHYS);
/* Looks like calling code expects this to continue silently if
the directory we're deleting doesn't exist in the first
place */
@ -105,14 +101,6 @@ void eraseDirectoryRecursive( std::string const& dir ) {
TraceEvent(SevError, "nftw").detail("Directory", dir).GetLastError();
throw platform_error();
}
#elif defined(__APPLE__)
// const char* argv[2];
// argv[0] = dir.c_str();
// argv[1] = NULL;
// FTS* fts = fts_open(argv, FTS_PHYSICAL | FTS_SEEDOT | FTS_NOSTAT, NULL);
// while (FTSENT* ent = fts_read(fts)) {
// if (ent->fts_info
// }
#else
#error Port me!
#endif

3
fdbserver/workloads/ConsistencyCheck.actor.cpp
View File

@ -1098,7 +1098,8 @@ struct ConsistencyCheckWorkload : TestWorkload
for(auto id : stores.get()) {
if(!statefulProcesses[itr->first.address()].count(id)) {
TraceEvent("ConsistencyCheck_ExtraDataStore").detail("Address", itr->first.address()).detail("DataStoreID", id);
if(g_network->isSimulated() && !g_simulator.speedUpSimulation) {
if(g_network->isSimulated()) {
TraceEvent("ConsistencyCheck_RebootProcess").detail("Address", itr->first.address()).detail("DataStoreID", id);
g_simulator.rebootProcess(g_simulator.getProcessByAddress(itr->first.address()), ISimulator::RebootProcess);
}

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='{77E8C5DC-24D9-46BD-863A-BD5B1D2BE2FE}'
Id='{06EE6C90-3838-4C25-95D6-A4716F8CE7D0}'
UpgradeCode='{A95EA002-686E-4164-8356-C715B7F8B1C8}'
Version='$(var.Version)'
Manufacturer='$(var.Manufacturer)'