merge with master

etcd-io · Apr 17, 2022 · 1d39e1a · 1d39e1a
2 parents 07d6823 + 3dce380
commit 1d39e1a
Show file tree

Hide file tree

Showing 442 changed files with 13,274 additions and 16,099 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -0,0 +1,92 @@
+name: Bug Report
+description: Report a bug encountered while operating Etcd
+labels:
+- area/bug
+body:
+- type: markdown
+  attributes:
+    value: |
+      Please read https://etcd.io/docs/latest/reporting_bugs/
+      If this matter is security related, please disclose it privately via [email protected].
+      Please fill the form below and provide as much information as possible.
+      Not doing so may result in your bug not being addressed in a timely manner.
+
+- type: textarea
+  id: problem
+  attributes:
+    label: What happened?
+  validations:
+    required: true
+
+- type: textarea
+  id: expected
+  attributes:
+    label: What did you expect to happen?
+  validations:
+    required: true
+
+- type: textarea
+  id: repro
+  attributes:
+    label: How can we reproduce it (as minimally and precisely as possible)?
+  validations:
+    required: true
+
+- type: textarea
+  id: additional
+  attributes:
+    label: Anything else we need to know?
+
+- type: textarea
+  id: etcdVersion
+  attributes:
+    label: Etcd version (please run commands below)
+    value: |
+      <details>
+
+      ```console
+      $ etcd --version
+      # paste output here
+
+      $ etcdctl version
+      # paste output here
+      ```
+
+      </details>
+  validations:
+    required: true
+
+- type: textarea
+  id: config
+  attributes:
+    label: Etcd configuration (command line flags or environment variables)
+    value: |
+      <details>
+
+      # paste your configuration here
+
+      </details>
+
+- type: textarea
+  id: etcdDebugInformation
+  attributes:
+    label: Etcd debug information (please run commands blow, feel free to obfuscate the IP address or FQDN in the output)
+    value: |
+      <details>
+
+      ```console
+      $ etcdctl member list -w table
+      # paste output here
+
+      $ etcdctl --endpoints=<member list> endpoint status -w table
+      # paste output here
+      ```
+
+      </details>
+
+- type: textarea
+  id: logs
+  attributes:
+    label: Relevant log output
+    description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+    render: shell
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,6 +10,7 @@ jobs:
           - linux-amd64
           - linux-386
           - darwin-amd64
+          - darwin-arm64
           - windows-amd64
           - linux-arm
           - linux-arm64
@@ -19,35 +20,38 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.17.2"
+          go-version: "1.17.8"
       - env:
           TARGET: ${{ matrix.target }}
         run: |
           echo "${TARGET}"
           case "${TARGET}" in
             linux-amd64)
-              ARCH=amd64 PASSES='build' ./test.sh
+              ARCH=amd64 PASSES='build' ./scripts/test.sh
               ;;
             linux-386)
-              ARCH=386 PASSES='build' ./test.sh
+              ARCH=386 PASSES='build' ./scripts/test.sh
               ;;
             darwin-amd64)
-              ARCH=amd64 GOOS=darwin GO_BUILD_FLAGS='-v -mod=readonly' ./build.sh
+              ARCH=amd64 GOOS=darwin GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
+              ;;
+            darwin-arm64)
+              ARCH=arm64 GOOS=darwin GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
               ;;
             windows-amd64)
-              ARCH=amd64 GOOS=windows GO_BUILD_FLAGS='-v -mod=readonly' ./build.sh
+              ARCH=amd64 GOOS=windows GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
               ;;
             linux-arm)
-              ARCH=arm GO_BUILD_FLAGS='-v -mod=readonly' ./build.sh
+              ARCH=arm GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
               ;;
             linux-arm64)
-              ARCH=arm64 GO_BUILD_FLAGS='-v -mod=readonly' ./build.sh
+              ARCH=arm64 GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
               ;;
             linux-ppc64le)
-              ARCH=ppc64le GO_BUILD_FLAGS='-v -mod=readonly' ./build.sh
+              ARCH=ppc64le GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
               ;;
             linux-s390x)
-              ARCH=s390x GO_BUILD_FLAGS='-v -mod=readonly' ./build.sh
+              ARCH=s390x GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
               ;;
             *)
               echo "Failed to find target"

diff --git a/.github/workflows/contrib.yaml b/.github/workflows/contrib.yaml
@@ -0,0 +1,11 @@
+name: Test contrib/mixin
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-go@v2
+      with:
+        go-version: "1.17.8"
+    - run: make -C contrib/mixin tools test
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -0,0 +1,28 @@
+name: Coverage
+on: [push, pull_request]
+jobs:
+  coverage:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+        - linux-amd64-coverage
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-go@v2
+      with:
+        go-version: "1.17.8"
+    - 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.yaml b/.github/workflows/e2e.yaml
@@ -13,19 +13,19 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.17.2"
+        go-version: "1.17.8"
     - run: date
     - env:
         TARGET: ${{ matrix.target }}
       run: |
         echo "${TARGET}"
         case "${TARGET}" in
           linux-amd64-e2e)
-            PASSES='build release e2e' MANUAL_VER=v3.5.0 CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./test.sh 2>&1 | tee test.log
+            PASSES='build release e2e' MANUAL_VER=v3.5.0 CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./scripts/test.sh 2>&1 | tee test.log
             ! egrep "(--- FAIL:|FAIL:|DATA RACE|panic: test timed out|appears to have leaked)" -B50 -A10 test.log
             ;;
           linux-386-e2e)
