ctripcorp/zeus
1
1
Fork 0
mirror of https://github.com/ctripcorp/zeus.git synced 2024-09-20 15:46:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug of conf cleansing job

Browse source
This commit is contained in:
Mengyi Zhou 2016-05-05 17:37:49 +08:00
parent cd4c899522
commit 5218d9458e
1 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/main/java/com/ctrip/zeus/service/clean/impl/ConfCleanFilter.java
View file

@ -8,6 +8,8 @@ import com.ctrip.zeus.service.model.EntityFactory;
import com.ctrip.zeus.service.query.SlbCriteriaQuery;
import com.netflix.config.DynamicIntProperty;
import com.netflix.config.DynamicPropertyFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -33,6 +35,7 @@ public class ConfCleanFilter implements CleanFilter {
@Resource
private EntityFactory entityFactory;
Logger logger = LoggerFactory.getLogger(this.getClass());
private static DynamicIntProperty confSaveCounts = DynamicPropertyFactory.getInstance().getIntProperty("config.save.count", 50);
@Override
@ -48,28 +51,33 @@ public class ConfCleanFilter implements CleanFilter {
servers.put(e.getKey(), ips);
}
for (Long id : slbIds) {
Set<String> ips = servers.get(id);
List<NginxServerDo> list = nginxServerDao.findAllBySlbId(id, NginxServerEntity.READSET_FULL);
long min = Long.MAX_VALUE;
for (NginxServerDo d : list) {
if (ips.contains(d.getIp())) {
if (min > d.getVersion()) min = d.getVersion();
for (Long id : mapping.keySet()) {
try {
Set<String> ips = servers.get(id);
List<NginxServerDo> list = nginxServerDao.findAllBySlbId(id, NginxServerEntity.READSET_FULL);
long min = Long.MAX_VALUE;
for (NginxServerDo d : list) {
if (ips.contains(d.getIp())) {
if (min > d.getVersion()) min = d.getVersion();
}
}
// delete at most 20,000 rows per slb
int retainedMinVersion = (int) min - confSaveCounts.get();
for (int i = 0; i < 20; i++) {
if (nginxConfDao.deleteBySlbIdLessThanVersion(new NginxConfDo().setVersion(retainedMinVersion).setSlbId(id)) == 0) {
break;
}
}
for (int i = 0; i < 20; i++) {
if (nginxConfSlbDao.deleteBySlbIdLessThanVersion(new NginxConfSlbDo().setSlbId(id).setVersion(retainedMinVersion)) == 0) {
break;
}
}
} catch (Exception ex) {
logger.error("Cleanse conf files failed of slb " + id, ex);
}
// delete at most 20,000 rows per slb
int retainedMinVersion = (int) min - confSaveCounts.get();
for (int i = 0; i < 20; i++) {
if (nginxConfDao.deleteBySlbIdLessThanVersion(new NginxConfDo().setVersion(retainedMinVersion).setSlbId(id)) == 0) {
break;
}
}
for (int i = 0; i < 20; i++) {
if (nginxConfSlbDao.deleteBySlbIdLessThanVersion(new NginxConfSlbDo().setSlbId(id).setVersion(retainedMinVersion)) == 0) {
break;
}
}
}
for (Long slbId : slbIds) {