Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix dump-multiple with mmfiles in cluster

This commit is contained in:
jsteemann 2019-04-01 12:15:17 +02:00
parent 158a5ac163
commit a5232f60aa
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/js/server/dump/dump-mmfiles-cluster.js
View File

@ -404,7 +404,11 @@ function dumpTestEnterpriseSuite () {
}, },
testHiddenCollectionsOmitted : function () { testHiddenCollectionsOmitted : function () {
const dumpDir = fs.join(instanceInfo.rootDir, 'dump'); let dumpDir = fs.join(instanceInfo.rootDir, 'dump');
if (fs.exists(fs.join(dumpDir, "UnitTestsDumpSrc"))) {
// when dumping multiple database the database name is one layer added:
dumpDir = fs.join(dumpDir, "UnitTestsDumpSrc");
}
const smartEdgeCollectionPath = fs.join(dumpDir, `${edges}.structure.json`); const smartEdgeCollectionPath = fs.join(dumpDir, `${edges}.structure.json`);
const localEdgeCollectionPath = fs.join(dumpDir, `_local_${edges}.structure.json`); const localEdgeCollectionPath = fs.join(dumpDir, `_local_${edges}.structure.json`);
@ -420,7 +424,11 @@ function dumpTestEnterpriseSuite () {
testShadowCollectionsOmitted : function () { testShadowCollectionsOmitted : function () {
const encryption = fs.read(fs.join(instanceInfo.rootDir, 'dump', 'ENCRYPTION')); const encryption = fs.read(fs.join(instanceInfo.rootDir, 'dump', 'ENCRYPTION'));
if (encryption === '' || encryption === 'none') { if (encryption === '' || encryption === 'none') {
const dumpDir = fs.join(instanceInfo.rootDir, 'dump'); let dumpDir = fs.join(instanceInfo.rootDir, 'dump');
if (fs.exists(fs.join(dumpDir, "UnitTestsDumpSrc"))) {
// when dumping multiple database the database name is one layer added:
dumpDir = fs.join(dumpDir, "UnitTestsDumpSrc");
}
const collStructure = JSON.parse( const collStructure = JSON.parse(
fs.read(fs.join(dumpDir, `${edges}.structure.json`)) fs.read(fs.join(dumpDir, `${edges}.structure.json`))
); );