Merge pull request #9 from abitduck/bug_fix

fix segment error when ring expanded
iqiyi · Mar 19, 2019 · a0bb070 · a0bb070
2 parents 7269cec + eaa9763
commit a0bb070
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/common/ring/hash_ring.go b/common/ring/hash_ring.go
@@ -116,7 +116,7 @@ func (r *hashRing) LocalDevices(localPort int) ([]*Device, error) {
 	d := r.getData()
 	var devs []*Device
 	for _, dev := range d.Devs {
-		if localIPs[dev.ReplicationIp] && dev.ReplicationPort == localPort {
+		if dev != nil && localIPs[dev.ReplicationIp] && dev.ReplicationPort == localPort {
 			devs = append(devs, dev)
 		}
 	}
@@ -198,9 +198,11 @@ func (r *hashRing) reload() error {
 	zoneCount := make(map[regionZone]bool)
 	ipPortCount := make(map[ipPort]bool)
 	for _, d := range data.Devs {
-		regionCount[d.Region] = true
-		zoneCount[regionZone{d.Region, d.Zone}] = true
-		ipPortCount[ipPort{d.Region, d.Zone, d.Port, d.Ip}] = true
+		if d != nil {
+			regionCount[d.Region] = true
+			zoneCount[regionZone{d.Region, d.Zone}] = true
+			ipPortCount[ipPort{d.Region, d.Zone, d.Port, d.Ip}] = true
+		}
 	}
 	data.regionCount = len(regionCount)
 	data.zoneCount = len(zoneCount)