Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: fix ES disk insufficient in test #11406

Merged
merged 1 commit into from
Oct 13, 2023
Merged

test: fix ES disk insufficient in test #11406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .github/workflows/skywalking.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
11 changes: 8 additions & 3 deletions test/e2e-v2/cases/istio/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%
cluster.routing.allocation.disk.threshold_enabled: false
volumeClaimTemplate:
accessModes: [ "ReadWriteOnce" ]
resources:
requests:
storage: 2Gi
persistence:
enabled: true
Loading