-            GOARCH=386 PASSES='build e2e' CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./test.sh 2>&1 | tee test.log
+            GOARCH=386 PASSES='build e2e' CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./scripts/test.sh 2>&1 | tee test.log
             ! egrep "(--- FAIL:|FAIL:|DATA RACE|panic: test timed out|appears to have leaked)" -B50 -A10 test.log
             ;;
           *)

diff --git a/.github/workflows/functional.yaml b/.github/workflows/functional.yaml
@@ -12,15 +12,15 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.17.2"
+        go-version: "1.17.8"
     - run: date
     - env:
         TARGET: ${{ matrix.target }}
       run: |
         echo "${TARGET}"
         case "${TARGET}" in
           linux-amd64-functional)
-            GO_BUILD_FLAGS='-v -mod=readonly' ./build.sh && GOARCH=amd64 PASSES='functional' ./test.sh
+            GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh && GOARCH=amd64 PASSES='functional' ./scripts/test.sh
             ;;
           *)
             echo "Failed to find target"

diff --git a/.github/workflows/grpcproxy.yaml b/.github/workflows/grpcproxy.yaml
@@ -7,20 +7,25 @@ jobs:
       fail-fast: true
       matrix:
         target:
-        - linux-amd64-grpcproxy
+        - linux-amd64-grpcproxy-integration
+        - linux-amd64-grpcproxy-e2e
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.17.2"
+        go-version: "1.17.8"
     - run: date
     - env:
         TARGET: ${{ matrix.target }}
       run: |
         echo "${TARGET}"
         case "${TARGET}" in
-          linux-amd64-grpcproxy)
-            PASSES='build grpcproxy'  CPU='4' COVER='false' RACE='true' ./test.sh 2>&1 | tee test.log
+          linux-amd64-grpcproxy-integration)
+            PASSES='build grpcproxy_integration'  CPU='4' COVER='false' RACE='true' ./scripts/test.sh 2>&1 | tee test.log
+            ! egrep "(--- FAIL:|FAIL:|DATA RACE|panic: test timed out|appears to have leaked)" -B50 -A10 test.log
+            ;;
+          linux-amd64-grpcproxy-e2e)
+            PASSES='build grpcproxy_e2e'  CPU='4' COVER='false' RACE='true' ./scripts/test.sh 2>&1 | tee test.log
             ! egrep "(--- FAIL:|FAIL:|DATA RACE|panic: test timed out|appears to have leaked)" -B50 -A10 test.log
             ;;
           *)

diff --git a/.github/workflows/measure-test-flakiness.yaml b/.github/workflows/measure-test-flakiness.yaml
@@ -0,0 +1,15 @@
+name: Measure Test Flakiness
+
+on:
+  schedule:
+    - cron: "0 0 * * 0"
+
+jobs:
+  measure-test-flakiness:
+    name: Measure Test Flakiness
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run script to measure test flakiness
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: "./scripts/measure-test-flakiness.sh"
diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
@@ -12,15 +12,15 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.17.2"
+          go-version: "1.17.8"
       - run: date
       - env:
           TARGET: ${{ matrix.target }}
         run: |
           echo "${TARGET}"
           case "${TARGET}" in
             linux-amd64-fmt)
-              GOARCH=amd64 PASSES='fmt bom dep' ./test.sh
+              GOARCH=amd64 PASSES='fmt bom dep' ./scripts/test.sh
               ;;
             *)
               echo "Failed to find target"

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v2
       with:
-        go-version: "1.17.2"
+        go-version: "1.17.8"
     - run: date
     - env:
         TARGET: ${{ matrix.target }}
@@ -25,19 +25,19 @@ jobs:
         export JUNIT_REPORT_DIR=$(realpath ${TARGET})
         case "${TARGET}" in
           linux-amd64-integration-1-cpu)
-            GOARCH=amd64 CPU=1 PASSES='integration' RACE='false' ./test.sh
+            GOARCH=amd64 CPU=1 PASSES='integration' RACE='false' ./scripts/test.sh
             ;;
           linux-amd64-integration-2-cpu)
-            GOARCH=amd64 CPU=2 PASSES='integration' RACE='false' ./test.sh
+            GOARCH=amd64 CPU=2 PASSES='integration' RACE='false' ./scripts/test.sh
             ;;
           linux-amd64-integration-4-cpu)
-            GOARCH=amd64 CPU=4 PASSES='integration' RACE='false' ./test.sh
+            GOARCH=amd64 CPU=4 PASSES='integration' RACE='false' ./scripts/test.sh
             ;;
           linux-amd64-unit-4-cpu-race)
-            GOARCH=amd64 PASSES='unit' RACE='true' CPU='4' ./test.sh -p=2
+            GOARCH=amd64 PASSES='unit' RACE='true' CPU='4' ./scripts/test.sh -p=2
             ;;
           linux-386-unit-1-cpu)
-            GOARCH=386 PASSES='unit' RACE='false' CPU='1' ./test -p=4
+            GOARCH=386 PASSES='unit' RACE='false' CPU='1' ./scripts/test.sh -p=4
             ;;
           *)
             echo "Failed to find target"

diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@
 *.test
 hack/tls-setup/certs
 .idea
+/contrib/mixin/manifests
 /contrib/raftexample/raftexample
 /contrib/raftexample/raftexample-*
 /vendor
@@ -22,4 +23,4 @@ hack/tls-setup/certs
 *.bak
 .gobincache/
 /Documentation/dev-guide/api_reference_v3.md
-/Documentation/dev-guide/api_concurrency_reference_v3.md
+/Documentation/dev-guide/api_concurrency_reference_v3.md
diff --git a/.travis.yml b/.travis.yml