Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package etcd for openSUSE:Factory checked in 
at 2026-11-19 16:55:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/etcd (Old)
 and      /work/SRC/openSUSE:Factory/.etcd.new.1251 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "etcd"

Thu Nov 19 16:55:46 2026 rev:64 rq:1398579 version:3.7.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/etcd/etcd.changes        2026-10-23 
20:30:35.445350802 +0200
+++ /work/SRC/openSUSE:Factory/.etcd.new.1251/etcd.changes      2026-11-19 
16:56:46.826018611 +0100
@@ -1,0 +2,9 @@
+Thu Nov 19 07:20:43 UTC 2026 - Elisei Roca <[email protected]>
+
+- Update to version 3.7.4:
+  * dependency: bump golang.org/x/net from v0.61.0 to v0.62.0
+  * etcdserver: drop expected legacy v2 WAL requests instead of replaying them
+  * Define alarmStore as an atomic pointer to avoid race condition
+  * prevent the adjusted commit-index from exceeding the last index on 
force-new-cluster (#22655)
+
+-------------------------------------------------------------------
@@ -55,3 +64 @@
-  * version: bump up to 3.6.13
-  * Reject the client request if the client certificate has been
-    revoked
+  * Reject the client request if the client certificate has been revoked
@@ -62,2 +68,0 @@
-  * build(deps): bump distroless/static-debian12 from `20bc6c0`
-    to `9c346e4`
@@ -65 +69,0 @@
-  * Update Go to 1.25.11
@@ -76 +79,0 @@
-  * Bump Go to 1.25.10
@@ -87 +90,5 @@
-  * *: bump go to 1.25.9
+
+-------------------------------------------------------------------
+Mon Apr  6 06:02:39 UTC 2026 - Priyanka Saggu <[email protected]>
+
+- v3.6.10 includes fixes for CVE-2026-33186 (bsc#1260275), CVE-2026-33343 
(bsc#1260845), and CVE-2026-33413 (bsc#1260850)

Old:
----
  etcd-3.7.3.tar.gz

New:
----
  etcd-3.7.4.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ etcd.spec ++++++
--- /var/tmp/diff_new_pack.cJmXyh/_old  2026-11-19 16:56:48.561092157 +0100
+++ /var/tmp/diff_new_pack.cJmXyh/_new  2026-11-19 16:56:48.562092199 +0100
@@ -23,7 +23,7 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           etcd
-Version:        3.7.3
+Version:        3.7.4
 Release:        0
 Summary:        Reliable key-value store for the most critical data of a 
distributed system
 License:        Apache-2.0

++++++ _service ++++++
--- /var/tmp/diff_new_pack.cJmXyh/_old  2026-11-19 16:56:48.643095633 +0100
+++ /var/tmp/diff_new_pack.cJmXyh/_new  2026-11-19 16:56:48.650095929 +0100
@@ -5,7 +5,7 @@
     <param name="exclude">.git</param>
     <param name="exclude">go.work</param>
     <param name="exclude">go.work.sum</param>
-    <param name="revision">v3.7.3</param>
+    <param name="revision">v3.7.4</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="changesgenerate">enable</param>
     <param name="versionrewrite-pattern">v(.*)</param>

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.cJmXyh/_old  2026-11-19 16:56:48.683097328 +0100
+++ /var/tmp/diff_new_pack.cJmXyh/_new  2026-11-19 16:56:48.688097540 +0100
@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/etcd-io/etcd.git</param>
-              <param 
name="changesrevision">0a173d0410a96d01091b484daae81365bbcde57e</param></service></servicedata>
+              <param 
name="changesrevision">2e8a5c99e4982c8d4c521be15364ea4c5c68a489</param></service></servicedata>
 (No newline at EOF)
 

++++++ etcd-3.7.3.tar.gz -> etcd-3.7.4.tar.gz ++++++
/work/SRC/openSUSE:Factory/etcd/etcd-3.7.3.tar.gz 
/work/SRC/openSUSE:Factory/.etcd.new.1251/etcd-3.7.4.tar.gz differ: char 12, 
line 1

++++++ vendor-etcdctl.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vendor/go.etcd.io/etcd/api/v3/version/version.go 
new/vendor/go.etcd.io/etcd/api/v3/version/version.go
--- old/vendor/go.etcd.io/etcd/api/v3/version/version.go        2026-10-23 
01:01:34.000000000 +0200
+++ new/vendor/go.etcd.io/etcd/api/v3/version/version.go        2026-11-19 
00:39:15.000000000 +0100
@@ -26,7 +26,7 @@
 var (
        // MinClusterVersion is the min cluster version this etcd binary is 
compatible with.
        MinClusterVersion = "3.0.0"
-       Version           = "3.7.3"
+       Version           = "3.7.4"
        APIVersion        = "unknown"
 
        // Git SHA Value will be set during build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt
--- old/vendor/modules.txt      2026-10-23 01:01:34.000000000 +0200
+++ new/vendor/modules.txt      2026-11-19 00:39:15.000000000 +0100
@@ -83,7 +83,7 @@
 github.com/stretchr/testify/assert
 github.com/stretchr/testify/assert/yaml
 github.com/stretchr/testify/require
-# go.etcd.io/etcd/api/v3 v3.7.3 => ../api
+# go.etcd.io/etcd/api/v3 v3.7.4 => ../api
 ## explicit; go 1.26.0
 go.etcd.io/etcd/api/v3/authpb
 go.etcd.io/etcd/api/v3/etcdserverpb
@@ -92,7 +92,7 @@
 go.etcd.io/etcd/api/v3/v3rpc/rpctypes
 go.etcd.io/etcd/api/v3/version
 go.etcd.io/etcd/api/v3/versionpb
-# go.etcd.io/etcd/client/pkg/v3 v3.7.3 => ../client/pkg
+# go.etcd.io/etcd/client/pkg/v3 v3.7.4 => ../client/pkg
 ## explicit; go 1.26.0
 go.etcd.io/etcd/client/pkg/v3/fileutil
 go.etcd.io/etcd/client/pkg/v3/logutil
@@ -102,7 +102,7 @@
 go.etcd.io/etcd/client/pkg/v3/transport
 go.etcd.io/etcd/client/pkg/v3/types
 go.etcd.io/etcd/client/pkg/v3/verify
-# go.etcd.io/etcd/client/v3 v3.7.3 => ../client/v3
+# go.etcd.io/etcd/client/v3 v3.7.4 => ../client/v3
 ## explicit; go 1.26.0
 go.etcd.io/etcd/client/v3
 go.etcd.io/etcd/client/v3/concurrency
@@ -111,7 +111,7 @@
 go.etcd.io/etcd/client/v3/internal/resolver
 go.etcd.io/etcd/client/v3/mirror
 go.etcd.io/etcd/client/v3/snapshot
-# go.etcd.io/etcd/pkg/v3 v3.7.3 => ../pkg
+# go.etcd.io/etcd/pkg/v3 v3.7.4 => ../pkg
 ## explicit; go 1.26.0
 go.etcd.io/etcd/pkg/v3/cobrautl
 go.etcd.io/etcd/pkg/v3/flags
@@ -131,7 +131,7 @@
 go.uber.org/zap/internal/stacktrace
 go.uber.org/zap/zapcore
 go.uber.org/zap/zapgrpc
-# golang.org/x/net v0.61.0
+# golang.org/x/net v0.62.0
 ## explicit; go 1.26.0
 golang.org/x/net/http/httpguts
 golang.org/x/net/http2

++++++ vendor-etcdutl.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vendor/go.etcd.io/etcd/api/v3/version/version.go 
new/vendor/go.etcd.io/etcd/api/v3/version/version.go
--- old/vendor/go.etcd.io/etcd/api/v3/version/version.go        2026-10-23 
01:01:34.000000000 +0200
+++ new/vendor/go.etcd.io/etcd/api/v3/version/version.go        2026-11-19 
00:39:15.000000000 +0100
@@ -26,7 +26,7 @@
 var (
        // MinClusterVersion is the min cluster version this etcd binary is 
compatible with.
        MinClusterVersion = "3.0.0"
-       Version           = "3.7.3"
+       Version           = "3.7.4"
        APIVersion        = "unknown"
 
        // Git SHA Value will be set during build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/go.etcd.io/etcd/server/v3/etcdserver/apply/apply.go 
new/vendor/go.etcd.io/etcd/server/v3/etcdserver/apply/apply.go
--- old/vendor/go.etcd.io/etcd/server/v3/etcdserver/apply/apply.go      
2026-10-23 01:01:34.000000000 +0200
+++ new/vendor/go.etcd.io/etcd/server/v3/etcdserver/apply/apply.go      
2026-11-19 00:39:15.000000000 +0100
@@ -16,17 +16,36 @@
 
 import (
        "go.uber.org/zap"
+       "google.golang.org/protobuf/proto"
 
        pb "go.etcd.io/etcd/api/v3/etcdserverpb"
-       "go.etcd.io/etcd/pkg/v3/pbutil"
        "go.etcd.io/etcd/pkg/v3/wait"
        "go.etcd.io/etcd/server/v3/etcdserver/api/membership"
+       "go.etcd.io/etcd/server/v3/internal/legacyv2"
        "go.etcd.io/raft/v3/raftpb"
 )
 
 func Apply(lg *zap.Logger, e *raftpb.Entry, uberApply UberApplier, w 
wait.Wait, shouldApplyV3 membership.ShouldApplyV3) (ar *Result, id uint64) {
        var raftReq pb.InternalRaftRequest
-       pbutil.MustUnmarshalMessage(&raftReq, e.Data)
+       if err := proto.Unmarshal(e.Data, &raftReq); err != nil {
+               var legacyReq legacyv2.Request
+               if lerr := legacyReq.Unmarshal(e.Data); lerr != nil {
+                       lg.Panic("failed to unmarshal raft entry", 
zap.Error(err), zap.Error(lerr))
+               }
+               // Only the two metadata shapes written by etcd 3.5 and earlier 
are
+               // expected; anything else is WAL corruption and must panic 
rather
+               // than be dropped.
+               if !legacyReq.IsMetadataRequest() {
+                       lg.Panic("unexpected non-metadata legacy v2 request",
+                               zap.Stringer("request", &legacyReq), 
zap.Error(err))
+               }
+               // Legacy v2 requests are dropped: the v2 store has been 
removed,
+               // member attributes are re-published before the server starts
+               // serving requests, and the cluster version is maintained by 
the
+               // newer members.
+               lg.Info("dropping legacy v2 WAL request", 
zap.Stringer("request", &legacyReq))
+               return nil, legacyReq.ID
+       }
        lg.Debug("Apply", zap.Stringer("raftReq", &raftReq))
 
        id = raftReq.ID
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/go.etcd.io/etcd/server/v3/etcdserver/bootstrap.go 
new/vendor/go.etcd.io/etcd/server/v3/etcdserver/bootstrap.go
--- old/vendor/go.etcd.io/etcd/server/v3/etcdserver/bootstrap.go        
2026-10-23 01:01:34.000000000 +0200
+++ new/vendor/go.etcd.io/etcd/server/v3/etcdserver/bootstrap.go        
2026-11-19 00:39:15.000000000 +0100
@@ -86,7 +86,11 @@
                        return nil, fmt.Errorf("cannot write to WAL directory: 
%w", err)
                }
                cfg.Logger.Info("Bootstrapping WAL from snapshot")
-               bwal = bootstrapWALFromSnapshot(cfg, backend.snapshot, 
backend.ci)
+               bwal, err = bootstrapWALFromSnapshot(cfg, backend.snapshot, 
backend.ci)
+               if err != nil {
+                       backend.Close()
+                       return nil, err
+               }
        }
 
        cfg.Logger.Info("bootstrapping cluster")
@@ -573,7 +577,7 @@
        )
 }
 
-func bootstrapWALFromSnapshot(cfg config.ServerConfig, snapshot 
*raftpb.Snapshot, ci cindex.ConsistentIndexer) *bootstrappedWAL {
+func bootstrapWALFromSnapshot(cfg config.ServerConfig, snapshot 
*raftpb.Snapshot, ci cindex.ConsistentIndexer) (*bootstrappedWAL, error) {
        wal, st, ents, snap, meta := openWALFromSnapshot(cfg, snapshot)
        bwal := &bootstrappedWAL{
                lg:       cfg.Logger,
@@ -597,7 +601,18 @@
                // committed, we reset Commit to max(HardState.Commit, 
consistent_index).
                //
                // See: https://github.com/etcd-io/raft/pull/300 for more 
details.
-               bwal.st.Commit = new(max(oldCommitIndex, consistentIndex))
+               adjustedCommitIndex := max(oldCommitIndex, consistentIndex)
+               lastIdx := bwal.lastIndex()
+               if adjustedCommitIndex > lastIdx {
+                       cfg.Logger.Error(
+                               "adjusted commit index is ahead of the last WAL 
entry",
+                               zap.Uint64("adjusted-commit-index", 
adjustedCommitIndex),
+                               zap.Uint64("last-wal-entry-index", lastIdx),
+                       )
+                       bwal.w.Close()
+                       return nil, fmt.Errorf("adjusted commit index %d 
exceeds the last WAL entry index %d", adjustedCommitIndex, lastIdx)
+               }
+               bwal.st.Commit = new(adjustedCommitIndex)
 
                // discard the previously uncommitted entries
                bwal.ents = bwal.CommitedEntries()
@@ -619,7 +634,7 @@
                        zap.Uint64("commit-index", bwal.st.GetCommit()),
                )
        }
-       return bwal
+       return bwal, nil
 }
 
 // openWALFromSnapshot reads the WAL at the given snap and returns the wal, 
its latest HardState and cluster ID, and all entries that appear
@@ -698,52 +713,68 @@
        meta     *snapshotMetadata
 }
 
-func (wal *bootstrappedWAL) MemoryStorage() *raft.MemoryStorage {
+func (bwal *bootstrappedWAL) MemoryStorage() *raft.MemoryStorage {
        s := raft.NewMemoryStorage()
-       if wal.snapshot != nil {
-               s.ApplySnapshot(wal.snapshot)
+       if bwal.snapshot != nil {
+               s.ApplySnapshot(bwal.snapshot)
        }
-       if wal.st != nil {
-               s.SetHardState(wal.st)
+       if bwal.st != nil {
+               s.SetHardState(bwal.st)
        }
-       if len(wal.ents) != 0 {
-               s.Append(wal.ents)
+       if len(bwal.ents) != 0 {
+               s.Append(bwal.ents)
        }
        return s
 }
 
-func (wal *bootstrappedWAL) CommitedEntries() []*raftpb.Entry {
-       for i, ent := range wal.ents {
-               if ent.GetIndex() > wal.st.GetCommit() {
-                       wal.lg.Info(
+func (bwal *bootstrappedWAL) CommitedEntries() []*raftpb.Entry {
+       for i, ent := range bwal.ents {
+               if ent.GetIndex() > bwal.st.GetCommit() {
+                       bwal.lg.Info(
                                "discarding uncommitted WAL entries",
                                zap.Uint64("entry-index", ent.GetIndex()),
-                               zap.Uint64("commit-index-from-wal", 
wal.st.GetCommit()),
-                               zap.Int("number-of-discarded-entries", 
len(wal.ents)-i),
+                               zap.Uint64("commit-index-from-wal", 
bwal.st.GetCommit()),
+                               zap.Int("number-of-discarded-entries", 
len(bwal.ents)-i),
                        )
-                       return wal.ents[:i]
+                       return bwal.ents[:i]
                }
        }
-       return wal.ents
+       return bwal.ents
 }
 
-func (wal *bootstrappedWAL) NewConfigChangeEntries() []*raftpb.Entry {
+func (bwal *bootstrappedWAL) NewConfigChangeEntries() []*raftpb.Entry {
        return serverstorage.CreateConfigChangeEnts(
-               wal.lg,
-               serverstorage.GetEffectiveNodeIDsFromWALEntries(wal.lg, 
wal.snapshot, wal.ents),
-               uint64(wal.meta.nodeID),
-               wal.st.GetTerm(),
-               wal.st.GetCommit(),
+               bwal.lg,
+               serverstorage.GetEffectiveNodeIDsFromWALEntries(bwal.lg, 
bwal.snapshot, bwal.ents),
+               uint64(bwal.meta.nodeID),
+               bwal.st.GetTerm(),
+               bwal.st.GetCommit(),
        )
 }
 
-func (wal *bootstrappedWAL) AppendAndCommitEntries(ents []*raftpb.Entry) {
-       wal.ents = append(wal.ents, ents...)
-       err := wal.w.Save(&raftpb.HardState{}, ents)
+func (bwal *bootstrappedWAL) AppendAndCommitEntries(ents []*raftpb.Entry) {
+       bwal.ents = append(bwal.ents, ents...)
+       err := bwal.w.Save(&raftpb.HardState{}, ents)
        if err != nil {
-               wal.lg.Fatal("failed to save hard state and entries", 
zap.Error(err))
+               bwal.lg.Fatal("failed to save hard state and entries", 
zap.Error(err))
+       }
+       if len(bwal.ents) != 0 {
+               bwal.st.Commit = bwal.ents[len(bwal.ents)-1].Index
        }
-       if len(wal.ents) != 0 {
-               wal.st.Commit = wal.ents[len(wal.ents)-1].Index
+}
+
+// `lastIndex` returns the index of the last entry, or the snapshot index if 
there are no entries
+func (bwal *bootstrappedWAL) lastIndex() uint64 {
+       var idx uint64
+       if bwal.snapshot != nil {
+               idx = bwal.snapshot.GetMetadata().GetIndex()
+       }
+
+       if len(bwal.ents) != 0 {
+               if entIdx := bwal.ents[len(bwal.ents)-1].GetIndex(); entIdx > 
idx {
+                       idx = entIdx
+               }
        }
+
+       return idx
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go 
new/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go
--- old/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go   2026-10-23 
01:01:34.000000000 +0200
+++ new/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go   2026-11-19 
00:39:15.000000000 +0100
@@ -253,7 +253,7 @@
        be         backend.Backend
        beHooks    *serverstorage.BackendHooks
        authStore  auth.AuthStore
-       alarmStore *v3alarm.AlarmStore
+       alarmStore atomic.Pointer[v3alarm.AlarmStore]
 
        stats  *stats.ServerStats
        lstats *stats.LeaderStats
@@ -1147,7 +1147,7 @@
        opts := apply.ApplierOptions{
                Logger:                       s.lg,
                KV:                           s.KV(),
-               AlarmStore:                   s.alarmStore,
+               AlarmStore:                   s.alarmStore.Load(),
                AuthStore:                    s.authStore,
                Lessor:                       s.lessor,
                Cluster:                      s.cluster,
@@ -1978,7 +1978,7 @@
                return
        }
 
-       if !errorspkg.Is(ar.Err, errors.ErrNoSpace) || 
len(s.alarmStore.Get(pb.AlarmType_NOSPACE)) > 0 {
+       if !errorspkg.Is(ar.Err, errors.ErrNoSpace) || 
len(s.alarmStore.Load().Get(pb.AlarmType_NOSPACE)) > 0 {
                s.w.Trigger(id, ar)
                return
        }
@@ -2403,7 +2403,7 @@
        if err != nil {
                return err
        }
-       s.alarmStore = as
+       s.alarmStore.Store(as)
        return nil
 }
 
@@ -2430,7 +2430,7 @@
 }
 
 func (s *EtcdServer) Alarms() []*pb.AlarmMember {
-       return s.alarmStore.Get(pb.AlarmType_NONE)
+       return s.alarmStore.Load().Get(pb.AlarmType_NONE)
 }
 
 // IsLearner returns if the local member is raft learner
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/go.etcd.io/etcd/server/v3/internal/legacyv2/legacyv2.go 
new/vendor/go.etcd.io/etcd/server/v3/internal/legacyv2/legacyv2.go
--- old/vendor/go.etcd.io/etcd/server/v3/internal/legacyv2/legacyv2.go  
1970-01-01 01:00:00.000000000 +0100
+++ new/vendor/go.etcd.io/etcd/server/v3/internal/legacyv2/legacyv2.go  
2026-11-19 00:39:15.000000000 +0100
@@ -0,0 +1,104 @@
+// Copyright 2026 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.
+
+// Package legacyv2 detects the legacy v2 metadata WAL requests written by
+// etcd 3.5 and earlier: member attribute updates and cluster version
+// updates. The v2 Request message itself has been removed from the API, so
+// the entries are parsed over the protobuf wire format directly.
+package legacyv2
+
+import (
+       "fmt"
+       "net/http"
+       "strings"
+
+       "google.golang.org/protobuf/encoding/protowire"
+)
+
+// Request contains the part of the removed v2 WAL request needed to detect
+// the metadata entries written by etcd 3.5.
+type Request struct {
+       ID     uint64
+       Method string
+       Path   string
+       Val    string
+}
+
+// Unmarshal parses a legacy v2 request from its protobuf wire format.
+func (r *Request) Unmarshal(data []byte) error {
+       *r = Request{}
+       for len(data) > 0 {
+               number, typ, n := protowire.ConsumeTag(data)
+               if n < 0 {
+                       return protowire.ParseError(n)
+               }
+               data = data[n:]
+
+               switch number {
+               case 1:
+                       if typ != protowire.VarintType {
+                               return fmt.Errorf("request v2: field ID has 
wire type %d", typ)
+                       }
+                       value, n := protowire.ConsumeVarint(data)
+                       if n < 0 {
+                               return protowire.ParseError(n)
+                       }
+                       r.ID = value
+                       data = data[n:]
+               case 2, 3, 4:
+                       if typ != protowire.BytesType {
+                               return fmt.Errorf("request v2: field %d has 
wire type %d", number, typ)
+                       }
+                       value, n := protowire.ConsumeBytes(data)
+                       if n < 0 {
+                               return protowire.ParseError(n)
+                       }
+                       switch number {
+                       case 2:
+                               r.Method = string(value)
+                       case 3:
+                               r.Path = string(value)
+                       case 4:
+                               r.Val = string(value)
+                       }
+                       data = data[n:]
+               default:
+                       n := protowire.ConsumeFieldValue(number, typ, data)
+                       if n < 0 {
+                               return protowire.ParseError(n)
+                       }
+                       data = data[n:]
+               }
+       }
+       return nil
+}
+
+func (r *Request) String() string {
+       return fmt.Sprintf("RequestV2{ID:%d Method:%q Path:%q}", r.ID, 
r.Method, r.Path)
+}
+
+// IsMetadataRequest reports whether the legacy v2 request is one of the two
+// metadata writes etcd 3.5 and earlier could persist to the WAL: member
+// attribute updates and cluster version updates. Anything else that happens
+// to parse as a v2 request is WAL corruption and must not be silently
+// dropped.
+func (r *Request) IsMetadataRequest() bool {
+       if r.Method != http.MethodPut {
+               return false
+       }
+       if strings.HasSuffix(r.Path, "/version") && !strings.Contains(r.Path, 
"/members/") {
+               return true
+       }
+       return strings.HasSuffix(r.Path, "/attributes") && 
strings.Contains(r.Path, "/members/")
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/go.etcd.io/etcd/server/v3/storage/wal/version.go 
new/vendor/go.etcd.io/etcd/server/v3/storage/wal/version.go
--- old/vendor/go.etcd.io/etcd/server/v3/storage/wal/version.go 2026-10-23 
01:01:34.000000000 +0200
+++ new/vendor/go.etcd.io/etcd/server/v3/storage/wal/version.go 2026-11-19 
00:39:15.000000000 +0100
@@ -25,6 +25,7 @@
 
        "go.etcd.io/etcd/api/v3/etcdserverpb"
        "go.etcd.io/etcd/api/v3/version"
+       "go.etcd.io/etcd/server/v3/internal/legacyv2"
        "go.etcd.io/raft/v3/raftpb"
 )
 
@@ -107,7 +108,18 @@
        case raftpb.EntryNormal:
                var raftReq etcdserverpb.InternalRaftRequest
                if err := proto.Unmarshal(data, &raftReq); err != nil {
-                       return err
+                       // etcd 3.5 or earlier could write legacy v2 metadata 
requests
+                       // (member attributes and the cluster version) to the 
WAL (the
+                       // Request message has since been removed). Such 
entries carry
+                       // no etcd version annotation and are dropped during 
replay, so
+                       // skip those. Any other entry that fails to decode is
+                       // corruption and must surface the original error 
instead of
+                       // being silently ignored, matching the release-3.6 
behaviour.
+                       var legacyReq legacyv2.Request
+                       if legacyReq.Unmarshal(data) != nil || 
!legacyReq.IsMetadataRequest() {
+                               return err
+                       }
+                       return nil
                }
                msg = proto.MessageReflect(&raftReq)
                if raftReq.DowngradeVersionTest != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt
--- old/vendor/modules.txt      2026-10-23 01:01:34.000000000 +0200
+++ new/vendor/modules.txt      2026-11-19 00:39:15.000000000 +0100
@@ -155,7 +155,7 @@
 go.etcd.io/bbolt/errors
 go.etcd.io/bbolt/internal/common
 go.etcd.io/bbolt/internal/freelist
-# go.etcd.io/etcd/api/v3 v3.7.3 => ../api
+# go.etcd.io/etcd/api/v3 v3.7.4 => ../api
 ## explicit; go 1.26.0
 go.etcd.io/etcd/api/v3/authpb
 go.etcd.io/etcd/api/v3/etcdserverpb
@@ -165,7 +165,7 @@
 go.etcd.io/etcd/api/v3/v3rpc/rpctypes
 go.etcd.io/etcd/api/v3/version
 go.etcd.io/etcd/api/v3/versionpb
-# go.etcd.io/etcd/client/pkg/v3 v3.7.3 => ../client/pkg
+# go.etcd.io/etcd/client/pkg/v3 v3.7.4 => ../client/pkg
 ## explicit; go 1.26.0
 go.etcd.io/etcd/client/pkg/v3/fileutil
 go.etcd.io/etcd/client/pkg/v3/logutil
@@ -175,7 +175,7 @@
 go.etcd.io/etcd/client/pkg/v3/transport
 go.etcd.io/etcd/client/pkg/v3/types
 go.etcd.io/etcd/client/pkg/v3/verify
-# go.etcd.io/etcd/client/v3 v3.7.3 => ../client/v3
+# go.etcd.io/etcd/client/v3 v3.7.4 => ../client/v3
 ## explicit; go 1.26.0
 go.etcd.io/etcd/client/v3
 go.etcd.io/etcd/client/v3/concurrency
@@ -183,7 +183,7 @@
 go.etcd.io/etcd/client/v3/internal/endpoint
 go.etcd.io/etcd/client/v3/internal/resolver
 go.etcd.io/etcd/client/v3/snapshot
-# go.etcd.io/etcd/pkg/v3 v3.7.3 => ../pkg
+# go.etcd.io/etcd/pkg/v3 v3.7.4 => ../pkg
 ## explicit; go 1.26.0
 go.etcd.io/etcd/pkg/v3/adt
 go.etcd.io/etcd/pkg/v3/cobrautl
@@ -203,7 +203,7 @@
 go.etcd.io/etcd/pkg/v3/schedule
 go.etcd.io/etcd/pkg/v3/traceutil
 go.etcd.io/etcd/pkg/v3/wait
-# go.etcd.io/etcd/server/v3 v3.7.3 => ../server
+# go.etcd.io/etcd/server/v3 v3.7.4 => ../server
 ## explicit; go 1.26.0
 go.etcd.io/etcd/server/v3/auth
 go.etcd.io/etcd/server/v3/config
@@ -237,6 +237,7 @@
 go.etcd.io/etcd/server/v3/etcdserver/txn
 go.etcd.io/etcd/server/v3/etcdserver/version
 go.etcd.io/etcd/server/v3/features
+go.etcd.io/etcd/server/v3/internal/legacyv2
 go.etcd.io/etcd/server/v3/lease
 go.etcd.io/etcd/server/v3/lease/leasehttp
 go.etcd.io/etcd/server/v3/lease/leasepb
@@ -346,7 +347,7 @@
 ## explicit; go 1.26.0
 golang.org/x/crypto/bcrypt
 golang.org/x/crypto/blowfish
-# golang.org/x/net v0.61.0
+# golang.org/x/net v0.62.0
 ## explicit; go 1.26.0
 golang.org/x/net/context
 golang.org/x/net/http/httpguts

++++++ vendor-server.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vendor/go.etcd.io/etcd/api/v3/version/version.go 
new/vendor/go.etcd.io/etcd/api/v3/version/version.go
--- old/vendor/go.etcd.io/etcd/api/v3/version/version.go        2026-10-23 
01:01:34.000000000 +0200
+++ new/vendor/go.etcd.io/etcd/api/v3/version/version.go        2026-11-19 
00:39:15.000000000 +0100
@@ -26,7 +26,7 @@
 var (
        // MinClusterVersion is the min cluster version this etcd binary is 
compatible with.
        MinClusterVersion = "3.0.0"
-       Version           = "3.7.3"
+       Version           = "3.7.4"
        APIVersion        = "unknown"
 
        // Git SHA Value will be set during build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt
--- old/vendor/modules.txt      2026-10-23 01:01:34.000000000 +0200
+++ new/vendor/modules.txt      2026-11-19 00:39:15.000000000 +0100
@@ -131,7 +131,7 @@
 go.etcd.io/bbolt/errors
 go.etcd.io/bbolt/internal/common
 go.etcd.io/bbolt/internal/freelist
-# go.etcd.io/etcd/api/v3 v3.7.3 => ../api
+# go.etcd.io/etcd/api/v3 v3.7.4 => ../api
 ## explicit; go 1.26.0
 go.etcd.io/etcd/api/v3/authpb
 go.etcd.io/etcd/api/v3/etcdserverpb
@@ -141,7 +141,7 @@
 go.etcd.io/etcd/api/v3/v3rpc/rpctypes
 go.etcd.io/etcd/api/v3/version
 go.etcd.io/etcd/api/v3/versionpb
-# go.etcd.io/etcd/client/pkg/v3 v3.7.3 => ../client/pkg
+# go.etcd.io/etcd/client/pkg/v3 v3.7.4 => ../client/pkg
 ## explicit; go 1.26.0
 go.etcd.io/etcd/client/pkg/v3/fileutil
 go.etcd.io/etcd/client/pkg/v3/logutil
@@ -152,7 +152,7 @@
 go.etcd.io/etcd/client/pkg/v3/transport
 go.etcd.io/etcd/client/pkg/v3/types
 go.etcd.io/etcd/client/pkg/v3/verify
-# go.etcd.io/etcd/client/v3 v3.7.3 => ../client/v3
+# go.etcd.io/etcd/client/v3 v3.7.4 => ../client/v3
 ## explicit; go 1.26.0
 go.etcd.io/etcd/client/v3
 go.etcd.io/etcd/client/v3/concurrency
@@ -164,7 +164,7 @@
 go.etcd.io/etcd/client/v3/naming/endpoints
 go.etcd.io/etcd/client/v3/naming/endpoints/internal
 go.etcd.io/etcd/client/v3/ordering
-# go.etcd.io/etcd/pkg/v3 v3.7.3 => ../pkg
+# go.etcd.io/etcd/pkg/v3 v3.7.4 => ../pkg
 ## explicit; go 1.26.0
 go.etcd.io/etcd/pkg/v3/adt
 go.etcd.io/etcd/pkg/v3/contention
@@ -284,7 +284,7 @@
 ## explicit; go 1.26.0
 golang.org/x/crypto/bcrypt
 golang.org/x/crypto/blowfish
-# golang.org/x/net v0.61.0
+# golang.org/x/net v0.62.0
 ## explicit; go 1.26.0
 golang.org/x/net/context
 golang.org/x/net/http/httpguts

Reply via email to