diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml deleted file mode 100644 index bacb0075fb4e..000000000000 --- a/.github/workflows/build.yaml +++ /dev/null @@ -1,67 +0,0 @@ ---- -name: Build -on: [push, pull_request] -permissions: read-all - -jobs: - build: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - target: - - linux-amd64 - - linux-386 - - darwin-amd64 - - darwin-arm64 - - windows-amd64 - - linux-arm - - linux-arm64 - - linux-ppc64le - - linux-s390x - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - env: - TARGET: ${{ matrix.target }} - run: | - set -euo pipefail - - echo "${TARGET}" - case "${TARGET}" in - linux-amd64) - GOOS=linux GOARCH=amd64 make build - ;; - linux-386) - GOOS=linux GOARCH=386 make build - ;; - darwin-amd64) - GOOS=darwin GOARCH=amd64 make build - ;; - darwin-arm64) - GOOS=darwin GOARCH=arm64 make build - ;; - windows-amd64) - GOOS=windows GOARCH=amd64 make build - ;; - linux-arm) - GOOS=linux GOARCH=arm make build - ;; - linux-arm64) - GOOS=linux GOARCH=arm64 make build - ;; - linux-ppc64le) - GOOS=linux GOARCH=ppc64le make build - ;; - linux-s390x) - GOOS=linux GOARCH=s390x make build - ;; - *) - echo "Failed to find target" - exit 1 - ;; - esac diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index b16275c38f25..000000000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,55 +0,0 @@ ---- -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" -on: - push: - branches: [main, release-3.4, release-3.5, release-3.6] - pull_request: - # The branches below must be a subset of the branches above - branches: [main] - schedule: - - cron: '20 14 * * 5' -permissions: read-all -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - strategy: - fail-fast: false - matrix: - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - language: ['go'] - steps: - - name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10 - with: - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - languages: ${{ matrix.language }} - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10 - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10 diff --git a/.github/workflows/contrib.yaml b/.github/workflows/contrib.yaml deleted file mode 100644 index 158269e5247c..000000000000 --- a/.github/workflows/contrib.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Test contrib/mixin -on: [push, pull_request] -permissions: read-all -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - run: | - set -euo pipefail - - make -C contrib/mixin tools test diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml deleted file mode 100644 index 23f677d8b14b..000000000000 --- a/.github/workflows/coverage.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: Coverage -on: [push] -permissions: read-all -jobs: - coverage: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - target: - - linux-amd64-coverage - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - env: - TARGET: ${{ matrix.target }} - run: | - mkdir "${TARGET}" - case "${TARGET}" in - linux-amd64-coverage) - GOARCH=amd64 ./scripts/codecov_upload.sh - ;; - *) - echo "Failed to find target" - exit 1 - ;; - esac diff --git a/.github/workflows/e2e-arm64.yaml b/.github/workflows/e2e-arm64.yaml deleted file mode 100644 index 9e66bc3b2a79..000000000000 --- a/.github/workflows/e2e-arm64.yaml +++ /dev/null @@ -1,37 +0,0 @@ ---- -name: E2E-Arm64 -on: [push, pull_request] -permissions: read-all -jobs: - test: - # this is to prevent the job to run at forked projects - if: github.repository == 'etcd-io/etcd' - runs-on: actuated-arm64-8cpu-8gb - strategy: - fail-fast: false - matrix: - target: - - linux-arm64-e2e - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - env: - TARGET: ${{ matrix.target }} - run: | - set -euo pipefail - go clean -testcache - - echo "${TARGET}" - case "${TARGET}" in - linux-arm64-e2e) - GOOS=linux GOARCH=arm64 CPU=4 EXPECT_DEBUG=true make test-e2e-release - ;; - *) - echo "Failed to find target" - exit 1 - ;; - esac diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml deleted file mode 100644 index 7d8e2a675b47..000000000000 --- a/.github/workflows/e2e.yaml +++ /dev/null @@ -1,40 +0,0 @@ ---- -name: E2E -on: [push, pull_request] -permissions: read-all -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - target: - - linux-amd64-e2e - - linux-386-e2e - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - env: - TARGET: ${{ matrix.target }} - run: | - set -euo pipefail - go clean -testcache - - echo "${TARGET}" - case "${TARGET}" in - linux-amd64-e2e) - make gofail-enable - VERBOSE=1 GOOS=linux GOARCH=amd64 CPU=4 EXPECT_DEBUG=true make test-e2e-release - ;; - linux-386-e2e) - VERBOSE=1 GOOS=linux GOARCH=386 CPU=4 EXPECT_DEBUG=true make test-e2e - ;; - *) - echo "Failed to find target" - exit 1 - ;; - esac diff --git a/.github/workflows/fuzzing.yaml b/.github/workflows/fuzzing.yaml deleted file mode 100644 index 81ba463724b1..000000000000 --- a/.github/workflows/fuzzing.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: Fuzzing v3rpc -on: [push, pull_request] -permissions: read-all -jobs: - fuzzing: - runs-on: ubuntu-latest - strategy: - fail-fast: false - env: - TARGET_PATH: ./server/etcdserver/api/v3rpc - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - run: | - set -euo pipefail - - GOARCH=amd64 CPU=4 make fuzz - - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 - if: failure() - with: - path: "${{env.TARGET_PATH}}/testdata/fuzz/**/*" diff --git a/.github/workflows/gh-workflow-approve.yaml b/.github/workflows/gh-workflow-approve.yaml deleted file mode 100644 index a13727a0af7b..000000000000 --- a/.github/workflows/gh-workflow-approve.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -name: Approve GitHub Workflows - -on: - pull_request_target: - types: - - labeled - - synchronize - branches: - - main - - release-3.5 - - release-3.4 - -jobs: - approve: - name: Approve ok-to-test - if: contains(github.event.pull_request.labels.*.name, 'ok-to-test') - runs-on: ubuntu-latest - permissions: - actions: write - steps: - - name: Update PR - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 - continue-on-error: true - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - debug: ${{ secrets.ACTIONS_RUNNER_DEBUG == 'true' }} - script: | - const result = await github.rest.actions.listWorkflowRunsForRepo({ - owner: context.repo.owner, - repo: context.repo.repo, - event: "pull_request", - status: "action_required", - head_sha: context.payload.pull_request.head.sha, - per_page: 100 - }); - - for (var run of result.data.workflow_runs) { - await github.rest.actions.approveWorkflowRun({ - owner: context.repo.owner, - repo: context.repo.repo, - run_id: run.id - }); - } diff --git a/.github/workflows/govuln.yaml b/.github/workflows/govuln.yaml deleted file mode 100644 index bec256d38b2f..000000000000 --- a/.github/workflows/govuln.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: Go Vulnerability Checker -on: [push, pull_request] -permissions: read-all -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - run: date - - run: | - set -euo pipefail - - go install golang.org/x/vuln/cmd/govulncheck@latest && govulncheck ./... diff --git a/.github/workflows/grpcproxy.yaml b/.github/workflows/grpcproxy.yaml deleted file mode 100644 index 82ab4110b5c1..000000000000 --- a/.github/workflows/grpcproxy.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -name: grpcProxy-tests -on: [push, pull_request] -permissions: read-all -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - target: - - linux-amd64-grpcproxy-integration - - linux-amd64-grpcproxy-e2e - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - env: - TARGET: ${{ matrix.target }} - run: | - set -euo pipefail - - echo "${TARGET}" - case "${TARGET}" in - linux-amd64-grpcproxy-integration) - GOOS=linux GOARCH=amd64 CPU=4 make test-grpcproxy-integration - ;; - linux-amd64-grpcproxy-e2e) - GOOS=linux GOARCH=amd64 CPU=4 make test-grpcproxy-e2e - ;; - *) - echo "Failed to find target" - exit 1 - ;; - esac diff --git a/.github/workflows/measure-test-flakiness.yaml b/.github/workflows/measure-test-flakiness.yaml deleted file mode 100644 index ad76ab8657a8..000000000000 --- a/.github/workflows/measure-test-flakiness.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: Measure Test Flakiness - -on: - schedule: - - cron: "0 0 * * 0" # run every Sunday at midnight - -permissions: read-all - -jobs: - measure-test-flakiness: - name: Measure Test Flakiness - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - set -euo pipefail - - ./scripts/measure-test-flakiness.sh - make bin/etcd-test-analyzer - bin/etcd-test-analyzer run -token $GITHUB_TOKEN -max-age=168h -workflow Tests -branch main diff --git a/.github/workflows/measure-testgrid-flakiness.yaml b/.github/workflows/measure-testgrid-flakiness.yaml deleted file mode 100644 index 662615e1b6b7..000000000000 --- a/.github/workflows/measure-testgrid-flakiness.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: Measure TestGrid Flakiness - -on: - schedule: - - cron: "0 0 * * 0" # run every Sunday at midnight - -permissions: read-all - -jobs: - measure-testgrid-flakiness: - name: Measure TestGrid Flakiness - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - set -euo pipefail - - ./scripts/measure-testgrid-flakiness.sh diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index 38abcf2baa04..000000000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,72 +0,0 @@ ---- -name: Release -on: [push, pull_request] -permissions: read-all -jobs: - main: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - name: release - run: | - set -euo pipefail - - git config --global user.email "github-action@etcd.io" - git config --global user.name "Github Action" - gpg --batch --gen-key <> "$GITHUB_OUTPUT" - - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - id: golangci_lint_version - run: echo "golangci_lint_version=$(cd tools/mod && go list -m -f {{.Version}} github.com/golangci/golangci-lint)" >> "$GITHUB_OUTPUT" - - name: golangci-lint - uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0 - with: - version: ${{ steps.golangci_lint_version.outputs.golangci_lint_version }} - args: --config tools/.golangci.yaml - - name: protoc - uses: arduino/setup-protoc@149f6c87b92550901b26acd1632e11c3662e381f # v1.3.0 - with: - version: '3.20.3' - repo-token: ${{ secrets.GITHUB_TOKEN }} - - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - run: | - set -euo pipefail - - cargo install marker --version 0.9.0 - - run: | - set -euo pipefail - - make verify - - run: | - set -euo pipefail - - make fix - - DIFF=$(git status --porcelain) - - if [ -n "$DIFF" ]; then - echo "These files were modified:" - echo - echo "$DIFF" - echo - exit 1 - fi diff --git a/.github/workflows/tests-template.yaml b/.github/workflows/tests-template.yaml deleted file mode 100644 index a00cd5c4234d..000000000000 --- a/.github/workflows/tests-template.yaml +++ /dev/null @@ -1,73 +0,0 @@ ---- -name: Reusable Tests Workflow -on: - workflow_call: - inputs: - arch: - required: true - type: string - runs-on: - required: true - type: string -permissions: read-all - -jobs: - test: - runs-on: ${{ inputs.runs-on }} - # this is to prevent arm64 jobs from running at forked projects - if: inputs.arch == 'amd64' || github.repository == 'etcd-io/etcd' - strategy: - fail-fast: false - matrix: - target: - - linux-${{ inputs.arch }}-integration-1-cpu - - linux-${{ inputs.arch }}-integration-2-cpu - - linux-${{ inputs.arch }}-integration-4-cpu - - linux-${{ inputs.arch }}-unit-4-cpu - - linux-386-unit-1-cpu - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - - id: goversion - run: echo "goversion=$(cat .go-version)" >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 - with: - go-version: ${{ steps.goversion.outputs.goversion }} - - env: - TARGET: ${{ matrix.target }} - run: | - set -euo pipefail - go clean -testcache - - mkdir "${TARGET}" - export JUNIT_REPORT_DIR=$(realpath ${TARGET}) - case "${TARGET}" in - linux-${{ inputs.arch }}-integration-1-cpu) - make gofail-enable - GOOS=linux GOARCH=${{ inputs.arch }} CPU=1 make test-integration - ;; - linux-${{ inputs.arch }}-integration-2-cpu) - make gofail-enable - GOOS=linux GOARCH=${{ inputs.arch }} CPU=2 make test-integration - ;; - linux-${{ inputs.arch }}-integration-4-cpu) - make gofail-enable - GOOS=linux GOARCH=${{ inputs.arch }} CPU=4 make test-integration - ;; - linux-${{ inputs.arch }}-unit-4-cpu) - GOOS=linux GOARCH=${{ inputs.arch }} CPU=4 GO_TEST_FLAGS='-p=2' make test-unit - ;; - linux-386-unit-1-cpu) - # skip running single-threaded 386 unit tests only if arch is arm64 - if [ "${{ inputs.arch }}" == "arm64" ]; then exit; fi - GOOS=linux GOARCH=386 CPU=1 GO_TEST_FLAGS='-p=4' make test-unit - ;; - *) - echo "Failed to find target" - exit 1 - ;; - esac - - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 - if: always() - with: - name: "${{ matrix.target }}" - path: ./**/junit_*.xml diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml deleted file mode 100644 index b6d743b23616..000000000000 --- a/.github/workflows/tests.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -name: Tests -on: [push, pull_request] -permissions: read-all -jobs: - amd64: - uses: ./.github/workflows/tests-template.yaml - with: - arch: amd64 - runs-on: ubuntu-latest - arm64: - uses: ./.github/workflows/tests-template.yaml - with: - arch: arm64 - runs-on: actuated-arm64-8cpu-8gb diff --git a/tests/robustness/failpoint/failpoint.go b/tests/robustness/failpoint/failpoint.go index d52b64f4acb1..c2cdbfba0b03 100644 --- a/tests/robustness/failpoint/failpoint.go +++ b/tests/robustness/failpoint/failpoint.go @@ -37,20 +37,21 @@ const ( var ( allFailpoints = []Failpoint{ - KillFailpoint, BeforeCommitPanic, AfterCommitPanic, RaftBeforeSavePanic, RaftAfterSavePanic, - DefragBeforeCopyPanic, DefragBeforeRenamePanic, BackendBeforePreCommitHookPanic, BackendAfterPreCommitHookPanic, - BackendBeforeStartDBTxnPanic, BackendAfterStartDBTxnPanic, BackendBeforeWritebackBufPanic, - BackendAfterWritebackBufPanic, CompactBeforeCommitScheduledCompactPanic, CompactAfterCommitScheduledCompactPanic, - CompactBeforeSetFinishedCompactPanic, CompactAfterSetFinishedCompactPanic, CompactBeforeCommitBatchPanic, - CompactAfterCommitBatchPanic, RaftBeforeLeaderSendPanic, BlackholePeerNetwork, DelayPeerNetwork, - RaftBeforeFollowerSendPanic, RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, - RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic, BlackholeUntilSnapshot, - BeforeApplyOneConfChangeSleep, - MemberReplace, - DropPeerNetwork, - RaftBeforeSaveSleep, - RaftAfterSaveSleep, - ApplyBeforeOpenSnapshot, + //KillFailpoint, BeforeCommitPanic, AfterCommitPanic, RaftBeforeSavePanic, RaftAfterSavePanic, + //DefragBeforeCopyPanic, DefragBeforeRenamePanic, BackendBeforePreCommitHookPanic, BackendAfterPreCommitHookPanic, + //BackendBeforeStartDBTxnPanic, BackendAfterStartDBTxnPanic, BackendBeforeWritebackBufPanic, + //BackendAfterWritebackBufPanic, CompactBeforeCommitScheduledCompactPanic, CompactAfterCommitScheduledCompactPanic, + CompactBeforeSetFinishedCompactPanic, + //CompactAfterSetFinishedCompactPanic, CompactBeforeCommitBatchPanic, + //CompactAfterCommitBatchPanic, RaftBeforeLeaderSendPanic, BlackholePeerNetwork, DelayPeerNetwork, + //RaftBeforeFollowerSendPanic, RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, + //RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic, BlackholeUntilSnapshot, + //BeforeApplyOneConfChangeSleep, + //MemberReplace, + //DropPeerNetwork, + //RaftBeforeSaveSleep, + //RaftAfterSaveSleep, + //ApplyBeforeOpenSnapshot, } ) diff --git a/tests/robustness/scenarios.go b/tests/robustness/scenarios.go index 01cd00c8b2b6..390a9e7142e9 100644 --- a/tests/robustness/scenarios.go +++ b/tests/robustness/scenarios.go @@ -65,16 +65,9 @@ func exploratoryScenarios(t *testing.T) []testScenario { t.Fatalf("Failed checking etcd version binary, binary: %q, err: %v", e2e.BinPath.Etcd, err) } enableLazyFS := e2e.BinPath.LazyFSAvailable() - randomizableOptions := []e2e.EPClusterOption{ - options.WithClusterOptionGroups( - options.ClusterOptions{options.WithTickMs(29), options.WithElectionMs(271)}, - options.ClusterOptions{options.WithTickMs(101), options.WithElectionMs(521)}, - options.ClusterOptions{options.WithTickMs(100), options.WithElectionMs(2000)}), - } baseOptions := []e2e.EPClusterOption{ - options.WithSnapshotCount(50, 100, 1000), - options.WithSubsetOptions(randomizableOptions...), + options.WithSnapshotCount(1000), e2e.WithGoFailEnabled(true), e2e.WithCompactionBatchLimit(100), e2e.WithWatchProcessNotifyInterval(100 * time.Millisecond), diff --git a/tests/robustness/traffic/kubernetes.go b/tests/robustness/traffic/kubernetes.go index ff01650035d7..0f8379860473 100644 --- a/tests/robustness/traffic/kubernetes.go +++ b/tests/robustness/traffic/kubernetes.go @@ -36,9 +36,9 @@ var ( resource: "pods", namespace: "default", writeChoices: []choiceWeight[KubernetesRequestType]{ - {choice: KubernetesUpdate, weight: 90}, - {choice: KubernetesDelete, weight: 5}, - {choice: KubernetesCreate, weight: 5}, + {choice: KubernetesUpdate, weight: 33}, + {choice: KubernetesDelete, weight: 33}, + {choice: KubernetesCreate, weight: 33}, }, } ) @@ -149,19 +149,14 @@ func (t kubernetesTraffic) Write(ctx context.Context, kc *kubernetesClient, ids if rev == 0 { return errors.New("storage empty") } - if count > t.averageKeyCount*3/2 && nonUniqueWriteLimiter.Take() { + if count > t.averageKeyCount*3/2 { _, err = kc.OptimisticDelete(writeCtx, key, rev) - nonUniqueWriteLimiter.Return() } else { choices := t.writeChoices - if !nonUniqueWriteLimiter.Take() { - choices = filterOutNonUniqueKubernetesWrites(t.writeChoices) - } op := pickRandom(choices) switch op { case KubernetesDelete: _, err = kc.OptimisticDelete(writeCtx, key, rev) - nonUniqueWriteLimiter.Return() case KubernetesUpdate: _, err = kc.OptimisticUpdate(writeCtx, key, fmt.Sprintf("%d", ids.NewRequestID()), rev) case KubernetesCreate: diff --git a/tests/robustness/traffic/traffic.go b/tests/robustness/traffic/traffic.go index 41feed388533..72daedf9d1f1 100644 --- a/tests/robustness/traffic/traffic.go +++ b/tests/robustness/traffic/traffic.go @@ -36,8 +36,8 @@ var ( LowTraffic = Profile{ Name: "LowTraffic", - MinimalQPS: 100, - MaximalQPS: 200, + MinimalQPS: 1, + MaximalQPS: 500, ClientCount: 8, MaxNonUniqueRequestConcurrency: 3, }