gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

erasure coding: fix EC error if multiple disks are configured in one volume server

Browse source
This commit is contained in:
Chris Lu 2020-08-26 09:16:58 -07:00
parent d1cf39f180
commit ab759f0ec2
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
weed/storage/disk_location_ec.go
View file

@ -3,6 +3,7 @@ package storage
import ( import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os"
"path" "path"
"regexp" "regexp"
"sort" "sort"
@ -58,6 +59,9 @@ func (l *DiskLocation) LoadEcShard(collection string, vid needle.VolumeId, shard
ecVolumeShard, err := erasure_coding.NewEcVolumeShard(l.Directory, collection, vid, shardId) ecVolumeShard, err := erasure_coding.NewEcVolumeShard(l.Directory, collection, vid, shardId)
if err != nil { if err != nil {
if err == os.ErrNotExist {
return os.ErrNotExist
}
return fmt.Errorf("failed to create ec shard %d.%d: %v", vid, shardId, err) return fmt.Errorf("failed to create ec shard %d.%d: %v", vid, shardId, err)
} }
l.ecVolumesLock.Lock() l.ecVolumesLock.Lock()

4
weed/storage/erasure_coding/ec_shard.go
View file

@ -5,6 +5,7 @@ import (
"os" "os"
"path" "path"
"strconv" "strconv"
"strings"
"github.com/chrislusf/seaweedfs/weed/stats" "github.com/chrislusf/seaweedfs/weed/stats"
"github.com/chrislusf/seaweedfs/weed/storage/needle" "github.com/chrislusf/seaweedfs/weed/storage/needle"
@ -29,6 +30,9 @@ func NewEcVolumeShard(dirname string, collection string, id needle.VolumeId, sha
// open ecd file // open ecd file
if v.ecdFile, e = os.OpenFile(baseFileName+ToExt(int(shardId)), os.O_RDONLY, 0644); e != nil { if v.ecdFile, e = os.OpenFile(baseFileName+ToExt(int(shardId)), os.O_RDONLY, 0644); e != nil {
if e == os.ErrNotExist || strings.Contains(e.Error(), "no such file or directory") {
return nil, os.ErrNotExist
}
return nil, fmt.Errorf("cannot read ec volume shard %s%s: %v", baseFileName, ToExt(int(shardId)), e) return nil, fmt.Errorf("cannot read ec volume shard %s%s: %v", baseFileName, ToExt(int(shardId)), e)
} }
ecdFi, statErr := v.ecdFile.Stat() ecdFi, statErr := v.ecdFile.Stat()

3
weed/storage/store_ec.go
View file

@ -4,6 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"io" "io"
"os"
"sort" "sort"
"sync" "sync"
"time" "time"
@ -59,6 +60,8 @@ func (s *Store) MountEcShards(collection string, vid needle.VolumeId, shardId er
EcIndexBits: uint32(shardBits.AddShardId(shardId)), EcIndexBits: uint32(shardBits.AddShardId(shardId)),
} }
return nil return nil
} else if err == os.ErrNotExist {
continue
} else { } else {
return fmt.Errorf("%s load ec shard %d.%d: %v", location.Directory, vid, shardId, err) return fmt.Errorf("%s load ec shard %d.%d: %v", location.Directory, vid, shardId, err)
} }