propert batch customization

TouK · Jan 24, 2025 · 57f8658 · 57f8658
1 parent 0d2f5c8
commit 57f8658
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -13,7 +13,7 @@
         </encoder>
     </appender>
 
-    <root level="DEBUG">
+    <root level="WARN">
         <appender-ref ref="STDOUT"/>
     </root>
 
@@ -66,6 +66,10 @@
     <logger name="org.flywaydb.core.internal.sqlscript.DefaultSqlScriptExecutor" level="ERROR"/>
     <logger name="org.apache.flink.metrics.MetricGroup" level="ERROR"/>
     <logger name="org.apache.fop.apps.FOUserAgent" level="ERROR"/>
+    <!-- it generates a lot of logs on DEBUG during test containers usage -->
+    <logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http" level="INFO"/>
+    <logger name="org.testcontainers.shaded.com.github.dockerjava.core.exec" level="INFO"/>
+    <logger name="org.testcontainers.shaded.com.github.dockerjava.core.command" level="INFO"/>
     <!-- skuber by default logs all requests to k8s on INFO -->
     <logger name="skuber" level="${SKUBER_LOG_LEVEL:-WARN}"/>
     <logger name="com.azure" level="INFO"/>

diff --git a/...uk/nussknacker/test/installationexample/DockerBasedNuInstallationExampleEnvironment.scala b/...uk/nussknacker/test/installationexample/DockerBasedNuInstallationExampleEnvironment.scala
@@ -43,7 +43,7 @@ class DockerBasedInstallationExampleNuEnvironment(
         )
       ),
       // Change to 'true' to enable logging
-      tailChildContainers = true
+      tailChildContainers = false
     ) {
 
   start()
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ class DockerBasedInstallationExampleNuEnvironment( @@
             )
           ),
           // Change to 'true' to enable logging
-          tailChildContainers = true
+          tailChildContainers = false
         ) {
       start()
@@ Expand Down @@