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

Fix beat info null bug

Browse Source
This commit is contained in:
nkorange 2019-07-05 12:48:13 +08:00
parent 1aa7711340
commit 7c0e12d6fe
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
View File

@ -238,7 +238,9 @@ public class NacosNamingService implements NamingService {
@Override @Override
public void deregisterInstance(String serviceName, String groupName, Instance instance) throws NacosException { public void deregisterInstance(String serviceName, String groupName, Instance instance) throws NacosException {
beatReactor.removeBeatInfo(NamingUtils.getGroupedName(serviceName, groupName), instance.getIp(), instance.getPort()); if (instance.isEphemeral()) {
beatReactor.removeBeatInfo(NamingUtils.getGroupedName(serviceName, groupName), instance.getIp(), instance.getPort());
}
serverProxy.deregisterService(NamingUtils.getGroupedName(serviceName, groupName), instance); serverProxy.deregisterService(NamingUtils.getGroupedName(serviceName, groupName), instance);
} }

3
client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
View File

@ -64,6 +64,9 @@ public class BeatReactor {
public void removeBeatInfo(String serviceName, String ip, int port) { public void removeBeatInfo(String serviceName, String ip, int port) {
NAMING_LOGGER.info("[BEAT] removing beat: {}:{}:{} from beat map.", serviceName, ip, port); NAMING_LOGGER.info("[BEAT] removing beat: {}:{}:{} from beat map.", serviceName, ip, port);
BeatInfo beatInfo = dom2Beat.remove(buildKey(serviceName, ip, port)); BeatInfo beatInfo = dom2Beat.remove(buildKey(serviceName, ip, port));
if (beatInfo == null) {
return;
}
beatInfo.setStopped(true); beatInfo.setStopped(true);
MetricsMonitor.getDom2BeatSizeMonitor().set(dom2Beat.size()); MetricsMonitor.getDom2BeatSizeMonitor().set(dom2Beat.size());
} }