Merge branch 'main' of https://github.com/etcd-io/etcd into robustnes…

…s-ensure-healthy-clus
etcd-io · Apr 2, 2023 · feb4294 · feb4294
2 parents e83703b + a1bd154
commit feb4294
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 46 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -31,31 +31,31 @@ jobs:
           echo "${TARGET}"
           case "${TARGET}" in
             linux-amd64)
-              GOARCH=amd64 PASSES='build' ./scripts/test.sh
+              GOOS=linux GOARCH=amd64 make build
               ;;
             linux-386)
-              GOARCH=386 PASSES='build' ./scripts/test.sh
+              GOOS=linux GOARCH=386 make build
               ;;
             darwin-amd64)
-              GOARCH=amd64 GOOS=darwin GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
+              GOOS=darwin GOARCH=amd64 make build
               ;;
             darwin-arm64)
-              GOARCH=arm64 GOOS=darwin GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
+              GOOS=darwin GOARCH=arm64 make build
               ;;
             windows-amd64)
-              GOARCH=amd64 GOOS=windows GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
+              GOOS=windows GOARCH=amd64 make build
               ;;
             linux-arm)
-              GOARCH=arm GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
+              GOOS=linux GOARCH=arm make build
               ;;
             linux-arm64)
-              GOARCH=arm64 GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
+              GOOS=linux GOARCH=arm64 make build
               ;;
             linux-ppc64le)
-              GOARCH=ppc64le GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
+              GOOS=linux GOARCH=ppc64le make build
               ;;
             linux-s390x)
-              GOARCH=s390x GO_BUILD_FLAGS='-v -mod=readonly' ./scripts/build.sh
+              GOOS=linux GOARCH=s390x make build
               ;;
             *)
               echo "Failed to find target"

diff --git a/.github/workflows/e2e-arm64.yaml b/.github/workflows/e2e-arm64.yaml
@@ -28,7 +28,7 @@ jobs:
         echo "${TARGET}"
         case "${TARGET}" in
           linux-arm64-e2e)
-            PASSES='build release e2e' CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./scripts/test.sh
+            GOOS=linux GOARCH=arm64 CPU=4 EXPECT_DEBUG=true RACE=true make test-e2e-release
             ;;
           *)
             echo "Failed to find target"

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -24,10 +24,10 @@ jobs:
         echo "${TARGET}"
         case "${TARGET}" in
           linux-amd64-e2e)
-            PASSES='build release e2e' CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./scripts/test.sh
+            GOOS=linux GOARCH=amd64 CPU=4 EXPECT_DEBUG=true RACE=true make test-e2e-release
             ;;
           linux-386-e2e)
-            GOARCH=386 PASSES='build e2e' CPU='4' EXPECT_DEBUG='true' COVER='false' RACE='true' ./scripts/test.sh
+            GOOS=linux GOARCH=386 CPU=4 EXPECT_DEBUG=true RACE=true make test-e2e
             ;;
           *)
             echo "Failed to find target"

diff --git a/.github/workflows/grpcproxy.yaml b/.github/workflows/grpcproxy.yaml
@@ -24,10 +24,10 @@ jobs:
         echo "${TARGET}"
         case "${TARGET}" in
           linux-amd64-grpcproxy-integration)
-            PASSES='build grpcproxy_integration'  CPU='4' COVER='false' RACE='true' ./scripts/test.sh
+            GOOS=linux GOARCH=amd64 CPU=4 RACE=true make test-grpcproxy-integration
             ;;
           linux-amd64-grpcproxy-e2e)
-            PASSES='build grpcproxy_e2e'  CPU='4' COVER='false' RACE='true' ./scripts/test.sh
+            GOOS=linux GOARCH=amd64 CPU=4 RACE=true make test-grpcproxy-e2e
             ;;
           *)
             echo "Failed to find target"

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -27,7 +27,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # tag=v2.1.2
+        uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # tag=v2.1.3
         with:
           results_file: results.sarif
           results_format: sarif

diff --git a/.github/workflows/tests-arm64.yaml b/.github/workflows/tests-arm64.yaml
@@ -31,16 +31,16 @@ jobs:
         export JUNIT_REPORT_DIR=$(realpath ${TARGET})
         case "${TARGET}" in
           linux-arm64-integration-1-cpu)
-            GOARCH=arm64 CPU=1 PASSES='integration' RACE='false' ./scripts/test.sh
+            GOOS=linux GOARCH=arm64 CPU=1 make test-integration
             ;;
           linux-arm64-integration-2-cpu)
