From 0bbdd376b21027e179dd75be9d20be0aabb3ebee Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Fri, 13 Oct 2023 19:42:48 +0800 Subject: [PATCH] test: fix ES disk insufficient in test (#11406) --- .github/workflows/skywalking.yaml | 40 +++++++++---------- .../manual/segment/SegmentRecord.java | 2 +- test/e2e-v2/cases/istio/values.yaml | 11 +++-- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 3f5b6840859f..bfb1b97bcbb6 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -539,26 +539,26 @@ jobs: - name: Kafka Log config: test/e2e-v2/cases/kafka/log/e2e.yaml - # - name: Istio Metrics Service 1.15.0 - # config: test/e2e-v2/cases/istio/metrics/e2e.yaml - # env: | - # ISTIO_VERSION=1.15.0 - # KUBERNETES_VERSION=25 - # - name: Istio Metrics Service 1.16.0 - # config: test/e2e-v2/cases/istio/metrics/e2e.yaml - # env: | - # ISTIO_VERSION=1.16.0 - # KUBERNETES_VERSION=25 - # - name: Istio Metrics Service 1.17.0 - # config: test/e2e-v2/cases/istio/metrics/e2e.yaml - # env: | - # ISTIO_VERSION=1.17.0 - # KUBERNETES_VERSION=25 - # - name: Istio Metrics Service 1.18.0 - # config: test/e2e-v2/cases/istio/metrics/e2e.yaml - # env: | - # ISTIO_VERSION=1.18.0 - # KUBERNETES_VERSION=25 + - name: Istio Metrics Service 1.15.0 + config: test/e2e-v2/cases/istio/metrics/e2e.yaml + env: | + ISTIO_VERSION=1.15.0 + KUBERNETES_VERSION=25 + - name: Istio Metrics Service 1.16.0 + config: test/e2e-v2/cases/istio/metrics/e2e.yaml + env: | + ISTIO_VERSION=1.16.0 + KUBERNETES_VERSION=25 + - name: Istio Metrics Service 1.17.0 + config: test/e2e-v2/cases/istio/metrics/e2e.yaml + env: | + ISTIO_VERSION=1.17.0 + KUBERNETES_VERSION=25 + - name: Istio Metrics Service 1.18.0 + config: test/e2e-v2/cases/istio/metrics/e2e.yaml + env: | + ISTIO_VERSION=1.18.0 + KUBERNETES_VERSION=25 - name: Rover with Istio Process 1.15.0 config: test/e2e-v2/cases/rover/process/istio/e2e.yaml diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java index e33adbaee014..d07f6842d657 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java @@ -37,7 +37,7 @@ import java.util.List; -import static org.apache.skywalking.oap.server.core.analysis.record.Record.TIME_BUCKET; +import static org.apache.skywalking.oap.server.core.storage.StorageData.TIME_BUCKET; @SuperDataset @Stream(name = SegmentRecord.INDEX_NAME, scopeId = DefaultScopeDefine.SEGMENT, builder = SegmentRecord.Builder.class, processor = RecordStreamProcessor.class) diff --git a/test/e2e-v2/cases/istio/values.yaml b/test/e2e-v2/cases/istio/values.yaml index 02048abbada9..8b42ad4765f1 100644 --- a/test/e2e-v2/cases/istio/values.yaml +++ b/test/e2e-v2/cases/istio/values.yaml @@ -22,6 +22,11 @@ oap: elasticsearch: esConfig: elasticsearch.yml: | - cluster.routing.allocation.disk.watermark.low: 90% - cluster.routing.allocation.disk.watermark.high: 99% - cluster.routing.allocation.disk.watermark.flood_stage: 99% \ No newline at end of file + cluster.routing.allocation.disk.threshold_enabled: false + volumeClaimTemplate: + accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 2Gi + persistence: + enabled: true