diff options
| author | Dan Pasette <dan@10gen.com> | 2014-12-17 21:18:05 -0500 |
|---|---|---|
| committer | Dan Pasette <dan@mongodb.com> | 2014-12-17 21:24:46 -0500 |
| commit | ccb67f50ab49372b1ebe8dc027a47808ededf116 (patch) | |
| tree | a4ea1fbb5a5d387040b54cdf4bf8befc34b700a5 /src/mongo/shell | |
| parent | 46589450c11ce5cc8cfef2eaf47342d53b271a35 (diff) | |
| download | mongo-ccb67f50ab49372b1ebe8dc027a47808ededf116.tar.gz | |
SERVER-16313 Fix WiredTiger engine, collection and index options to use new names
Diffstat (limited to 'src/mongo/shell')
| -rwxr-xr-x | src/mongo/shell/servers.js | 12 | ||||
| -rw-r--r-- | src/mongo/shell/utils.js | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js index f70c014eec8..3727cb3be02 100755 --- a/src/mongo/shell/servers.js +++ b/src/mongo/shell/servers.js @@ -804,14 +804,14 @@ function appendSetParameterArgs(argArray) { argArray.push.apply(argArray, ['--storageEngine', jsTest.options().storageEngine]); } } - if (jsTest.options().wiredTigerEngineConfig) { - argArray.push.apply(argArray, ['--wiredTigerEngineConfig', jsTest.options().wiredTigerEngineConfig]); + if (jsTest.options().wiredTigerEngineConfigString) { + argArray.push.apply(argArray, ['--wiredTigerEngineConfigString', jsTest.options().wiredTigerEngineConfigString]); } - if (jsTest.options().wiredTigerCollectionConfig) { - argArray.push.apply(argArray, ['--wiredTigerCollectionConfig', jsTest.options().wiredTigerCollectionConfig]); + if (jsTest.options().wiredTigerCollectionConfigString) { + argArray.push.apply(argArray, ['--wiredTigerCollectionConfigString', jsTest.options().wiredTigerCollectionConfigString]); } - if (jsTest.options().wiredTigerIndexConfig) { - argArray.push.apply(argArray, ['--wiredTigerIndexConfig', jsTest.options().wiredTigerIndexConfig]); + if (jsTest.options().wiredTigerIndexConfigString) { + argArray.push.apply(argArray, ['--wiredTigerIndexConfigString', jsTest.options().wiredTigerIndexConfigString]); } // apply setParameters for mongod if (jsTest.options().setParameters) { diff --git a/src/mongo/shell/utils.js b/src/mongo/shell/utils.js index ef28f1bbb29..e3aaa4bc08d 100644 --- a/src/mongo/shell/utils.js +++ b/src/mongo/shell/utils.js @@ -146,9 +146,9 @@ jsTestOptions = function(){ { setParameters : TestData.setParameters, setParametersMongos : TestData.setParametersMongos, storageEngine: TestData.storageEngine, - wiredTigerEngineConfig: TestData.wiredTigerEngineConfig, - wiredTigerCollectionConfig: TestData.wiredTigerCollectionConfig, - wiredTigerIndexConfig: TestData.wiredTigerIndexConfig, + wiredTigerEngineConfigString: TestData.wiredTigerEngineConfigString, + wiredTigerCollectionConfigString: TestData.wiredTigerCollectionConfigString, + wiredTigerIndexConfigString: TestData.wiredTigerIndexConfigString, noJournal : TestData.noJournal, noJournalPrealloc : TestData.noJournalPrealloc, auth : TestData.auth, |