Skip to content

Commit 5779263

Browse files
authored
Merge branch 'main' into FIX-Aggregation-incident-reindex
2 parents 6c28f0b + 1f2c4fc commit 5779263

File tree

192 files changed

+7315
-2092
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+7315
-2092
lines changed

.github/workflows/integration-tests-mysql-elasticsearch.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ jobs:
5050
- name: Free Disk Space (Ubuntu)
5151
uses: jlumbroso/free-disk-space@main
5252
with:
53-
tool-cache: false
53+
tool-cache: true
5454
android: true
5555
dotnet: true
5656
haskell: true
57-
large-packages: false
57+
large-packages: true
5858
docker-images: false
5959
swap-storage: true
6060

@@ -110,6 +110,13 @@ jobs:
110110
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111111
run: mvn -DskipTests clean install -pl :openmetadata-integration-tests -am
112112

113+
- name: Free build artifacts
114+
run: |
115+
rm -rf openmetadata-service/target/lib openmetadata-service/target/classes
116+
rm -rf openmetadata-spec/target openmetadata-sdk/target common/target
117+
rm -rf openmetadata-shaded-deps/*/target
118+
df -h /
119+
113120
- name: Run Integration Tests (MySQL + Elasticsearch)
114121
env:
115122
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/integration-tests-postgres-opensearch.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ jobs:
5050
- name: Free Disk Space (Ubuntu)
5151
uses: jlumbroso/free-disk-space@main
5252
with:
53-
tool-cache: false
53+
tool-cache: true
5454
android: true
5555
dotnet: true
5656
haskell: true
57-
large-packages: false
57+
large-packages: true
5858
docker-images: false
5959
swap-storage: true
6060

@@ -110,6 +110,13 @@ jobs:
110110
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111111
run: mvn -DskipTests clean install -pl :openmetadata-integration-tests -am
112112

113+
- name: Free build artifacts
114+
run: |
115+
rm -rf openmetadata-service/target/lib openmetadata-service/target/classes
116+
rm -rf openmetadata-spec/target openmetadata-sdk/target common/target
117+
rm -rf openmetadata-shaded-deps/*/target
118+
df -h /
119+
113120
- name: Run Integration Tests (PostgreSQL + OpenSearch)
114121
env:
115122
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/maven-postgres-tests-build.yml

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,11 @@
1010
# limitations under the License.
1111

1212
name: Maven Postgres Tests CI
13+
# Disabled: Integration tests (openmetadata-integration-tests) now cover the same ground
14+
# with full Testcontainers-based PostgreSQL testing.
1315

1416
on:
15-
push:
16-
branches:
17-
- main
18-
paths:
19-
- "openmetadata-service/**"
20-
- "openmetadata-ui/**"
21-
- "!openmetadata-ui/src/main/resources/ui/playwright/doc-generator/**"
22-
- "!openmetadata-ui/src/main/resources/ui/playwright/docs/**"
23-
- "openmetadata-spec/src/main/resources/json/schema/**"
24-
- "openmetadata-dist/**"
25-
- "openmetadata-clients/**"
26-
- "openmetadata-sdk/**"
27-
- "common/**"
28-
- "pom.xml"
29-
- "yarn.lock"
30-
- "Makefile"
31-
- "bootstrap/**"
32-
pull_request_target:
33-
types: [labeled, opened, synchronize, reopened, ready_for_review]
34-
paths:
35-
- "openmetadata-service/**"
36-
- "openmetadata-spec/src/main/resources/json/schema/**"
37-
- "openmetadata-dist/**"
38-
- "openmetadata-clients/**"
39-
- "openmetadata-sdk/**"
40-
- "common/**"
41-
- "pom.xml"
42-
- "yarn.lock"
43-
- "Makefile"
44-
- "bootstrap/**"
17+
workflow_dispatch:
4518

4619
permissions:
4720
contents: read

