build(deps): bump github.com/prometheus/client_model in /tools/mod

Bumps [github.com/prometheus/client_model](https://github.com/prometheus/client_model) from 0.4.1-0.20230718164431-9a2bf3000d16 to 0.5.0.
- [Release notes](https://github.com/prometheus/client_model/releases)
- [Commits](https://github.com/prometheus/client_model/commits/v0.5.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_model
  dependency-type: indirect
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -19,8 +19,3 @@ updates:
       interval: weekly
     allow:
       - dependency-type: all
-
-  - package-ecosystem: docker
-    directory: /
-    schedule:
-      interval: weekly

.github/workflows/build.yaml

@@ -23,7 +23,7 @@ jobs:
       - 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
+      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
       - env:

.github/workflows/codeql-analysis.yml

@@ -40,7 +40,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
+        uses: github/codeql-action/init@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
         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.
@@ -50,6 +50,6 @@ jobs:
       # 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@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
+        uses: github/codeql-action/autobuild@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
+        uses: github/codeql-action/analyze@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8

.github/workflows/contrib.yaml

@@ -9,7 +9,7 @@ jobs:
       - 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
+      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
       - run: |

.github/workflows/coverage.yaml

@@ -14,7 +14,7 @@ jobs:
       - 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
+      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
       - env:

.github/workflows/e2e-arm64.yaml

@@ -6,17 +6,19 @@ 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
+    runs-on: actuated-arm64-8cpu-32gb
     strategy:
       fail-fast: false
       matrix:
         target:
           - linux-arm64-e2e
     steps:
+      - name: Collect Workflow Telemetry
+        uses: catchpoint/workflow-telemetry-action@v1
       - 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
+      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
       - env:

.github/workflows/e2e.yaml

@@ -15,7 +15,7 @@ jobs:
       - 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
+      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
       - env:

.github/workflows/fuzzing.yaml

@@ -13,7 +13,7 @@ jobs:
       - 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
+      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
       - run: |

.github/workflows/govuln.yaml

@@ -9,7 +9,7 @@ jobs:
       - 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
+      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
       - run: date

.github/workflows/grpcproxy.yaml

@@ -15,7 +15,7 @@ jobs:
       - 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
+      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
       - env:

.github/workflows/release.yaml

@@ -9,7 +9,7 @@ jobs:
       - 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
+      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
       - name: release

.github/workflows/robustness-nightly.yaml

@@ -27,7 +27,7 @@ jobs:
       count: 80
       testTimeout: 200m
       artifactName: main-arm64
-      runs-on: "['actuated-arm64-8cpu-8gb']"
+      runs-on: "['actuated-arm64-8cpu-32gb']"
   release-35:
     uses: ./.github/workflows/robustness-template.yaml
     with:
@@ -43,7 +43,7 @@ jobs:
       count: 100
       testTimeout: 200m
       artifactName: release-35-arm64
-      runs-on: "['actuated-arm64-8cpu-8gb']"
+      runs-on: "['actuated-arm64-8cpu-32gb']"
   release-34:
     uses: ./.github/workflows/robustness-template.yaml
     with:

.github/workflows/robustness-template.yaml

@@ -27,10 +27,12 @@ jobs:
     timeout-minutes: 210
     runs-on: ${{ fromJson(inputs.runs-on) }}
     steps:
+      - name: Collect Workflow Telemetry
+        uses: catchpoint/workflow-telemetry-action@v1
       - 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
+      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
       - name: test-robustness

.github/workflows/robustness.yaml

@@ -18,4 +18,4 @@ jobs:
       count: 12
       testTimeout: 30m
       artifactName: main-arm64
-      runs-on: "['actuated-arm64-8cpu-8gb']"
+      runs-on: "['actuated-arm64-8cpu-32gb']"

.github/workflows/scorecards.yml

@@ -50,6 +50,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
+        uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
         with:
           sarif_file: results.sarif

.github/workflows/static-analysis.yaml

@@ -9,7 +9,7 @@ jobs:
       - 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
+      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
       - id: golangci_lint_version

.github/workflows/tests-template.yaml

@@ -26,10 +26,12 @@ jobs:
           - linux-${{ inputs.arch }}-unit-4-cpu
           - linux-386-unit-1-cpu
     steps:
+      - name: Collect Workflow Telemetry
+        uses: catchpoint/workflow-telemetry-action@v1
       - 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
+      - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           go-version: ${{ steps.goversion.outputs.goversion }}
       - env:

.github/workflows/tests.yaml

@@ -12,4 +12,4 @@ jobs:
     uses: ./.github/workflows/tests-template.yaml
     with:
       arch: arm64
-      runs-on: actuated-arm64-8cpu-8gb
+      runs-on: actuated-arm64-8cpu-32gb

CHANGELOG/CHANGELOG-3.4.md

@@ -4,10 +4,6 @@ Previous change logs can be found at [CHANGELOG-3.3](https://github.com/etcd-io/
 
 ## v3.4.29 (tbd)
 
-### etcd server
-- [Disable following HTTP redirects in peer communication](https://github.com/etcd-io/etcd/pull/17112)
-- [Add livez/readyz HTTP endpoints](https://github.com/etcd-io/etcd/pull/17128)
-
 ### Dependencies
 - Compile binaries using go [1.20.12](https://github.com/etcd-io/etcd/pull/17076).
 

CHANGELOG/CHANGELOG-3.5.md

@@ -4,11 +4,6 @@ Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/
 
 <hr>
 
-## v3.5.12 (tbd)
-
-### etcd server
-- [Add livez/readyz HTTP endpoints](https://github.com/etcd-io/etcd/pull/17039)
-
 ## v3.5.11 (2023-12-07)
 
 ### etcd server

Dockerfile

@@ -1,5 +1,5 @@
 ARG ARCH=amd64
-FROM --platform=linux/${ARCH} gcr.io/distroless/static-debian12@sha256:4a2c1a51ae5e10ec4758a0f981be3ce5d6ac55445828463fce8dff3a355e0b75
+FROM --platform=linux/${ARCH} gcr.io/distroless/static-debian12
 
 ADD etcd /usr/local/bin/
 ADD etcdctl /usr/local/bin/

OWNERS

@@ -4,6 +4,7 @@ approvers:
   - ahrtr           # Benjamin Wang <wachao@vmware.com> <benjamin.ahrtr@gmail.com>
   - mitake          # Hitoshi Mitake <h.mitake@gmail.com>
   - serathius       # Marek Siarkowicz <siarkowicz@google.com> <marek.siarkowicz@gmail.com>
+  - ptabor          # Piotr Tabor <piotr.tabor@gmail.com>
   - spzala          # Sahdev Zala <spzala@us.ibm.com>
   - wenjiaswe       # Wenjia Zhang <wenjiazhang@google.com> <wenjia.swe@gmail.com>
 reviewers:

README.md

@@ -9,7 +9,6 @@
 [![Releases](https://img.shields.io/github/release/etcd-io/etcd/all.svg?style=flat-square)](https://github.com/etcd-io/etcd/releases)
 [![LICENSE](https://img.shields.io/github/license/etcd-io/etcd.svg?style=flat-square)](https://github.com/etcd-io/etcd/blob/main/LICENSE)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/etcd-io/etcd/badge)](https://api.securityscorecards.dev/projects/github.com/etcd-io/etcd)
-<a href="https://actuated.dev/"><img alt="Arm CI sponsored by Actuated" src="https://docs.actuated.dev/images/actuated-badge.png" width="120px"></img></a>
 
 **Note**: The `main` branch may be in an *unstable or even broken state* during development. For stable versions, see [releases][github-release].
 
@@ -191,7 +190,6 @@ These emeritus maintainers dedicated a part of their career to etcd and reviewed
 * Xiang Li
 * Ben Darnell
 * Sam Batschelet
-* Piotr Tabor
 
 ### License
 

client/v3/lease.go

@@ -549,12 +549,9 @@ func (l *lessor) recvKeepAlive(resp *pb.LeaseKeepAliveResponse) {
 // deadlineLoop reaps any keep alive channels that have not received a response
 // within the lease TTL
 func (l *lessor) deadlineLoop() {
-	timer := time.NewTimer(time.Second)
-	defer timer.Stop()
 	for {
-		timer.Reset(time.Second)
 		select {
-		case <-timer.C:
+		case <-time.After(time.Second):
 		case <-l.donec:
 			return
 		}

contrib/README.md

@@ -2,8 +2,6 @@
 
 Scripts and files which may be useful but aren't part of the core etcd project.
 
-* [lock](lock) - example addressing the expired lease problem of distributed locking with etcd
-* [mixin](mixin) - customisable set of Grafana dashboard and Prometheus alerts for etcd
-* [raftexample](raftexample) - an example distributed key-value store using raft
 * [systemd](systemd) - an example unit file for deploying etcd on systemd-based distributions
+* [raftexample](raftexample) - an example distributed key-value store using raft
 * [systemd/etcd3-multinode](systemd/etcd3-multinode) - multi-node cluster setup with systemd

server/etcdserver/bootstrap.go

@@ -90,22 +90,18 @@ func bootstrap(cfg config.ServerConfig) (b *bootstrappedServer, err error) {
 		bwal = bootstrapWALFromSnapshot(cfg, backend.snapshot)
 	}
 
-	cfg.Logger.Info("bootstrapping cluster")
 	cluster, err := bootstrapCluster(cfg, bwal, prt)
 	if err != nil {
 		backend.Close()
 		return nil, err
 	}
 
-	cfg.Logger.Info("bootstrapping storage")
 	s := bootstrapStorage(cfg, st, backend, bwal, cluster)
 
 	if err = cluster.Finalize(cfg, s); err != nil {
 		backend.Close()
 		return nil, err
 	}
-
-	cfg.Logger.Info("bootstrapping raft")
 	raft := bootstrapRaft(cfg, cluster, s.wal)
 	return &bootstrappedServer{
 		prt:     prt,

server/etcdserver/server.go

@@ -298,10 +298,8 @@ type EtcdServer struct {
 func NewServer(cfg config.ServerConfig) (srv *EtcdServer, err error) {
 	b, err := bootstrap(cfg)
 	if err != nil {
-		cfg.Logger.Error("bootstrap failed", zap.Error(err))
 		return nil, err
 	}
-	cfg.Logger.Info("bootstrap successfully")
 
 	defer func() {
 		if err != nil {
@@ -394,15 +392,8 @@ func NewServer(cfg config.ServerConfig) (srv *EtcdServer, err error) {
 
 	if srv.Cfg.EnableLeaseCheckpoint {
 		// setting checkpointer enables lease checkpoint feature.
-		srv.lessor.SetCheckpointer(func(ctx context.Context, cp *pb.LeaseCheckpointRequest) error {
-			if !srv.ensureLeadership() {
-				srv.lg.Warn("Ignore the checkpoint request because current member isn't a leader",
-					zap.Uint64("local-member-id", uint64(srv.MemberId())))
-				return lease.ErrNotPrimary
-			}
-
+		srv.lessor.SetCheckpointer(func(ctx context.Context, cp *pb.LeaseCheckpointRequest) {
 			srv.raftRequestOnce(ctx, pb.InternalRaftRequest{LeaseCheckpoint: cp})
-			return nil
 		})
 	}
 
@@ -851,19 +842,7 @@ func (s *EtcdServer) run() {
 
 func (s *EtcdServer) revokeExpiredLeases(leases []*lease.Lease) {
 	s.GoAttach(func() {
-		// We shouldn't revoke any leases if current member isn't a leader,
-		// because the operation should only be performed by the leader. When
-		// the leader gets blocked on the raft loop, such as writing WAL entries,
-		// it can't process any events or messages from raft. It may think it
-		// is still the leader even the leader has already changed.
-		// Refer to https://github.com/etcd-io/etcd/issues/15247
 		lg := s.Logger()
-		if !s.ensureLeadership() {
-			lg.Warn("Ignore the lease revoking request because current member isn't a leader",
-				zap.Uint64("local-member-id", uint64(s.MemberId())))
-			return
-		}
-
 		// Increases throughput of expired leases deletion process through parallelization
 		c := make(chan struct{}, maxPendingRevokes)
 		for _, curLease := range leases {
@@ -896,29 +875,6 @@ func (s *EtcdServer) revokeExpiredLeases(leases []*lease.Lease) {
 	})
 }
 
-// ensureLeadership checks whether current member is still the leader.
-func (s *EtcdServer) ensureLeadership() bool {
-	lg := s.Logger()
-
-	ctx, cancel := context.WithTimeout(s.ctx, s.Cfg.ReqTimeout())
-	defer cancel()
-	if err := s.linearizableReadNotify(ctx); err != nil {
-		lg.Warn("Failed to check current member's leadership",
-			zap.Error(err))
-		return false
-	}
-
-	newLeaderId := s.raftStatus().Lead
-	if newLeaderId != uint64(s.MemberId()) {
-		lg.Warn("Current member isn't a leader",
-			zap.Uint64("local-member-id", uint64(s.MemberId())),
-			zap.Uint64("new-lead", newLeaderId))
-		return false
-	}
-
-	return true
-}
-
 // Cleanup removes allocated objects by EtcdServer.NewServer in
 // situation that EtcdServer::Start was not called (that takes care of cleanup).
 func (s *EtcdServer) Cleanup() {
@@ -2019,9 +1975,7 @@ func removeNeedlessRangeReqs(txn *pb.TxnRequest) {
 // applyConfChange applies a ConfChange to the server. It is only
 // invoked with a ConfChange that has already passed through Raft
 func (s *EtcdServer) applyConfChange(cc raftpb.ConfChange, confState *raftpb.ConfState, shouldApplyV3 membership.ShouldApplyV3) (bool, error) {
-	lg := s.Logger()
 	if err := s.cluster.ValidateConfigurationChange(cc); err != nil {
-		lg.Error("Validation on configuration change failed", zap.Bool("shouldApplyV3", bool(shouldApplyV3)), zap.Error(err))
 		cc.NodeID = raft.None
 		s.r.ApplyConfChange(cc)
 
@@ -2034,6 +1988,7 @@ func (s *EtcdServer) applyConfChange(cc raftpb.ConfChange, confState *raftpb.Con
 		return false, err
 	}
 
+	lg := s.Logger()
 	*confState = *s.r.ApplyConfChange(cc)
 	s.beHooks.SetConfState(confState)
 	switch cc.Type {

server/etcdserver/v3_server.go

@@ -278,16 +278,6 @@ func (s *EtcdServer) LeaseRevoke(ctx context.Context, r *pb.LeaseRevokeRequest)
 
 func (s *EtcdServer) LeaseRenew(ctx context.Context, id lease.LeaseID) (int64, error) {
 	if s.isLeader() {
-		// If s.isLeader() returns true, but we fail to ensure the current
-		// member's leadership, there are a couple of possibilities:
-		//   1. current member gets stuck on writing WAL entries;
-		//   2. current member is in network isolation status;
-		//   3. current member isn't a leader anymore (possibly due to #1 above).
-		// In such case, we just return error to client, so that the client can
-		// switch to another member to continue the lease keep-alive operation.
-		if !s.ensureLeadership() {
-			return -1, lease.ErrNotPrimary
-		}
 		if err := s.waitAppliedIndex(); err != nil {
 			return 0, err
 		}

server/lease/lessor.go

@@ -75,7 +75,7 @@ type RangeDeleter func() TxnDelete
 
 // Checkpointer permits checkpointing of lease remaining TTLs to the consensus log. Defined here to
 // avoid circular dependency with mvcc.
-type Checkpointer func(ctx context.Context, lc *pb.LeaseCheckpointRequest) error
+type Checkpointer func(ctx context.Context, lc *pb.LeaseCheckpointRequest)
 
 type LeaseID int64
 
@@ -422,9 +422,7 @@ func (le *lessor) Renew(id LeaseID) (int64, error) {
 	// By applying a RAFT entry only when the remainingTTL is already set, we limit the number
 	// of RAFT entries written per lease to a max of 2 per checkpoint interval.
 	if clearRemainingTTL {
-		if err := le.cp(context.Background(), &pb.LeaseCheckpointRequest{Checkpoints: []*pb.LeaseCheckpoint{{ID: int64(l.ID), Remaining_TTL: 0}}}); err != nil {
-			return -1, err
-		}
+		le.cp(context.Background(), &pb.LeaseCheckpointRequest{Checkpoints: []*pb.LeaseCheckpoint{{ID: int64(l.ID), Remaining_TTL: 0}}})
 	}
 
 	le.mu.Lock()
@@ -658,9 +656,7 @@ func (le *lessor) checkpointScheduledLeases() {
 		le.mu.Unlock()
 
 		if len(cps) != 0 {
-			if err := le.cp(context.Background(), &pb.LeaseCheckpointRequest{Checkpoints: cps}); err != nil {
-				return
-			}
+			le.cp(context.Background(), &pb.LeaseCheckpointRequest{Checkpoints: cps})
 		}
 		if len(cps) < maxLeaseCheckpointBatchSize {
 			return

server/lease/lessor_test.go

@@ -269,11 +269,10 @@ func TestLessorRenewWithCheckpointer(t *testing.T) {
 	defer os.RemoveAll(dir)
 
 	le := newLessor(lg, be, clusterLatest(), LessorConfig{MinLeaseTTL: minLeaseTTL})
-	fakerCheckerpointer := func(ctx context.Context, cp *pb.LeaseCheckpointRequest) error {
+	fakerCheckerpointer := func(ctx context.Context, cp *pb.LeaseCheckpointRequest) {
 		for _, cp := range cp.GetCheckpoints() {
 			le.Checkpoint(LeaseID(cp.GetID()), cp.GetRemaining_TTL())
 		}
-		return nil
 	}
 	defer le.Stop()
 	// Set checkpointer
@@ -557,7 +556,7 @@ func TestLessorCheckpointScheduling(t *testing.T) {
 	defer le.Stop()
 	le.minLeaseTTL = 1
 	checkpointedC := make(chan struct{})
-	le.SetCheckpointer(func(ctx context.Context, lc *pb.LeaseCheckpointRequest) error {
+	le.SetCheckpointer(func(ctx context.Context, lc *pb.LeaseCheckpointRequest) {
 		close(checkpointedC)
 		if len(lc.Checkpoints) != 1 {
 			t.Errorf("expected 1 checkpoint but got %d", len(lc.Checkpoints))
@@ -566,7 +565,6 @@ func TestLessorCheckpointScheduling(t *testing.T) {
 		if c.Remaining_TTL != 1 {
 			t.Errorf("expected checkpoint to be called with Remaining_TTL=%d but got %d", 1, c.Remaining_TTL)
 		}
-		return nil
 	})
 	_, err := le.Grant(1, 2)
 	if err != nil {

tests/e2e/corrupt_test.go

@@ -218,10 +218,15 @@ func TestPeriodicCheckDetectsCorruption(t *testing.T) {
 		assert.NoError(t, err, "error on put")
 	}
 
-	memberID, found, err := getMemberIdByName(ctx, cc, epc.Procs[0].Config().Name)
+	members, err := cc.MemberList(ctx, false)
 	assert.NoError(t, err, "error on member list")
-	assert.Equal(t, found, true, "member not found")
-
+	var memberID uint64
+	for _, m := range members.Members {
+		if m.Name == epc.Procs[0].Config().Name {
+			memberID = m.ID
+		}
+	}
+	assert.NotZero(t, memberID, "member not found")
 	epc.Procs[0].Stop()
 	err = testutil.CorruptBBolt(datadir.ToBackendFileName(epc.Procs[0].Config().DataDirPath))
 	assert.NoError(t, err)
@@ -258,9 +263,14 @@ func TestCompactHashCheckDetectCorruption(t *testing.T) {
 		err = cc.Put(ctx, testutil.PickKey(int64(i)), fmt.Sprint(i), config.PutOptions{})
 		assert.NoError(t, err, "error on put")
 	}
-	memberID, found, err := getMemberIdByName(ctx, cc, epc.Procs[0].Config().Name)
+	members, err := cc.MemberList(ctx, false)
 	assert.NoError(t, err, "error on member list")
-	assert.Equal(t, found, true, "member not found")
+	var memberID uint64
+	for _, m := range members.Members {
+		if m.Name == epc.Procs[0].Config().Name {
+			memberID = m.ID
+		}
+	}
 
 	epc.Procs[0].Stop()
 	err = testutil.CorruptBBolt(datadir.ToBackendFileName(epc.Procs[0].Config().DataDirPath))

tests/e2e/ctl_v3_member_no_proxy_test.go

@@ -1,99 +0,0 @@
-// Copyright 2023 The etcd Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//go:build !cluster_proxy
-
-package e2e
-
-import (
-	"context"
-	"math/rand"
-	"os"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"go.etcd.io/etcd/server/v3/etcdserver"
-	"go.etcd.io/etcd/tests/v3/framework/e2e"
-	"go.etcd.io/etcd/tests/v3/framework/testutils"
-)
-
-func TestMemberReplace(t *testing.T) {
-	e2e.BeforeTest(t)
-	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
-	defer cancel()
-
-	epc, err := e2e.NewEtcdProcessCluster(ctx, t)
-	require.NoError(t, err)
-	defer epc.Close()
-
-	memberIdx := rand.Int() % len(epc.Procs)
-	member := epc.Procs[memberIdx]
-	memberName := member.Config().Name
-	var endpoints []string
-	for i := 1; i < len(epc.Procs); i++ {
-		endpoints = append(endpoints, epc.Procs[(memberIdx+i)%len(epc.Procs)].EndpointsGRPC()...)
-	}
-	cc, err := e2e.NewEtcdctl(epc.Cfg.Client, endpoints)
-	require.NoError(t, err)
-
-	memberID, found, err := getMemberIdByName(ctx, cc, memberName)
-	require.NoError(t, err)
-	require.Equal(t, found, true, "Member not found")
-
-	// Need to wait health interval for cluster to accept member changes
-	time.Sleep(etcdserver.HealthInterval)
-
-	t.Logf("Removing member %s", memberName)
-	_, err = cc.MemberRemove(ctx, memberID)
-	require.NoError(t, err)
-	_, found, err = getMemberIdByName(ctx, cc, memberName)
-	require.NoError(t, err)
-	require.Equal(t, found, false, "Expected member to be removed")
-	for member.IsRunning() {
-		err = member.Wait(ctx)
-		if err != nil && !strings.Contains(err.Error(), "unexpected exit code") {
-			t.Fatalf("member didn't exit as expected: %v", err)
-		}
-	}
-
-	t.Logf("Removing member %s data", memberName)
-	err = os.RemoveAll(member.Config().DataDirPath)
-	require.NoError(t, err)
-
-	t.Logf("Adding member %s back", memberName)
-	removedMemberPeerUrl := member.Config().PeerURL.String()
-	_, err = cc.MemberAdd(ctx, memberName, []string{removedMemberPeerUrl})
-	require.NoError(t, err)
-	err = patchArgs(member.Config().Args, "initial-cluster-state", "existing")
-	require.NoError(t, err)
-
-	// Sleep 100ms to bypass the known issue https://github.com/etcd-io/etcd/issues/16687.
-	time.Sleep(100 * time.Millisecond)
-	t.Logf("Starting member %s", memberName)
-	err = member.Start(ctx)
-	require.NoError(t, err)
-	testutils.ExecuteUntil(ctx, t, func() {
-		for {
-			_, found, err := getMemberIdByName(ctx, cc, memberName)
-			if err != nil || !found {
-				time.Sleep(10 * time.Millisecond)
-				continue
-			}
-			break
-		}
-	})
-}

tests/e2e/utils.go

@@ -122,26 +122,3 @@ func runCommandAndReadJsonOutput(args []string) (map[string]any, error) {
 
 	return resp, nil
 }
-
-func getMemberIdByName(ctx context.Context, c *e2e.EtcdctlV3, name string) (id uint64, found bool, err error) {
-	resp, err := c.MemberList(ctx, false)
-	if err != nil {
-		return 0, false, err
-	}
-	for _, member := range resp.Members {
-		if name == member.Name {
-			return member.ID, true, nil
-		}
-	}
-	return 0, false, nil
-}
-
-func patchArgs(args []string, flag, newValue string) error {
-	for i, arg := range args {
-		if strings.Contains(arg, flag) {
-			args[i] = fmt.Sprintf("--%s=%s", flag, newValue)
-			return nil
-		}
-	}
-	return fmt.Errorf("--%s flag not found", flag)
-}

tests/e2e/v3_lease_no_proxy_test.go

@@ -1,157 +0,0 @@
-// Copyright 2023 The etcd Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//go:build !cluster_proxy
-
-package e2e
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	clientv3 "go.etcd.io/etcd/client/v3"
-	"go.etcd.io/etcd/tests/v3/framework/e2e"
-	"go.etcd.io/etcd/tests/v3/framework/testutils"
-)
-
-// TestLeaseRevoke_IgnoreOldLeader verifies that leases shouldn't be revoked
-// by old leader.
-// See the case 1 in https://github.com/etcd-io/etcd/issues/15247#issuecomment-1777862093.
-func TestLeaseRevoke_IgnoreOldLeader(t *testing.T) {
-	testLeaseRevokeIssue(t, true)
-}
-
-// TestLeaseRevoke_ClientSwitchToOtherMember verifies that leases shouldn't
-// be revoked by new leader.
-// See the case 2 in https://github.com/etcd-io/etcd/issues/15247#issuecomment-1777862093.
-func TestLeaseRevoke_ClientSwitchToOtherMember(t *testing.T) {
-	testLeaseRevokeIssue(t, false)
-}
-
-func testLeaseRevokeIssue(t *testing.T, connectToOneFollower bool) {
-	e2e.BeforeTest(t)
-
-	ctx := context.Background()
-
-	t.Log("Starting a new etcd cluster")
-	epc, err := e2e.NewEtcdProcessCluster(ctx, t,
-		e2e.WithClusterSize(3),
-		e2e.WithGoFailEnabled(true),
-		e2e.WithGoFailClientTimeout(40*time.Second),
-	)
-	require.NoError(t, err)
-	defer func() {
-		if errC := epc.Close(); errC != nil {
-			t.Fatalf("error closing etcd processes (%v)", errC)
-		}
-	}()
-
-	leaderIdx := epc.WaitLeader(t)
-	t.Logf("Leader index: %d", leaderIdx)
-
-	epsForNormalOperations := epc.Procs[(leaderIdx+2)%3].EndpointsGRPC()
-	t.Logf("Creating a client for normal operations: %v", epsForNormalOperations)
-	client, err := clientv3.New(clientv3.Config{Endpoints: epsForNormalOperations, DialTimeout: 3 * time.Second})
-	require.NoError(t, err)
-	defer client.Close()
-
-	var epsForLeaseKeepAlive []string
-	if connectToOneFollower {
-		epsForLeaseKeepAlive = epc.Procs[(leaderIdx+1)%3].EndpointsGRPC()
-	} else {
-		epsForLeaseKeepAlive = epc.EndpointsGRPC()
-	}
-	t.Logf("Creating a client for the leaseKeepAlive operation: %v", epsForLeaseKeepAlive)
-	clientForKeepAlive, err := clientv3.New(clientv3.Config{Endpoints: epsForLeaseKeepAlive, DialTimeout: 3 * time.Second})
-	require.NoError(t, err)
-	defer clientForKeepAlive.Close()
-
-	resp, err := client.Status(ctx, epsForNormalOperations[0])
-	require.NoError(t, err)
-	oldLeaderId := resp.Leader
-
-	t.Log("Creating a new lease")
-	leaseRsp, err := client.Grant(ctx, 20)
-	require.NoError(t, err)
-
-	t.Log("Starting a goroutine to keep alive the lease")
-	doneC := make(chan struct{})
-	stopC := make(chan struct{})
-	startC := make(chan struct{}, 1)
-	go func() {
-		defer close(doneC)
-
-		respC, kerr := clientForKeepAlive.KeepAlive(ctx, leaseRsp.ID)
-		require.NoError(t, kerr)
-		// ensure we have received the first response from the server
-		<-respC
-		startC <- struct{}{}
-
-		for {
-			select {
-			case <-stopC:
-				return
-			case <-respC:
-			}
-		}
-	}()
-
-	t.Log("Wait for the keepAlive goroutine to get started")
-	<-startC
-
-	t.Log("Trigger the failpoint to simulate stalled writing")
-	err = epc.Procs[leaderIdx].Failpoints().SetupHTTP(ctx, "raftBeforeSave", `sleep("30s")`)
-	require.NoError(t, err)
-
-	cctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	t.Logf("Waiting for a new leader to be elected, old leader index: %d, old leader ID: %d", leaderIdx, oldLeaderId)
-	testutils.ExecuteUntil(cctx, t, func() {
-		for {
-			resp, err = client.Status(ctx, epsForNormalOperations[0])
-			if err == nil && resp.Leader != oldLeaderId {
-				t.Logf("A new leader has already been elected, new leader index: %d", resp.Leader)
-				return
-			}
-			time.Sleep(100 * time.Millisecond)
-		}
-	})
-	cancel()
-
-	t.Log("Writing a key/value pair")
-	_, err = client.Put(ctx, "foo", "bar")
-	require.NoError(t, err)
-
-	t.Log("Sleeping 30 seconds")
-	time.Sleep(30 * time.Second)
-
-	t.Log("Remove the failpoint 'raftBeforeSave'")
-	err = epc.Procs[leaderIdx].Failpoints().DeactivateHTTP(ctx, "raftBeforeSave")
-	require.NoError(t, err)
-
-	// By default, etcd tries to revoke leases every 7 seconds.
-	t.Log("Sleeping 10 seconds")
-	time.Sleep(10 * time.Second)
-
-	t.Log("Confirming the lease isn't revoked")
-	leases, err := client.Leases(ctx)
-	require.NoError(t, err)
-	require.Equal(t, 1, len(leases.Leases))
-
-	t.Log("Waiting for the keepAlive goroutine to exit")
-	close(stopC)
-	<-doneC
-}

tests/framework/testutils/log_observer.go

@@ -79,10 +79,13 @@ func (logOb *LogObserver) ExpectFunc(ctx context.Context, filter func(string) bo
 			}
 
 			if len(res) >= count {
-				return res, nil
+				break
 			}
 		}
 
+		if len(res) >= count {
+			return res, nil
+		}
 		time.Sleep(10 * time.Millisecond)
 	}
 }

tests/integration/clientv3/watch_test.go

@@ -350,9 +350,7 @@ func putAndWatch(t *testing.T, wctx *watchctx, key, val string) {
 	}
 }
 
-// TestWatchResumeAfterDisconnect tests watch resume after member disconnects then connects.
-// It ensures that correct events are returned corresponding to the start revision.
-func TestWatchResumeAfterDisconnect(t *testing.T) {
+func TestWatchResumeInitRev(t *testing.T) {
 	integration2.BeforeTest(t)
 	clus := integration2.NewCluster(t, &integration2.ClusterConfig{Size: 1, UseBridge: true})
 	defer clus.Terminate(t)
@@ -369,10 +367,7 @@ func TestWatchResumeAfterDisconnect(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	// watch from revision 1
 	wch := clus.Client(0).Watch(context.Background(), "a", clientv3.WithRev(1), clientv3.WithCreatedNotify())
-	// response for the create watch request, no events are in this response
-	// the current revision of etcd should be 4
 	if resp, ok := <-wch; !ok || resp.Header.Revision != 4 {
 		t.Fatalf("got (%v, %v), expected create notification rev=4", resp, ok)
 	}
@@ -394,16 +389,12 @@ func TestWatchResumeAfterDisconnect(t *testing.T) {
 		if !ok {
 			t.Fatal("unexpected watch close")
 		}
-		// Events should be put(a, 3) and put(a, 4)
-		if len(resp.Events) != 2 {
-			t.Fatal("expected two events on watch")
+		if len(resp.Events) == 0 {
+			t.Fatal("expected event on watch")
 		}
 		if string(resp.Events[0].Kv.Value) != "3" {
 			t.Fatalf("expected value=3, got event %+v", resp.Events[0])
 		}
-		if string(resp.Events[1].Kv.Value) != "4" {
-			t.Fatalf("expected value=4, got event %+v", resp.Events[1])
-		}
 	case <-time.After(5 * time.Second):
 		t.Fatal("watch timed out")
 	}

tests/integration/v3_lease_test.go

@@ -747,7 +747,7 @@ func TestV3LeaseFailover(t *testing.T) {
 
 	// send keep alive to old leader until the old leader starts
 	// to drop lease request.
-	expectedExp := time.Now().Add(5 * time.Second)
+	var expectedExp time.Time
 	for {
 		if err = lac.Send(lreq); err != nil {
 			break

tests/robustness/makefile.mk

@@ -52,7 +52,7 @@ gofail-disable: install-gofail
 
 .PHONY: install-gofail
 install-gofail:
-	go install go.etcd.io/gofail@${GOFAIL_VERSION}
+	cd tools/mod; go install go.etcd.io/gofail@${GOFAIL_VERSION}
 
 # Build previous releases for robustness tests
 

tests/robustness/traffic/kubernetes.go

@@ -155,7 +155,7 @@ func (t kubernetesTraffic) Write(ctx context.Context, kc *kubernetesClient, ids
 		} else {
 			choices := t.writeChoices
 			if !nonUniqueWriteLimiter.Take() {
-				choices = filterOutNonUniqueKubernetesWrites(t.writeChoices)
+				choices = filterOutNonUniqueKuberntesWrites(t.writeChoices)
 			}
 			op := pickRandom(choices)
 			switch op {
@@ -178,7 +178,7 @@ func (t kubernetesTraffic) Write(ctx context.Context, kc *kubernetesClient, ids
 	return nil
 }
 
-func filterOutNonUniqueKubernetesWrites(choices []choiceWeight[KubernetesRequestType]) (resp []choiceWeight[KubernetesRequestType]) {
+func filterOutNonUniqueKuberntesWrites(choices []choiceWeight[KubernetesRequestType]) (resp []choiceWeight[KubernetesRequestType]) {
 	for _, choice := range choices {
 		if choice.choice != KubernetesDelete {
 			resp = append(resp, choice)