You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by is...@apache.org on 2018/02/28 10:24:28 UTC
ignite git commit: IGNITE-7763: Fixed 32bit tests configurations to
prevent OOM
Repository: ignite
Updated Branches:
refs/heads/master 30a94c89d -> c5833e034
IGNITE-7763: Fixed 32bit tests configurations to prevent OOM
This closes #3557
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c5833e03
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c5833e03
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c5833e03
Branch: refs/heads/master
Commit: c5833e034a1971a52c1ebd5e56c54ae1718db3a2
Parents: 30a94c8
Author: Igor Sapego <is...@gridgain.com>
Authored: Wed Feb 28 13:23:12 2018 +0300
Committer: Igor Sapego <is...@gridgain.com>
Committed: Wed Feb 28 13:23:55 2018 +0300
----------------------------------------------------------------------
modules/platforms/cpp/core-test/config/cache-identity-32.xml | 5 ++---
modules/platforms/cpp/core-test/config/cache-query-32.xml | 6 +++---
.../cpp/core-test/config/cache-query-continuous-32.xml | 6 +++---
modules/platforms/cpp/core-test/config/cache-store-32.xml | 4 ++--
modules/platforms/cpp/core-test/config/cache-test-32.xml | 6 +++---
modules/platforms/cpp/core-test/config/isolated-32.xml | 5 ++---
.../platforms/cpp/core-test/config/persistence-store-32.xml | 5 ++---
modules/platforms/cpp/odbc-test/config/queries-ssl-32.xml | 4 ++--
modules/platforms/cpp/odbc-test/config/queries-test-32.xml | 4 ++--
9 files changed, 21 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5833e03/modules/platforms/cpp/core-test/config/cache-identity-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-identity-32.xml b/modules/platforms/cpp/core-test/config/cache-identity-32.xml
index 1d43678..e704a0c 100644
--- a/modules/platforms/cpp/core-test/config/cache-identity-32.xml
+++ b/modules/platforms/cpp/core-test/config/cache-identity-32.xml
@@ -33,9 +33,8 @@
<bean parent="grid.cfg">
<property name="memoryConfiguration">
<bean class="org.apache.ignite.configuration.MemoryConfiguration">
- <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/>
+ <property name="systemCacheInitialSize" value="#{10 * 1024 * 1024}"/>
<property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/>
-
<property name="defaultMemoryPolicyName" value="dfltPlc"/>
<property name="memoryPolicies">
@@ -43,7 +42,7 @@
<bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
<property name="name" value="dfltPlc"/>
<property name="maxSize" value="#{100 * 1024 * 1024}"/>
- <property name="initialSize" value="#{100 * 1024 * 1024}"/>
+ <property name="initialSize" value="#{10 * 1024 * 1024}"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5833e03/modules/platforms/cpp/core-test/config/cache-query-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-query-32.xml b/modules/platforms/cpp/core-test/config/cache-query-32.xml
index ddbd690..91669ab 100644
--- a/modules/platforms/cpp/core-test/config/cache-query-32.xml
+++ b/modules/platforms/cpp/core-test/config/cache-query-32.xml
@@ -33,7 +33,7 @@
<bean parent="grid.cfg">
<property name="memoryConfiguration">
<bean class="org.apache.ignite.configuration.MemoryConfiguration">
- <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/>
+ <property name="systemCacheInitialSize" value="#{10 * 1024 * 1024}"/>
<property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/>
<property name="defaultMemoryPolicyName" value="dfltPlc"/>
@@ -41,8 +41,8 @@
<list>
<bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
<property name="name" value="dfltPlc"/>
- <property name="maxSize" value="103833600"/>
- <property name="initialSize" value="103833600"/>
+ <property name="maxSize" value="#{100 * 1024 * 1024}"/>
+ <property name="initialSize" value="#{10 * 1024 * 1024}"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5833e03/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml b/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml
index 84a5c60..1a3629e 100644
--- a/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml
+++ b/modules/platforms/cpp/core-test/config/cache-query-continuous-32.xml
@@ -29,7 +29,7 @@
<bean parent="grid.cfg">
<property name="memoryConfiguration">
<bean class="org.apache.ignite.configuration.MemoryConfiguration">
- <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/>
+ <property name="systemCacheInitialSize" value="#{10 * 1024 * 1024}"/>
<property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/>
<property name="defaultMemoryPolicyName" value="dfltPlc"/>
@@ -37,8 +37,8 @@
<list>
<bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
<property name="name" value="dfltPlc"/>
- <property name="maxSize" value="103833600"/>
- <property name="initialSize" value="103833600"/>
+ <property name="maxSize" value="#{100 * 1024 * 1024}"/>
+ <property name="initialSize" value="#{10 * 1024 * 1024}"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5833e03/modules/platforms/cpp/core-test/config/cache-store-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-store-32.xml b/modules/platforms/cpp/core-test/config/cache-store-32.xml
index ed46d4e..b9a7dc5 100644
--- a/modules/platforms/cpp/core-test/config/cache-store-32.xml
+++ b/modules/platforms/cpp/core-test/config/cache-store-32.xml
@@ -33,7 +33,7 @@
<bean parent="grid.cfg">
<property name="memoryConfiguration">
<bean class="org.apache.ignite.configuration.MemoryConfiguration">
- <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/>
+ <property name="systemCacheInitialSize" value="#{10 * 1024 * 1024}"/>
<property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/>
<property name="defaultMemoryPolicyName" value="dfltPlc"/>
@@ -42,7 +42,7 @@
<bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
<property name="name" value="dfltPlc"/>
<property name="maxSize" value="#{100 * 1024 * 1024}"/>
- <property name="initialSize" value="#{100 * 1024 * 1024}"/>
+ <property name="initialSize" value="#{10 * 1024 * 1024}"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5833e03/modules/platforms/cpp/core-test/config/cache-test-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/cache-test-32.xml b/modules/platforms/cpp/core-test/config/cache-test-32.xml
index 889f246..cb54074 100644
--- a/modules/platforms/cpp/core-test/config/cache-test-32.xml
+++ b/modules/platforms/cpp/core-test/config/cache-test-32.xml
@@ -33,7 +33,7 @@
<bean parent="grid.cfg">
<property name="memoryConfiguration">
<bean class="org.apache.ignite.configuration.MemoryConfiguration">
- <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/>
+ <property name="systemCacheInitialSize" value="#{10 * 1024 * 1024}"/>
<property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/>
<property name="defaultMemoryPolicyName" value="dfltPlc"/>
@@ -41,8 +41,8 @@
<list>
<bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
<property name="name" value="dfltPlc"/>
- <property name="maxSize" value="103833600"/>
- <property name="initialSize" value="103833600"/>
+ <property name="maxSize" value="#{100 * 1024 * 1024}"/>
+ <property name="initialSize" value="#{10 * 1024 * 1024}"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5833e03/modules/platforms/cpp/core-test/config/isolated-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/isolated-32.xml b/modules/platforms/cpp/core-test/config/isolated-32.xml
index b758e11..82b5929 100644
--- a/modules/platforms/cpp/core-test/config/isolated-32.xml
+++ b/modules/platforms/cpp/core-test/config/isolated-32.xml
@@ -31,9 +31,8 @@
<bean parent="grid.cfg">
<property name="memoryConfiguration">
<bean class="org.apache.ignite.configuration.MemoryConfiguration">
- <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/>
+ <property name="systemCacheInitialSize" value="#{10 * 1024 * 1024}"/>
<property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/>
-
<property name="defaultMemoryPolicyName" value="dfltPlc"/>
<property name="memoryPolicies">
@@ -41,7 +40,7 @@
<bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
<property name="name" value="dfltPlc"/>
<property name="maxSize" value="#{100 * 1024 * 1024}"/>
- <property name="initialSize" value="#{100 * 1024 * 1024}"/>
+ <property name="initialSize" value="#{10 * 1024 * 1024}"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5833e03/modules/platforms/cpp/core-test/config/persistence-store-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/config/persistence-store-32.xml b/modules/platforms/cpp/core-test/config/persistence-store-32.xml
index 3f607bc..519a696 100644
--- a/modules/platforms/cpp/core-test/config/persistence-store-32.xml
+++ b/modules/platforms/cpp/core-test/config/persistence-store-32.xml
@@ -31,9 +31,8 @@
<bean parent="grid.cfg">
<property name="memoryConfiguration">
<bean class="org.apache.ignite.configuration.MemoryConfiguration">
- <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/>
+ <property name="systemCacheInitialSize" value="#{10 * 1024 * 1024}"/>
<property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/>
-
<property name="defaultMemoryPolicyName" value="dfltPlc"/>
<property name="memoryPolicies">
@@ -41,7 +40,7 @@
<bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
<property name="name" value="dfltPlc"/>
<property name="maxSize" value="#{100 * 1024 * 1024}"/>
- <property name="initialSize" value="#{100 * 1024 * 1024}"/>
+ <property name="initialSize" value="#{10 * 1024 * 1024}"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5833e03/modules/platforms/cpp/odbc-test/config/queries-ssl-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc-test/config/queries-ssl-32.xml b/modules/platforms/cpp/odbc-test/config/queries-ssl-32.xml
index 3fa2659..67d72bb 100644
--- a/modules/platforms/cpp/odbc-test/config/queries-ssl-32.xml
+++ b/modules/platforms/cpp/odbc-test/config/queries-ssl-32.xml
@@ -58,7 +58,7 @@
<property name="memoryConfiguration">
<bean class="org.apache.ignite.configuration.MemoryConfiguration">
- <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/>
+ <property name="systemCacheInitialSize" value="#{10 * 1024 * 1024}"/>
<property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/>
<property name="defaultMemoryPolicyName" value="dfltPlc"/>
@@ -67,7 +67,7 @@
<bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
<property name="name" value="dfltPlc"/>
<property name="maxSize" value="#{100 * 1024 * 1024}"/>
- <property name="initialSize" value="#{100 * 1024 * 1024}"/>
+ <property name="initialSize" value="#{10 * 1024 * 1024}"/>
</bean>
</list>
</property>
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5833e03/modules/platforms/cpp/odbc-test/config/queries-test-32.xml
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/odbc-test/config/queries-test-32.xml b/modules/platforms/cpp/odbc-test/config/queries-test-32.xml
index a2bac82..f4b3317 100644
--- a/modules/platforms/cpp/odbc-test/config/queries-test-32.xml
+++ b/modules/platforms/cpp/odbc-test/config/queries-test-32.xml
@@ -29,7 +29,7 @@
<bean parent="queries.cfg">
<property name="memoryConfiguration">
<bean class="org.apache.ignite.configuration.MemoryConfiguration">
- <property name="systemCacheInitialSize" value="#{40 * 1024 * 1024}"/>
+ <property name="systemCacheInitialSize" value="#{10 * 1024 * 1024}"/>
<property name="systemCacheMaxSize" value="#{40 * 1024 * 1024}"/>
<property name="defaultMemoryPolicyName" value="dfltPlc"/>
@@ -38,7 +38,7 @@
<bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
<property name="name" value="dfltPlc"/>
<property name="maxSize" value="#{100 * 1024 * 1024}"/>
- <property name="initialSize" value="#{100 * 1024 * 1024}"/>
+ <property name="initialSize" value="#{10 * 1024 * 1024}"/>
</bean>
</list>
</property>