mirrors/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-08-16 04:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tests): make 32-bit GOARCH tests build and run (#9507)

Browse Source 
fix(tests): make 32-bit GOARCH tests build and run (#9503)

verifyTestFilerClient had bare int64 atomic counters after a map header,
so atomic.AddInt64 panicked with "unaligned 64-bit atomic operation" on
linux/386. Switch to atomic.Int64, which the stdlib guarantees is
8-byte aligned on all platforms.

rpc_version_filter_test.go passed the untyped constant 0xdeadbeef to
t.Errorf, where it default-promoted to int and overflowed 32-bit int.
Bind it to a typed uint32 const used in both the comparison and the
error message.
This commit is contained in:
Chris Lu
2026-05-14 20:55:37 -07:00
committed by GitHub
parent 7acba59a5c
commit bfb2661fec
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
weed/command/filer_sync_verify_test.go
+12 -8
View File
@@ -48,20 +48,24 @@ func (c *verifyTestInnerClient) ListEntries(_ context.Context, in *filer_pb.List
// verifyTestFilerClient implements filer_pb.FilerClient and tracks concurrent
// WithFilerClient invocations to let tests verify the global concurrency bound.
// inFlight/peakFlight use atomic.Int64 (not bare int64 + sync/atomic funcs) so
// the fields are 8-byte aligned even on 32-bit platforms — bare int64 fields
// after a pointer-sized field panic with "unaligned 64-bit atomic operation"
// on 386/arm/mips.
type verifyTestFilerClient struct {
entriesByDir map[string][]*filer_pb.Entry
inFlight int64 // accessed via atomic
peakFlight int64 // accessed via atomic
inFlight atomic.Int64
peakFlight atomic.Int64
delay time.Duration
}
func (c *verifyTestFilerClient) WithFilerClient(_ bool, fn func(filer_pb.SeaweedFilerClient) error) error {
// track peak concurrent in-flight listings
n := atomic.AddInt64(&c.inFlight, 1)
defer atomic.AddInt64(&c.inFlight, -1)
n := c.inFlight.Add(1)
defer c.inFlight.Add(-1)
for {
peak := atomic.LoadInt64(&c.peakFlight)
if n <= peak || atomic.CompareAndSwapInt64(&c.peakFlight, peak, n) {
peak := c.peakFlight.Load()
if n <= peak || c.peakFlight.CompareAndSwap(peak, n) {
break
}
}
@@ -219,11 +223,11 @@ func TestVerifySyncConcurrencyBound(t *testing.T) {
t.Errorf("unexpected diffs in identical tree")
}
if peak := atomic.LoadInt64(&clientA.peakFlight); peak > verifySyncConcurrency {
if peak := clientA.peakFlight.Load(); peak > verifySyncConcurrency {
t.Errorf("clientA peak concurrent listings = %d, want ≤ %d (verifySyncConcurrency)",
peak, verifySyncConcurrency)
}
if peak := atomic.LoadInt64(&clientB.peakFlight); peak > verifySyncConcurrency {
if peak := clientB.peakFlight.Load(); peak > verifySyncConcurrency {
t.Errorf("clientB peak concurrent listings = %d, want ≤ %d (verifySyncConcurrency)",
peak, verifySyncConcurrency)
}
weed/server/nfs/rpc_version_filter_test.go
+3 -2
View File
@@ -98,8 +98,9 @@ func TestVersionFilterRejectsNFSv4WithProgMismatch(t *testing.T) {
}
xid, low, high := readPROGMismatchReply(t, conn)
if xid != 0xdeadbeef {
t.Errorf("xid=%x want %x", xid, 0xdeadbeef)
const wantXID uint32 = 0xdeadbeef
if xid != wantXID {
t.Errorf("xid=%x want %x", xid, wantXID)
}
if low != supportedNFSVer || high != supportedNFSVer {
t.Errorf("supported range=(%d,%d) want (%d,%d)", low, high, supportedNFSVer, supportedNFSVer)