fix CreateWorker bugs.

Author: bobliu0909

cache/cache.go

@@ -493,11 +493,17 @@ func (cacheRepository *CacheRepository) CreateWorker(key string, node *gzkwrappe
 
 	worker := cacheRepository.nodeStore.GetWorker(key)
 	if worker != nil {
-		logger.WARN("[#cache#] %s create worker %s is already, %s(%s).", node.Location, node.HostName, node.IpAddr)
+		logger.WARN("[#cache#] %s create worker %s key is already, %s(%s).", node.Location, node.HostName, node.IpAddr)
 		return
 	}
 
-	ret := cacheRepository.localStorage.ContainsLocationServer(node.Location, node.IpAddr, node.HostName)
+	ret := cacheRepository.nodeStore.ContainsLocationWorker(node.Location, node.IpAddr, node.HostName)
+	if ret {
+		logger.WARN("[#cache#] %s create worker %s ip or host is already, %s(%s).", node.Location, node.HostName, node.IpAddr)
+		return
+	}
+
+	ret = cacheRepository.localStorage.ContainsLocationServer(node.Location, node.IpAddr, node.HostName)
 	if ret {
 		server := models.CreateServer(key, node, 1)
 		attach := models.AttachDecode(node.Attach)
@@ -511,7 +517,7 @@ func (cacheRepository *CacheRepository) ChangeWorker(key string, node *gzkwrappe
 
 	worker := cacheRepository.nodeStore.GetWorker(key)
 	if worker == nil {
-		logger.WARN("[#cache#] %s change worker %s not found, %s(%s).", node.Location, node.HostName, node.IpAddr)
+		logger.WARN("[#cache#] %s change worker %s key is not found, %s(%s).", node.Location, node.HostName, node.IpAddr)
 		return
 	}
 

cache/nodes.go

@@ -75,6 +75,28 @@ func (store *NodeStore) GetWorker(key string) *Worker {
 	return nil
 }
 
+//ContainsLocationWorker is exported
+func (store *NodeStore) ContainsLocationWorker(location string, ipaddr string, hostname string) bool {
+
+	store.RLock()
+	defer store.RUnlock()
+	if workers, ret := store.nodesData[location]; ret {
+		for _, worker := range workers {
+			if itIPAddr := strings.TrimSpace(worker.IPAddr); itIPAddr != "" {
+				if itIPAddr == ipaddr {
+					return true
+				}
+			}
+			if itHostName := strings.TrimSpace(worker.Name); itHostName != "" {
+				if strings.ToUpper(itHostName) == strings.ToUpper(hostname) {
+					return true
+				}
+			}
+		}
+	}
+	return false
+}
+
 //GetWorkers is exported
 func (store *NodeStore) GetWorkers(location string) []*Worker {