From 1479239f5bcade38f802d6ad40c67495320fb97a Mon Sep 17 00:00:00 2001 From: yuqi Date: Thu, 5 Sep 2024 16:50:47 +0800 Subject: [PATCH 1/2] t --- .../src/main/java/com/datastrato/gravitino/GravitinoEnv.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/main/java/com/datastrato/gravitino/GravitinoEnv.java b/core/src/main/java/com/datastrato/gravitino/GravitinoEnv.java index 820af076e1a..30f2301f27a 100644 --- a/core/src/main/java/com/datastrato/gravitino/GravitinoEnv.java +++ b/core/src/main/java/com/datastrato/gravitino/GravitinoEnv.java @@ -199,6 +199,11 @@ public void shutdown() { if (metricsSystem != null) { metricsSystem.close(); } + + + if (config != null) { + LOG.info("Gravitino xxxx...."); + } LOG.info("Gravitino Environment is shut down."); } From 5e5093790ad964b5ee3fd3a8164f5d88501f7151 Mon Sep 17 00:00:00 2001 From: yuqi Date: Thu, 5 Sep 2024 16:55:45 +0800 Subject: [PATCH 2/2] t1 --- .github/workflows/integration-test.yml | 97 ------------------- .../datastrato/gravitino/GravitinoEnv.java | 3 +- 2 files changed, 1 insertion(+), 99 deletions(-) delete mode 100644 .github/workflows/integration-test.yml diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml deleted file mode 100644 index 51ad704ecaf..00000000000 --- a/.github/workflows/integration-test.yml +++ /dev/null @@ -1,97 +0,0 @@ -name: Integration Test - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the "main" branch - push: - branches: [ "main", "branch-*" ] - pull_request: - branches: [ "main", "branch-*" ] - -concurrency: - group: ${{ github.worklfow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: ${{ github.event_name == 'pull_requests' }} - -jobs: - changes: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: dorny/paths-filter@v2 - id: filter - with: - filters: | - source_changes: - - .github/** - - api/** - - bin/** - - catalogs/** - - clients/** - - common/** - - conf/** - - core/** - - dev/** - - gradle/** - - integration-test/** - - meta/** - - server/** - - server-common/** - - trino-connector/** - - web/** - - docs/open-api/** - - build.gradle.kts - - gradle.properties - - gradlew - - setting.gradle.kts - outputs: - source_changes: ${{ steps.filter.outputs.source_changes }} - - # Integration test for AMD64 architecture - test-amd64-arch: - needs: changes - if: needs.changes.outputs.source_changes == 'true' - runs-on: ubuntu-latest - timeout-minutes: 30 - strategy: - matrix: - architecture: [linux/amd64] - java-version: [ 8, 11, 17 ] - test-mode: [ embedded, deploy ] - env: - DOCKER_RUN_NAME: hive-amd64 - PLATFORM: ${{ matrix.architecture }} - steps: - - uses: actions/checkout@v3 - - - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java-version }} - distribution: 'temurin' - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Package Gravitino - run: | - ./gradlew build -x test -PjdkVersion=${{ matrix.java-version }} - ./gradlew compileDistribution -x test -PjdkVersion=${{ matrix.java-version }} - - - name: Setup debug Github Action - if: ${{ contains(github.event.pull_request.labels.*.name, 'debug action') }} - uses: csexton/debugger-action@master - - - name: Integration Test - id: integrationTest - run: | - ./gradlew test --rerun-tasks -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} - - - name: Upload integrate tests reports - uses: actions/upload-artifact@v3 - if: ${{ failure() && steps.integrationTest.outcome == 'failure' }} - with: - name: integrate test reports - path: | - build/reports - integration-test/build/integration-test.log - distribution/package/logs/gravitino-server.out - distribution/package/logs/gravitino-server.log diff --git a/core/src/main/java/com/datastrato/gravitino/GravitinoEnv.java b/core/src/main/java/com/datastrato/gravitino/GravitinoEnv.java index 30f2301f27a..42c00e78f49 100644 --- a/core/src/main/java/com/datastrato/gravitino/GravitinoEnv.java +++ b/core/src/main/java/com/datastrato/gravitino/GravitinoEnv.java @@ -199,8 +199,7 @@ public void shutdown() { if (metricsSystem != null) { metricsSystem.close(); } - - + if (config != null) { LOG.info("Gravitino xxxx...."); }