diff --git a/e2e-tests/src/test/resources/batch-data-generation/batch-customizations.conf b/e2e-tests/src/test/resources/batch-data-generation/batch-customizations.conf index ad14fc416c2..8fa5e63979c 100644 --- a/e2e-tests/src/test/resources/batch-data-generation/batch-customizations.conf +++ b/e2e-tests/src/test/resources/batch-data-generation/batch-customizations.conf @@ -10,13 +10,6 @@ baseBatchConfig { deploymentConfig: { type: "flinkStreaming" restUrl: ${?FLINK_REST_URL} - scenarioTesting { - streamExecutionConfig { - "taskmanager.memory.network.min": 64m - "taskmanager.memory.network.max": 64m - "taskmanager.memory.managed.size": 50m - } - } } modelConfig: { classPath: ["model/defaultModel.jar", "components/flink/flinkBase.jar", "components/flink-table/flinkTable.jar", "model/flinkExecutor.jar", "flink-dropwizard-metrics-deps/"] diff --git a/e2e-tests/src/test/resources/batch-nu-designer.override.yml b/e2e-tests/src/test/resources/batch-nu-designer.override.yml index 4819e8a33f9..c16f4d402a7 100644 --- a/e2e-tests/src/test/resources/batch-nu-designer.override.yml +++ b/e2e-tests/src/test/resources/batch-nu-designer.override.yml @@ -4,7 +4,12 @@ services: environment: CONFIG_FILE: "/opt/nussknacker/conf/application.conf,/opt/nussknacker/conf/application-customizations.conf,/opt/nussknacker/conf/batch-customizations.conf" TABLES_DEFINITION_FILE: "/opt/nussknacker/conf/tables-definition.sql" + JDK_JAVA_OPTIONS: "-Xmx400M -XX:MaxMetaspaceSize=500M -XX:MaxDirectMemorySize=300M" volumes: - ../../e2e-tests/src/test/resources/batch-data-generation/batch-customizations.conf:/opt/nussknacker/conf/batch-customizations.conf - ../../e2e-tests/src/test/resources/batch-data-generation/transactions:/transactions - ../../e2e-tests/src/test/resources/batch-data-generation/tables-definition.sql:/opt/nussknacker/conf/tables-definition.sql + deploy: + resources: + limits: + memory: 1500M diff --git a/examples/installation/docker-compose.yml b/examples/installation/docker-compose.yml index fa009c0be50..d155975c2fd 100644 --- a/examples/installation/docker-compose.yml +++ b/examples/installation/docker-compose.yml @@ -41,7 +41,7 @@ services: SCHEMA_REGISTRY_URL: "http://schema-registry:8081" INFLUXDB_URL: "http://influxdb:8086" FLINK_REST_URL: "http://flink-jobmanager:8081" - JDK_JAVA_OPTIONS: "-Xmx400M -XX:MaxMetaspaceSize=300M -XX:MaxDirectMemorySize=200M" + JDK_JAVA_OPTIONS: "-Xmx400M -XX:MaxMetaspaceSize=300M -XX:MaxDirectMemorySize=100M" USAGE_REPORTS_SOURCE: "example-installation-docker-compose" depends_on: postgres: @@ -67,7 +67,7 @@ services: deploy: resources: limits: - memory: 1024M + memory: 1000M postgres: image: postgres:13 diff --git a/utils/test-utils/src/main/resources/logback-test.xml b/utils/test-utils/src/main/resources/logback-test.xml index 2ed3a655240..20dba8eed5f 100644 --- a/utils/test-utils/src/main/resources/logback-test.xml +++ b/utils/test-utils/src/main/resources/logback-test.xml @@ -13,7 +13,7 @@ - + @@ -66,6 +66,10 @@ + + + + diff --git a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/installationexample/DockerBasedNuInstallationExampleEnvironment.scala b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/installationexample/DockerBasedNuInstallationExampleEnvironment.scala index e0622d89710..e2dd40a5272 100644 --- a/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/installationexample/DockerBasedNuInstallationExampleEnvironment.scala +++ b/utils/test-utils/src/main/scala/pl/touk/nussknacker/test/installationexample/DockerBasedNuInstallationExampleEnvironment.scala @@ -43,7 +43,7 @@ class DockerBasedInstallationExampleNuEnvironment( ) ), // Change to 'true' to enable logging - tailChildContainers = true + tailChildContainers = false ) { start()