diff options
| -rw-r--r-- | weed/server/volume_grpc_copy.go | 2 | ||||
| -rw-r--r-- | weed/storage/disk_location_ec.go | 2 | ||||
| -rw-r--r-- | weed/storage/erasure_coding/ec_shard.go | 2 | ||||
| -rw-r--r-- | weed/storage/store_ec.go | 6 | ||||
| -rw-r--r-- | weed/topology/topology_ec.go | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/weed/server/volume_grpc_copy.go b/weed/server/volume_grpc_copy.go index 96ea8c3b5..89788d3c3 100644 --- a/weed/server/volume_grpc_copy.go +++ b/weed/server/volume_grpc_copy.go @@ -204,7 +204,7 @@ func (vs *VolumeServer) CopyFile(req *volume_server_pb.CopyFileRequest, stream v baseFileName := erasure_coding.EcShardBaseFileName(req.Collection, int(req.VolumeId)) + req.Ext for _, location := range vs.store.Locations { tName := path.Join(location.Directory, baseFileName) - if util.FileExists(tName){ + if util.FileExists(tName) { fileName = tName } } diff --git a/weed/storage/disk_location_ec.go b/weed/storage/disk_location_ec.go index 13797ed4b..7fb5351a4 100644 --- a/weed/storage/disk_location_ec.go +++ b/weed/storage/disk_location_ec.go @@ -34,7 +34,7 @@ func (l *DiskLocation) DestroyEcVolume(vid needle.VolumeId) { ecVolume, found := l.ecVolumes[vid] if found { ecVolume.Destroy() - delete(l.ecVolumes,vid) + delete(l.ecVolumes, vid) } } diff --git a/weed/storage/erasure_coding/ec_shard.go b/weed/storage/erasure_coding/ec_shard.go index 7b9f2dc07..2009beb9c 100644 --- a/weed/storage/erasure_coding/ec_shard.go +++ b/weed/storage/erasure_coding/ec_shard.go @@ -64,7 +64,7 @@ func EcShardFileName(collection string, dir string, id int) (fileName string) { func EcShardBaseFileName(collection string, id int) (baseFileName string) { baseFileName = strconv.Itoa(id) if collection != "" { - baseFileName = collection+"_"+baseFileName + baseFileName = collection + "_" + baseFileName } return } diff --git a/weed/storage/store_ec.go b/weed/storage/store_ec.go index 4ac01c4a9..960551dc2 100644 --- a/weed/storage/store_ec.go +++ b/weed/storage/store_ec.go @@ -221,11 +221,11 @@ func (s *Store) cachedLookupEcShardLocations(ctx context.Context, ecVolume *eras shardCount := len(ecVolume.ShardLocations) if shardCount < erasure_coding.DataShardsCount && - ecVolume.ShardLocationsRefreshTime.Add(11 * time.Second).After(time.Now()) || + ecVolume.ShardLocationsRefreshTime.Add(11*time.Second).After(time.Now()) || shardCount == erasure_coding.TotalShardsCount && - ecVolume.ShardLocationsRefreshTime.Add(37 * time.Minute).After(time.Now()) || + ecVolume.ShardLocationsRefreshTime.Add(37*time.Minute).After(time.Now()) || shardCount >= erasure_coding.DataShardsCount && - ecVolume.ShardLocationsRefreshTime.Add(7 * time.Minute).After(time.Now()) { + ecVolume.ShardLocationsRefreshTime.Add(7*time.Minute).After(time.Now()) { // still fresh return nil } diff --git a/weed/topology/topology_ec.go b/weed/topology/topology_ec.go index c885c90a6..93b39bb5d 100644 --- a/weed/topology/topology_ec.go +++ b/weed/topology/topology_ec.go @@ -139,7 +139,7 @@ func (t *Topology) ListEcServersByCollection(collection string) (dataNodes []str dateNodeMap := make(map[string]bool) for _, ecVolumeLocation := range t.ecShardMap { if ecVolumeLocation.Collection == collection { - for _, locations := range ecVolumeLocation.Locations{ + for _, locations := range ecVolumeLocation.Locations { for _, loc := range locations { dateNodeMap[string(loc.Id())] = true } |