-            GOARCH=arm64 CPU=2 PASSES='integration' RACE='false' ./scripts/test.sh
+            GOOS=linux GOARCH=arm64 CPU=2 make test-integration
             ;;
           linux-arm64-integration-4-cpu)
-            GOARCH=arm64 CPU=4 PASSES='integration' RACE='false' ./scripts/test.sh
+            GOOS=linux GOARCH=arm64 CPU=4 make test-integration
             ;;
           linux-arm64-unit-4-cpu-race)
-            GOARCH=arm64 PASSES='unit' RACE='true' CPU='4' ./scripts/test.sh -p=2
+            GOOS=linux GOARCH=arm64 CPU=4 RACE=true GO_TEST_FLAGS='-p=2' make test-unit
             ;;
           *)
             echo "Failed to find target"

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -28,19 +28,19 @@ jobs:
         export JUNIT_REPORT_DIR=$(realpath ${TARGET})
         case "${TARGET}" in
           linux-amd64-integration-1-cpu)
-            GOARCH=amd64 CPU=1 PASSES='integration' RACE='false' ./scripts/test.sh
+            GOOS=linux GOARCH=amd64 CPU=1 make test-integration
             ;;
           linux-amd64-integration-2-cpu)
-            GOARCH=amd64 CPU=2 PASSES='integration' RACE='false' ./scripts/test.sh
+            GOOS=linux GOARCH=amd64 CPU=2 make test-integration
             ;;
           linux-amd64-integration-4-cpu)
-            GOARCH=amd64 CPU=4 PASSES='integration' RACE='false' ./scripts/test.sh
+            GOOS=linux GOARCH=amd64 CPU=4 make test-integration
             ;;
           linux-amd64-unit-4-cpu-race)
-            GOARCH=amd64 PASSES='unit' RACE='true' CPU='4' ./scripts/test.sh -p=2
+            GOOS=linux GOARCH=amd64 CPU=4 RACE=true GO_TEST_FLAGS='-p=2' make test-unit
             ;;
           linux-386-unit-1-cpu)
-            GOARCH=386 PASSES='unit' RACE='false' CPU='1' ./scripts/test.sh -p=4
+            GOOS=linux GOARCH=386 CPU=1 GO_TEST_FLAGS='-p=4' make test-unit
             ;;
           *)
             echo "Failed to find target"

