zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #150

Browse Source
This commit is contained in:
nkorange 2018-10-24 17:52:55 +08:00
parent 2e36f7f397
commit e3276d0114
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java
View File

@ -35,6 +35,7 @@ import org.springframework.stereotype.Component;
import java.util.*; import java.util.*;
import java.util.concurrent.*; import java.util.concurrent.*;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
@ -58,6 +59,8 @@ public class DomainsManager {
private final Lock lock = new ReentrantLock(); private final Lock lock = new ReentrantLock();
private Map<String, Condition> dom2ContionMap = new ConcurrentHashMap<>();
private Map<String, Lock> dom2LockMap = new ConcurrentHashMap<>(); private Map<String, Lock> dom2LockMap = new ConcurrentHashMap<>();
/** /**
@ -651,18 +654,22 @@ public class DomainsManager {
dom2LockMap.put(dom.getName(), new ReentrantLock()); dom2LockMap.put(dom.getName(), new ReentrantLock());
} }
Lock lock = dom2LockMap.get(dom.getName());
synchronized (lock) {
raftDomMap.put(dom.getName(), dom); raftDomMap.put(dom.getName(), dom);
dom.init(); dom.init();
lock.notifyAll();
}
Loggers.SRV_LOG.info("[NEW-DOM-raft] " + dom.toJSON()); Loggers.SRV_LOG.info("[NEW-DOM-raft] " + dom.toJSON());
} }
Lock lock = dom2LockMap.get(dom.getName());
Condition condition = dom2ContionMap.get(dom.getName());
try {
lock.lock();
condition.signalAll();
} finally {
lock.unlock();
}
} catch (Throwable e) { } catch (Throwable e) {
Loggers.SRV_LOG.error("VIPSRV-DOM", "error while processing dom update", e); Loggers.SRV_LOG.error("VIPSRV-DOM", "error while processing dom update", e);
} }
@ -690,6 +697,12 @@ public class DomainsManager {
return lock; return lock;
} }
public Condition addCondtion(String domName) {
Condition condition = dom2LockMap.get(domName).newCondition();
dom2ContionMap.put(domName, condition);
return condition;
}
public Map<String, Domain> getDomMap() { public Map<String, Domain> getDomMap() {
return new HashMap<String, Domain>(domMap); return new HashMap<String, Domain>(domMap);
} }