diff options
| author | Bernard Normier <bernard@zeroc.com> | 2015-11-23 17:33:30 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2015-11-23 17:33:30 -0500 |
| commit | 06214c65a8fd5029382ce1c7dacfdce7fb836329 (patch) | |
| tree | 7d6f27a457ef01c0bea2d2c6af8b9384513f1a01 /cpp/test | |
| parent | Re-applied fix for removal of sql reference in test/IceStorm/repgrid applicat... (diff) | |
| download | ice-06214c65a8fd5029382ce1c7dacfdce7fb836329.tar.bz2 ice-06214c65a8fd5029382ce1c7dacfdce7fb836329.tar.xz ice-06214c65a8fd5029382ce1c7dacfdce7fb836329.zip | |
The default LMDB map size for IceGrid and IceStorm is now 10MB (Windows)
and 100MB (Linux, OS X)
Diffstat (limited to 'cpp/test')
| -rwxr-xr-x | cpp/test/IceGrid/fileLock/run.py | 2 | ||||
| -rw-r--r-- | cpp/test/IceStorm/repgrid/application.xml | 19 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/repgrid/run.py | 5 |
3 files changed, 17 insertions, 9 deletions
diff --git a/cpp/test/IceGrid/fileLock/run.py b/cpp/test/IceGrid/fileLock/run.py index fee37e42d6c..321204ce2ee 100755 --- a/cpp/test/IceGrid/fileLock/run.py +++ b/cpp/test/IceGrid/fileLock/run.py @@ -36,7 +36,7 @@ def runIceGridRegistry(): cmd = command + ' ' + \ r' --Ice.ProgramName=registry' + \ r' --IceGrid.Registry.Client.Endpoints="default -p ' + str(IceGridAdmin.iceGridPort) + '" ' + \ - r' --IceGrid.Registry.LMDB.Path="' + dataDir + '"' + r' --IceGrid.Registry.LMDB.MapSize=1 --IceGrid.Registry.LMDB.Path="' + dataDir + '"' driverConfig = TestUtil.DriverConfig("server") driverConfig.lang = "cpp" diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml index 0b2eca543ff..418c083e748 100644 --- a/cpp/test/IceStorm/repgrid/application.xml +++ b/cpp/test/IceStorm/repgrid/application.xml @@ -37,7 +37,11 @@ node-endpoints="${node-endpoints}" flush-timeout="${flush-timeout}" publish-replica-group="${publish-replica-group}" - topic-manager-replica-group="${topic-manager-replica-group}"/> + topic-manager-replica-group="${topic-manager-replica-group}"> + <properties> + <property name="${service}.LMDB.MapSize" value="1"/> + </properties> + </service-instance> </icebox> </server-template> @@ -58,11 +62,20 @@ <service-instance template="IceStorm-HA" node-id="2" publish-replica-group="PublishReplicaGroup" - topic-manager-replica-group="TopicManagerReplicaGroup"/> + topic-manager-replica-group="TopicManagerReplicaGroup"> + <properties> + <property name="${service}.LMDB.MapSize" value="1"/> + </properties> + + </service-instance> <service-instance template="IceStorm-HA" node-id="3" publish-replica-group="PublishReplicaGroup" - topic-manager-replica-group="TopicManagerReplicaGroup"/> + topic-manager-replica-group="TopicManagerReplicaGroup"> + <properties> + <property name="${service}.LMDB.MapSize" value="1"/> + </properties> + </service-instance> </icebox> </node> diff --git a/cpp/test/IceStorm/repgrid/run.py b/cpp/test/IceStorm/repgrid/run.py index 36f0fc5fb1f..ac6c34b9342 100755 --- a/cpp/test/IceStorm/repgrid/run.py +++ b/cpp/test/IceStorm/repgrid/run.py @@ -25,11 +25,6 @@ if TestUtil.appverifier: targets = [TestUtil.getIceBox()] TestUtil.setAppVerifierSettings(targets, cwd = os.getcwd()) -# -# Remove IceStorm databases possibly left from SQL run. -# -for filename in [os.path.join("db", f) for f in os.listdir("db") if f.endswith(".db")]: - os.remove(filename) variables = "icebox.exe='%s'" % TestUtil.getIceBox() |