From 1762f92b70d40e1b2294a17c30c89bf5bb58fc6f Mon Sep 17 00:00:00 2001
From: Cheng Pan <379377944@qq.com>
Date: Sun, 13 Jun 2021 18:40:08 +0800
Subject: [PATCH 1/3] Fix MetricsSystemSuite on G1

---
 .../scala/org/apache/kyuubi/metrics/MetricsSystemSuite.scala  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kyuubi-metrics/src/test/scala/org/apache/kyuubi/metrics/MetricsSystemSuite.scala b/kyuubi-metrics/src/test/scala/org/apache/kyuubi/metrics/MetricsSystemSuite.scala
index dac09cd796c..077b646bbdc 100644
--- a/kyuubi-metrics/src/test/scala/org/apache/kyuubi/metrics/MetricsSystemSuite.scala
+++ b/kyuubi-metrics/src/test/scala/org/apache/kyuubi/metrics/MetricsSystemSuite.scala
@@ -64,7 +64,7 @@ class MetricsSystemSuite extends KyuubiFunSuite {
     val client: HttpClient = new HttpClient
     client.start()
     val res: ContentResponse = client.GET(prometheusHttpServer.getURI.resolve(testContextPath))
-    assert(res.getContentAsString.contains("PS_MarkSweep_count"))
+    assert(res.getContentAsString.contains("heap_usage"))
     assert(res.getContentAsString.contains("kyuubi_connection_opened 2021.0"))
     client.stop()
 
@@ -83,7 +83,7 @@ class MetricsSystemSuite extends KyuubiFunSuite {
     metricsSystem.initialize(conf)
     metricsSystem.start()
     val reportFile = Paths.get(reportPath.toString, "report.json")
-    checkJsonFileMetrics(reportFile, "PS-MarkSweep.count")
+    checkJsonFileMetrics(reportFile, "heap.usage")
     metricsSystem.incCount(MetricsConstants.STATEMENT_TOTAL)
 
     checkJsonFileMetrics(reportFile, MetricsConstants.STATEMENT_TOTAL)

From ab103cf3193ac5139b28274d1e02976ae1260ab5 Mon Sep 17 00:00:00 2001
From: Cheng Pan <379377944@qq.com>
Date: Sun, 13 Jun 2021 18:48:03 +0800
Subject: [PATCH 2/3] [GA] Enable JDK 11 in GA

---
 .github/workflows/master.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 6d4dbcb104a..f603b3ed523 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -32,6 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        java:
+          - '8'
+          - '11'
         profiles:
           - ''
           - '-Pspark-3.0 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.2 -Dspark.archive.name=spark-3.1.2-bin-hadoop2.7.tgz -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest'
@@ -40,10 +43,10 @@ jobs:
       SPARK_LOCAL_IP: localhost
     steps:
       - uses: actions/checkout@v2
-      - name: Setup JDK 1.8
+      - name: Setup JDK ${{ matrix.java }}
         uses: actions/setup-java@v1
         with:
-          java-version: '1.8'
+          java-version: ${{ matrix.java }}
       - uses: actions/cache@v1
         with:
           path: ~/.m2/repository/com

From bd64a666893046a04db8c8007cf3ce6736b7b707 Mon Sep 17 00:00:00 2001
From: Cheng Pan <379377944@qq.com>
Date: Sun, 13 Jun 2021 20:28:51 +0800
Subject: [PATCH 3/3] Revert "[GA] Enable JDK 11 in GA"

This reverts commit ab103cf3193ac5139b28274d1e02976ae1260ab5.
---
 .github/workflows/master.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index f603b3ed523..6d4dbcb104a 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -32,9 +32,6 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java:
-          - '8'
-          - '11'
         profiles:
           - ''
           - '-Pspark-3.0 -Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.2 -Dspark.archive.name=spark-3.1.2-bin-hadoop2.7.tgz -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.IcebergTest'
@@ -43,10 +40,10 @@ jobs:
       SPARK_LOCAL_IP: localhost
     steps:
       - uses: actions/checkout@v2
-      - name: Setup JDK ${{ matrix.java }}
+      - name: Setup JDK 1.8
         uses: actions/setup-java@v1
         with:
-          java-version: ${{ matrix.java }}
+          java-version: '1.8'
       - uses: actions/cache@v1
         with:
           path: ~/.m2/repository/com