diff --git a/CHANGELOG/CHANGELOG-3.5.md b/CHANGELOG/CHANGELOG-3.5.md
@@ -24,6 +24,7 @@ Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/
 
 ### Other
 - [Remove nsswitch.conf from docker image](https://github.com/etcd-io/etcd/pull/15161)
+- Fix [etcd docker images all tagged with amd64 architecture](https://github.com/etcd-io/etcd/pull/15612)
 
 ### Go
 - Require [Go 1.19+](https://github.com/etcd-io/etcd/pull/15337).

diff --git a/Makefile b/Makefile
@@ -3,14 +3,11 @@ include tests/robustness/makefile.mk
 
 .PHONY: build
 build:
-	GO_BUILD_FLAGS="${GO_BUILD_FLAGS} -v" ./scripts/build.sh
-	./bin/etcd --version
-	./bin/etcdctl version
-	./bin/etcdutl version
+	GO_BUILD_FLAGS="${GO_BUILD_FLAGS} -v -mod=readonly" ./scripts/build.sh
 
 .PHONY: tools
 tools:
-	GO_BUILD_FLAGS="${GO_BUILD_FLAGS} -v" ./scripts/build_tools.sh
+	GO_BUILD_FLAGS="${GO_BUILD_FLAGS} -v -mod=readonly" ./scripts/build_tools.sh
 
 TEMP_TEST_ANALYZER_DIR=/tmp/etcd-test-analyzer
 TEST_ANALYZER_BIN=${PWD}/bin
@@ -43,6 +40,14 @@ test-integration:
 test-e2e: build
 	PASSES="e2e" ./scripts/test.sh $(GO_TEST_FLAGS)
 
+.PHONY: test-grpcproxy-integration
+test-grpcproxy-integration:
+	PASSES="grpcproxy_integration" ./scripts/test.sh $(GO_TEST_FLAGS)
+
+.PHONY: test-grpcproxy-e2e
+test-grpcproxy-e2e: build
+	PASSES="grpcproxy_e2e" ./scripts/test.sh $(GO_TEST_FLAGS)
+
 .PHONY: test-e2e-release
 test-e2e-release: build
 	PASSES="release e2e" ./scripts/test.sh $(GO_TEST_FLAGS)

diff --git a/tests/framework/e2e/cluster.go b/tests/framework/e2e/cluster.go
@@ -478,6 +478,9 @@ func (cfg *EtcdProcessClusterConfig) EtcdServerProcessConfig(tb testing.TB, i in
 	peerAdvertiseUrl := url.URL{Scheme: cfg.PeerScheme(), Host: fmt.Sprintf("localhost:%d", peerPort)}
 	var proxyCfg *proxy.ServerConfig
 	if cfg.PeerProxy {
+		if !cfg.IsPeerTLS {
+			panic("Can't use peer proxy without peer TLS as it can result in malformed packets")
+		}
 		peerAdvertiseUrl.Host = fmt.Sprintf("localhost:%d", peer2Port)
 		proxyCfg = &proxy.ServerConfig{
 			Logger: zap.NewNop(),

diff --git a/tests/robustness/failpoints.go b/tests/robustness/failpoints.go
@@ -67,9 +67,8 @@ var (
 		CompactBeforeSetFinishedCompactPanic, CompactAfterSetFinishedCompactPanic,
 		CompactBeforeCommitBatchPanic, CompactAfterCommitBatchPanic,
 		RaftBeforeLeaderSendPanic,
+		BlackholePeerNetwork,
 		DelayPeerNetwork,
-		// TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed
-		//BlackholePeerNetwork,
 	}
 	RandomOneNodeClusterFailpoint   Failpoint = randomFailpoint{oneNodeClusterFailpoints}
 	RaftBeforeFollowerSendPanic     Failpoint = goPanicFailpoint{"raftBeforeFollowerSend", nil, Follower}
@@ -80,9 +79,8 @@ var (
 	RaftBeforeSaveSnapPanic         Failpoint = goPanicFailpoint{"raftBeforeSaveSnap", triggerBlackholeUntilSnapshot, Follower}
 	RaftAfterSaveSnapPanic          Failpoint = goPanicFailpoint{"raftAfterSaveSnap", triggerBlackholeUntilSnapshot, Follower}
 	RandomSnapshotFailpoint         Failpoint = randomFailpoint{[]Failpoint{
-		// TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed
-		//RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic,
-		//BlackholeUntilSnapshot,
+		RaftBeforeApplySnapPanic, RaftAfterApplySnapPanic, RaftAfterWALReleasePanic, RaftBeforeSaveSnapPanic, RaftAfterSaveSnapPanic,
+		BlackholeUntilSnapshot,
 	}}
 )
 

diff --git a/tests/robustness/linearizability_test.go b/tests/robustness/linearizability_test.go
@@ -103,6 +103,7 @@ func TestRobustness(t *testing.T) {
 			failpoint: RandomMultiNodeClusterFailpoint,
 			traffic:   &traffic,
 			config: *e2e.NewConfig(
+				e2e.WithIsPeerTLS(true),
 				e2e.WithSnapshotCount(100),
 				e2e.WithPeerProxy(true),
 				e2e.WithGoFailEnabled(true),
@@ -136,18 +137,18 @@ func TestRobustness(t *testing.T) {
 				e2e.WithSnapshotCount(100),
 			),
 		},
-		// TODO(https://github.com/etcd-io/etcd/issues/15595): Re-enable after issue is fixed
-		//{
-		//	name:      "Snapshot",
-		//	failpoint: RandomSnapshotFailpoint,
-		//	traffic:   &HighTraffic,
-		//	config: *e2e.NewConfig(
-		//		e2e.WithGoFailEnabled(true),
-		//		e2e.WithSnapshotCount(100),
-		//		e2e.WithSnapshotCatchUpEntries(100),
-		//		e2e.WithPeerProxy(true),
-		//	),
-		//},
+		{
+			name:      "Snapshot",
+			failpoint: RandomSnapshotFailpoint,
+			traffic:   &HighTraffic,
+			config: *e2e.NewConfig(
+				e2e.WithGoFailEnabled(true),
+				e2e.WithSnapshotCount(100),
+				e2e.WithSnapshotCatchUpEntries(100),
+				e2e.WithPeerProxy(true),
+				e2e.WithIsPeerTLS(true),
+			),
+		},
 	}...)
 	for _, scenario := range scenarios {
 		if scenario.traffic == nil {