MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-17 01:10:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: rebalance upon pool expansion would crash when in progress (#20004)

Browse Source 
you can attempt a rebalance first i.e, start with 2 pools.

```
mc admin rebalance start alias/
```

and after that you can add a new pool, this would
potentially crash.

```
Jun 27 09:22:19 xxx minio[7828]: panic: runtime error: invalid memory address or nil pointer dereference
Jun 27 09:22:19 xxx minio[7828]: [signal SIGSEGV: segmentation violation code=0x1 addr=0x58 pc=0x22cc225]
Jun 27 09:22:19 xxx minio[7828]: goroutine 1 [running]:
Jun 27 09:22:19 xxx minio[7828]: github.com/minio/minio/cmd.(*erasureServerPools).findIndex(...)
```
This commit is contained in:
Harshavardhana 2024-06-27 11:35:34 -07:00 committed by GitHub
parent b35d083872
commit 709612cb37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/erasure-server-pool-rebalance.go
View File

@ -119,11 +119,8 @@ func (z *erasureServerPools) loadRebalanceMeta(ctx context.Context) error {
} }
z.rebalMu.Lock() z.rebalMu.Lock()
if len(r.PoolStats) == len(z.serverPools) {
z.rebalMeta = r z.rebalMeta = r
} else {
z.updateRebalanceStats(ctx) z.updateRebalanceStats(ctx)
}
z.rebalMu.Unlock() z.rebalMu.Unlock()
return nil return nil
@ -147,24 +144,16 @@ func (z *erasureServerPools) updateRebalanceStats(ctx context.Context) error {
} }
} }
if ok { if ok {
lock := z.serverPools[0].NewNSLock(minioMetaBucket, rebalMetaName) return z.rebalMeta.save(ctx, z.serverPools[0])
lkCtx, err := lock.GetLock(ctx, globalOperationTimeout)
if err != nil {
rebalanceLogIf(ctx, fmt.Errorf("failed to acquire write lock on %s/%s: %w", minioMetaBucket, rebalMetaName, err))
return err
}
defer lock.Unlock(lkCtx)
ctx = lkCtx.Context()
noLockOpts := ObjectOptions{NoLock: true}
return z.rebalMeta.saveWithOpts(ctx, z.serverPools[0], noLockOpts)
} }
return nil return nil
} }
func (z *erasureServerPools) findIndex(index int) int { func (z *erasureServerPools) findIndex(index int) int {
if z.rebalMeta == nil {
return 0
}
for i := 0; i < len(z.rebalMeta.PoolStats); i++ { for i := 0; i < len(z.rebalMeta.PoolStats); i++ {
if i == index { if i == index {
return index return index
@ -277,6 +266,10 @@ func (z *erasureServerPools) bucketRebalanceDone(bucket string, poolIdx int) {
z.rebalMu.Lock() z.rebalMu.Lock()
defer z.rebalMu.Unlock() defer z.rebalMu.Unlock()
if z.rebalMeta == nil {
return
}
ps := z.rebalMeta.PoolStats[poolIdx] ps := z.rebalMeta.PoolStats[poolIdx]
if ps == nil { if ps == nil {
return return
@ -331,6 +324,10 @@ func (r *rebalanceMeta) loadWithOpts(ctx context.Context, store objectIO, opts O
} }
func (r *rebalanceMeta) saveWithOpts(ctx context.Context, store objectIO, opts ObjectOptions) error { func (r *rebalanceMeta) saveWithOpts(ctx context.Context, store objectIO, opts ObjectOptions) error {
if r == nil {
return nil
}
data := make([]byte, 4, r.Msgsize()+4) data := make([]byte, 4, r.Msgsize()+4)
// Initialize the header. // Initialize the header.
@ -369,7 +366,7 @@ func (z *erasureServerPools) IsPoolRebalancing(poolIndex int) bool {
if !r.StoppedAt.IsZero() { if !r.StoppedAt.IsZero() {
return false return false
} }
ps := z.rebalMeta.PoolStats[poolIndex] ps := r.PoolStats[poolIndex]
return ps.Participating && ps.Info.Status == rebalStarted return ps.Participating && ps.Info.Status == rebalStarted
} }
return false return false
@ -794,8 +791,10 @@ func (z *erasureServerPools) saveRebalanceStats(ctx context.Context, poolIdx int
case rebalSaveStoppedAt: case rebalSaveStoppedAt:
r.StoppedAt = time.Now() r.StoppedAt = time.Now()
case rebalSaveStats: case rebalSaveStats:
if z.rebalMeta != nil {
r.PoolStats[poolIdx] = z.rebalMeta.PoolStats[poolIdx] r.PoolStats[poolIdx] = z.rebalMeta.PoolStats[poolIdx]
} }
}
z.rebalMeta = r z.rebalMeta = r
return z.rebalMeta.saveWithOpts(ctx, z.serverPools[0], noLockOpts) return z.rebalMeta.saveWithOpts(ctx, z.serverPools[0], noLockOpts)