bootstrap/sql/migrations/native/1.12.0/mysql/schemaChanges.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,11 @@ CREATE TABLE IF NOT EXISTS learning_resource_entity (
246246
UNIQUE KEY fqnHash (fqnHash)
247247
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
248248

249+
-- Widen entityLink generated column from VARCHAR(255) to TEXT
250+
-- The entity link from workflow variables can exceed 255 characters for deeply nested entities
251+
ALTER TABLE workflow_instance_time_series
252+
MODIFY COLUMN entityLink TEXT GENERATED ALWAYS AS (json ->> '$.variables.global_relatedEntity');
253+
249254
-- Add process and vector stage columns to search_index_server_stats table
250255
-- These columns support the 4-stage pipeline model (Reader, Process, Sink, Vector) for search indexing stats
251256

bootstrap/sql/migrations/native/1.12.0/postgres/schemaChanges.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,10 @@ CREATE TABLE IF NOT EXISTS learning_resource_entity (
262262
UNIQUE (fqnhash)
263263
);
264264

265+
-- Widen entityLink generated column from VARCHAR(255) to TEXT
266+
-- The entity link from workflow variables can exceed 255 characters for deeply nested entities
267+
ALTER TABLE workflow_instance_time_series ALTER COLUMN entityLink TYPE TEXT;
268+
265269
-- Add process and vector stage columns to search_index_server_stats table
266270
-- These columns support the 4-stage pipeline model (Reader, Process, Sink, Vector) for search indexing stats
267271

conf/openmetadata.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,12 @@ database:
225225
# These work across both PostgreSQL and MySQL drivers
226226
properties:
227227
# HikariCP connection pool settings
228-
connectionTimeout: ${DB_CONNECTION_TIMEOUT:-300000} # 300 seconds
229-
idleTimeout: ${DB_IDLE_TIMEOUT:-600000} # 10 minutes
230-
maxLifetime: ${DB_MAX_LIFETIME:-1800000} # 30 minutes
231-
leakDetectionThreshold: ${DB_LEAK_DETECTION_THRESHOLD:-600000} # 10 minute
228+
connectionTimeout: ${DB_CONNECTION_TIMEOUT:-30000} # 30 seconds - fail fast if pool exhausted
229+
idleTimeout: ${DB_IDLE_TIMEOUT:-120000} # 2 minutes - reclaim idle connections faster
230+
maxLifetime: ${DB_MAX_LIFETIME:-600000} # 10 minutes - rotate connections (cloud DB friendly)
231+
leakDetectionThreshold: ${DB_LEAK_DETECTION_THRESHOLD:-60000} # 1 minute - detect leaks early
232232
keepaliveTime: ${DB_KEEPALIVE_TIME:-0} # 0 = disabled (set to 30000 for Aurora)
233-
validationTimeout: ${DB_VALIDATION_TIMEOUT:-300000} # 300 seconds
233+
validationTimeout: ${DB_VALIDATION_TIMEOUT:-5000} # 5 seconds - HikariCP default
234234
# PostgreSQL specific - these are ignored by MySQL driver
235235
prepareThreshold: ${DB_PG_PREPARE_THRESHOLD:-1} # Use prepared statements immediately
236236
preparedStatementCacheQueries: ${DB_PG_PREP_STMT_CACHE_QUERIES:-500} # Cache more statements
@@ -580,10 +580,9 @@ limits:
580580
limitsConfigFile: ${LIMITS_CONFIG_FILE:-""}
581581

582582
# Bulk Operation Configuration
583-
# Controls parallelism and resource usage for bulk API operations (e.g., bulk import/export)
584-
# Uses a bounded thread pool to prevent connection pool exhaustion
583+
# Controls parallelism and admission control for bulk API operations.
585584
bulkOperation:
586-
# Max threads for bulk operations (recommendations: 2 vCore=5-8, 4 vCore=8-15, 8 vCore=15-25)
585+
# Max threads for processing
587586
maxThreads: ${BULK_OPERATION_MAX_THREADS:-10}
588587
# Max queued operations before rejection (returns 503)
589588
queueSize: ${BULK_OPERATION_QUEUE_SIZE:-1000}

docker/development/distributed-test/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ services:
4949

5050
# Shared OpenSearch
5151
opensearch:
52-
image: opensearchproject/opensearch:2.7.0
52+
image: opensearchproject/opensearch:3.4.0
5353
container_name: distributed_test_opensearch
5454
restart: unless-stopped
5555
environment:

docker/development/distributed-test/local/docker-compose-deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ services:
4949

5050
# OpenSearch
5151
opensearch:
52-
image: opensearchproject/opensearch:2.7.0
52+
image: opensearchproject/opensearch:3.4.0
5353
container_name: distributed_test_opensearch
5454
restart: unless-stopped
5555
environment:

docker/development/docker-compose-gcp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
- ./docker-volume/db-data:/var/lib/mysql
4747

4848
elasticsearch:
49-
image: docker.elastic.co/elasticsearch/elasticsearch:8.11.4
49+
image: docker.elastic.co/elasticsearch/elasticsearch:9.3.0
5050
container_name: openmetadata_elasticsearch
5151
environment:
5252
- discovery.type=single-node

docker/development/docker-compose-postgres-fuseki.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444
retries: 10
4545

4646
opensearch:
47-
image: opensearchproject/opensearch:latest
47+
image: opensearchproject/opensearch:3.4.0
4848
container_name: openmetadata_opensearch
4949
environment:
5050
- discovery.type=single-node

0 commit comments

Comments
 (0)