Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,9 @@ linters:
- path: ^internal/cache/
linters: [errcheck]

- path: ^internal/fileops/
linters: [errcheck]

- path: ^internal/goclusterfs/
linters: [errcheck]

- path: ^internal/sfb/
linters: [errcheck]

- path: ^cmd/gfsctl/
linters: [errcheck]

Expand Down
2 changes: 1 addition & 1 deletion internal/cache/broadcast/loss_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func unicastTo(t *testing.T) (*Broadcaster, *net.UDPConn) {
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() { raw.Close() })
t.Cleanup(func() { _ = raw.Close() })
ports := freeUDPPorts(t, 2)
cfg := DefaultConfig()
cfg.MulticastPort, cfg.UnicastPort = ports[0], ports[1]
Expand Down
4 changes: 2 additions & 2 deletions internal/cache/broadcast/transport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func freeUDPPorts(t *testing.T, n int) []int {
if err != nil {
t.Fatal(err)
}
defer conn.Close()
defer func() { _ = conn.Close() }()
ports[i] = conn.LocalAddr().(*net.UDPAddr).Port
}
return ports
Expand Down Expand Up @@ -141,7 +141,7 @@ func TestCheckPortsFailsOnTakenPort(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer held.Close()
defer func() { _ = held.Close() }()

cfg := DefaultConfig()
cfg.MulticastPort, cfg.UnicastPort = ports[0], ports[1]
Expand Down
8 changes: 5 additions & 3 deletions internal/cache/inode_cache_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ func newTestInodeTable(t *testing.T) *inode.Table {
t.Skipf("Cannot create test file: %v", err)
}
path := f.Name()
t.Cleanup(func() { os.Remove(path) })
t.Cleanup(func() { _ = os.Remove(path) })
err = f.Truncate(testTableSize)
f.Close()
if err := f.Close(); err != nil {
t.Fatal(err)
}
if err != nil {
t.Skipf("Cannot truncate test file: %v", err)
}
Expand All @@ -35,7 +37,7 @@ func newTestInodeTable(t *testing.T) *inode.Table {
if err != nil {
t.Skipf("O_DIRECT not supported: %v", err)
}
t.Cleanup(func() { dev.Close() })
t.Cleanup(func() { _ = dev.Close() })

return inode.NewTable(dev, 0, testTableSize, nil, [16]byte{})
}
Expand Down
7 changes: 4 additions & 3 deletions internal/fileops/fileops.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ func relative(p string) (string, error) {
}

// open opens p read-only without following symlinks or leaving the mount.
// Closing a read-only descriptor reports nothing a caller could act on.
// The root is opened per call: a descriptor held open would make unmount fail with EBUSY.
func (o *Ops) open(p string) (*os.File, error) {
rel, err := relative(p)
Expand All @@ -171,7 +172,7 @@ func (o *Ops) open(p string) (*os.File, error) {
if err != nil {
return nil, err
}
defer unix.Close(rootFD)
defer func() { _ = unix.Close(rootFD) }()
if o.checkRoot != nil {
if err := o.checkRoot(rootFD); err != nil {
return nil, err
Expand All @@ -198,7 +199,7 @@ func (o *Ops) stat(p string) (unix.Stat_t, error) {
if err != nil {
return st, err
}
defer f.Close()
defer func() { _ = f.Close() }()
err = unix.Fstat(int(f.Fd()), &st)
return st, err
}
Expand All @@ -208,7 +209,7 @@ func (o *Ops) setxattr(p, attr, value string) error {
if err != nil {
return err
}
defer f.Close()
defer func() { _ = f.Close() }()
var st unix.Stat_t
if err := unix.Fstat(int(f.Fd()), &st); err != nil {
return err
Expand Down
6 changes: 3 additions & 3 deletions internal/fileops/fileops_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ func TestOpenStaysInsideTheRoot(t *testing.T) {
t.Errorf("open(%q): %v", p, err)
continue
}
f.Close()
_ = f.Close()
}
for _, p := range []string{"/link", "/linkdir/passwd", "/inside-link"} {
if f, err := o.open(p); !errors.Is(err, api.ErrInvalidPath) {
if f != nil {
f.Close()
_ = f.Close()
}
t.Errorf("open(%q) = %v, want ErrInvalidPath", p, err)
}
Expand All @@ -104,7 +104,7 @@ func TestSameDevice(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer unix.Close(fd)
defer func() { _ = unix.Close(fd) }()
var st unix.Stat_t
if err := unix.Fstat(fd, &st); err != nil {
t.Fatal(err)
Expand Down
21 changes: 18 additions & 3 deletions internal/sfb/sfb.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"errors"
"fmt"
"hash/crc32"
"log"
"sync"

"github.com/supporttools/GoClusterFS/internal/bitmap"
Expand Down Expand Up @@ -320,13 +321,25 @@ func (m *Manager) AllocateSlot(ctx context.Context, size uint64) (containerBlock
return containerBlock, slotIndex, nil
}

// unlock releases a container lock. ErrNotLockOwner means a double release:
// the extra one may have dropped another holder's lock early.
func (m *Manager) unlock(container uint64) {
err := m.lockMgr.Release(lock.LockTypeSFBContainer, container)
switch {
case errors.Is(err, lock.ErrNotLockOwner):
log.Printf("[ERROR] sfb: released the lock on container %d that this node does not hold (double release or lock bookkeeping bug)", container)
case err != nil:
log.Printf("[WARN] sfb: releasing the lock on container %d failed: %v", container, err)
}
}

// tryAllocFromContainer attempts to allocate a slot from a specific container.
func (m *Manager) tryAllocFromContainer(ctx context.Context, block uint64, tier Tier) (uint16, error) {
// Acquire SFBContainer lock (Level 7)
if err := m.lockMgr.Acquire(ctx, lock.LockTypeSFBContainer, block, lock.LockModeExclusive); err != nil {
return 0, err
}
defer m.lockMgr.Release(lock.LockTypeSFBContainer, block)
defer m.unlock(block)

// Load container (from cache or disk)
container, err := m.loadContainer(block)
Expand Down Expand Up @@ -383,7 +396,9 @@ func (m *Manager) createContainer(ctx context.Context, tier Tier) (uint64, error

// Write header to disk
if err := m.writeContainerHeader(block, &header); err != nil {
m.bitmap.Free(ctx, block)
if freeErr := m.bitmap.Free(ctx, block); freeErr != nil {
err = errors.Join(err, fmt.Errorf("block %d stays allocated with no owner: %w", block, freeErr))
}
return 0, err
}

Expand All @@ -406,7 +421,7 @@ func (m *Manager) FreeSlot(ctx context.Context, containerBlock uint64, slotIndex
if err := m.lockMgr.Acquire(ctx, lock.LockTypeSFBContainer, containerBlock, lock.LockModeExclusive); err != nil {
return err
}
defer m.lockMgr.Release(lock.LockTypeSFBContainer, containerBlock)
defer m.unlock(containerBlock)

// Load container
container, err := m.loadContainer(containerBlock)
Expand Down
Loading