diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-10-28 16:07:56 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-10-28 16:07:56 -0230 |
| commit | be5e69faebc1e7cb55938550440c8b8bc19c1d31 (patch) | |
| tree | d5cb233ca00e0ca1aa07993fea95486e266754f5 /cpp/src/IceGrid/NodeCache.cpp | |
| parent | Fixed merge issue from previous commit (diff) | |
| download | ice-be5e69faebc1e7cb55938550440c8b8bc19c1d31.tar.bz2 ice-be5e69faebc1e7cb55938550440c8b8bc19c1d31.tar.xz ice-be5e69faebc1e7cb55938550440c8b8bc19c1d31.zip | |
Convert IceGrid/IceStorm to use LMDB database rather than Freeze/BdB
Diffstat (limited to 'cpp/src/IceGrid/NodeCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index e28468b36af..22f98a01a05 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -109,10 +109,12 @@ struct ToInternalServerDescriptor : std::unary_function<CommunicatorDescriptorPt if(p->dbHome.empty()) { _desc->dbEnvs.push_back(new InternalDbEnvDescriptor(p->name, p->properties)); + props.push_back(createProperty(p->name + ".LMDB.Path", dbsPath + p->name)); props.push_back(createProperty("Freeze.DbEnv." + p->name + ".DbHome", dbsPath + p->name)); } else { + props.push_back(createProperty(p->name + ".LMDB.Path", p->dbHome)); props.push_back(createProperty("Freeze.DbEnv." + p->name + ".DbHome", p->dbHome)); } } @@ -663,7 +665,7 @@ NodeEntry::destroyServer(const ServerEntryPtr& entry, const ServerInfo& info, in if(noRestart) { - node->begin_destroyServerWithoutRestart(info.descriptor->id, info.uuid, info.revision, + node->begin_destroyServerWithoutRestart(info.descriptor->id, info.uuid, info.revision, _cache.getReplicaName(), newCallback_Node_destroyServerWithoutRestart( new DestroyCB(_cache.getTraceLevels(), entry, _name), |