[ignite] branch ignite-ducktape updated: mem limit fix redundant jvm fix removal

[av]

This is an automated email from the ASF dual-hosted git repository.

av pushed a commit to branch ignite-ducktape
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/ignite-ducktape by this push:
     new df24284  mem limit fix redundant jvm fix removal
df24284 is described below

commit df2428490f83a14eb69480dbc70f23717ee3c30e
Author: Anton Vinogradov <a...@apache.org>
AuthorDate: Tue Jul 21 13:05:02 2020 +0300

    mem limit fix
    redundant jvm fix removal
---
 modules/ducktests/tests/docker/ducker-ignite                          | 4 ++--
 modules/ducktests/tests/ignitetest/services/ignite.py                 | 1 -
 modules/ducktests/tests/ignitetest/services/utils/ignite_aware_app.py | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/ducktests/tests/docker/ducker-ignite 
b/modules/ducktests/tests/docker/ducker-ignite
index e41212c..e7287ca 100755
--- a/modules/ducktests/tests/docker/ducker-ignite
+++ b/modules/ducktests/tests/docker/ducker-ignite
@@ -33,10 +33,10 @@ ignite_dir="$( cd "${ducker_dir}/../../../.." && pwd )"
 
 # The memory consumption to allow during the docker build.
 # This does not include swap.
-docker_build_memory_limit="3200m"
+docker_build_memory_limit="8000m"
 
 # The maximum mmemory consumption to allow in containers.
-docker_run_memory_limit="2000m"
+docker_run_memory_limit="8000m"
 
 # The default number of cluster nodes to bring up if a number is not specified.
 default_num_nodes=4
diff --git a/modules/ducktests/tests/ignitetest/services/ignite.py 
b/modules/ducktests/tests/ignitetest/services/ignite.py
index 07b562f..a2855e3 100644
--- a/modules/ducktests/tests/ignitetest/services/ignite.py
+++ b/modules/ducktests/tests/ignitetest/services/ignite.py
@@ -52,7 +52,6 @@ class IgniteService(IgniteAwareService):
     def start_cmd(self, node):
         jvm_opts = "-J-DIGNITE_SUCCESS_FILE=" + IgniteService.PERSISTENT_ROOT 
+ "/success_file "
         jvm_opts += "-J-Dlog4j.configDebug=true "
-        jvm_opts += "-J-XX:+UnlockExperimentalVMOptions 
-J-XX:+UseCGroupMemoryLimitForHeap"  # java8 docker fix
 
         cmd = "export EXCLUDE_TEST_CLASSES=true; "
         cmd += "export IGNITE_LOG_DIR=" + IgniteService.PERSISTENT_ROOT + "; "
diff --git 
a/modules/ducktests/tests/ignitetest/services/utils/ignite_aware_app.py 
b/modules/ducktests/tests/ignitetest/services/utils/ignite_aware_app.py
index f569c12..916d155 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/ignite_aware_app.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/ignite_aware_app.py
@@ -86,8 +86,7 @@ class IgniteAwareApplicationService(IgniteAwareService):
                "-J-Dlog4j.configDebug=true " \
                "-J-Xmx1G " \
                "-J-ea " \
-               "-J-DIGNITE_ALLOW_ATOMIC_OPS_IN_TX=false " \
-               "-J-XX:+UnlockExperimentalVMOptions 
-J-XX:+UseCGroupMemoryLimitForHeap"  # java8 docker fix
+               "-J-DIGNITE_ALLOW_ATOMIC_OPS_IN_TX=false "
 
     def env(self):
         return "export MAIN_CLASS={main_class}; 
".format(main_class=self.servicejava_class_name) + \