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

Merge pull request #152 from hxy1991/master

Browse Source 
fixes #92
This commit is contained in:
Keep 2018-10-30 21:16:09 +08:00 committed by GitHub
commit ede4111300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/src/main/java/com/alibaba/nacos/config/server/aspect/CapacityManagementAspect.java
View File

@ -425,9 +425,7 @@ public class CapacityManagementAspect {
OVER_CLUSTER_QUOTA("超过集群配置个数上限", 429),
OVER_GROUP_QUOTA("超过该Group配置个数上限", 429),
OVER_TENANT_QUOTA("超过该租户配置个数上限", 429),
OVER_MAX_SIZE("超过配置的内容大小上限", 429),
OVER_MAX_AGGR_COUNT("超过聚合子配置个数上限", 429),
OVER_MAX_AGGR_SIZE("超过聚合数据子配置的内容大小上限", 429);
OVER_MAX_SIZE("超过配置的内容大小上限", 429);
public final String description;
public final int status;

10
config/src/main/java/com/alibaba/nacos/config/server/aspect/RequestLogAspect.java
View File

@ -40,17 +40,17 @@ public class RequestLogAspect {
/**
* publish config
*/
public static final String CLIENT_INTERFACE_PUBLISH_SINGLE_CONFIG = "execution(* com.alibaba.nacos.config.server.controller.ConfigController.publishConfig(..)) && args(request,response,dataId,group,tenant,content,..)";
private static final String CLIENT_INTERFACE_PUBLISH_SINGLE_CONFIG = "execution(* com.alibaba.nacos.config.server.controller.ConfigController.publishConfig(..)) && args(request,response,dataId,group,tenant,content,..)";
/**
* get config
*/
public static final String CLIENT_INTERFACE_GET_CONFIG = "execution(* com.alibaba.nacos.config.server.controller.ConfigController.getConfig(..)) && args(request,response,dataId,group,tenant,..)";
private static final String CLIENT_INTERFACE_GET_CONFIG = "execution(* com.alibaba.nacos.config.server.controller.ConfigController.getConfig(..)) && args(request,response,dataId,group,tenant,..)";
/**
* remove config
*/
public static final String CLIENT_INTERFACE_REMOVE_ALL_CONFIG = "execution(* com.alibaba.nacos.config.server.controller.ConfigController.deleteConfig(..)) && args(request,response,dataId,group,..)";
private static final String CLIENT_INTERFACE_REMOVE_ALL_CONFIG = "execution(* com.alibaba.nacos.config.server.controller.ConfigController.deleteConfig(..)) && args(request,response,dataId,group,..)";
/**
* publishSingle
@ -95,8 +95,8 @@ public class RequestLogAspect {
final long rt = System.currentTimeMillis() - st;
// rt | status | requestIp | opType | dataId | group | datumId | md5 |
// appName
LogUtil.clientLog.info("{}|{}|{}|{}|{}|{}|{}|{}|{}",
new Object[] { rt, retVal, requestIp, requestType, dataId, group, tenant, md5, appName });
LogUtil.clientLog.info("{}|{}|{}|{}|{}|{}|{}|{}|{}", rt, retVal, requestIp, requestType, dataId, group, tenant,
md5, appName);
return retVal;
}

8
config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpService.java
View File

@ -333,7 +333,8 @@ public class DumpService {
Page<ConfigInfoAggr> page = persistService.findConfigInfoAggrByPage(dataId, group, tenant, pageNo, PAGE_SIZE);
if (page != null) {
datumList.addAll(page.getPageItems());
log.info("[merge-query] {}, {}, size/total={}/{}", new Object[] { dataId, group, datumList.size(), rowCount });
log.info("[merge-query] {}, {}, size/total={}/{}", dataId, group, datumList.size(),
rowCount);
}
}
@ -346,8 +347,9 @@ public class DumpService {
String aggrConetentMD5 = MD5.getInstance().getMD5String(aggrContent);
if(!StringUtils.equals(localContentMD5, aggrConetentMD5)){
persistService.insertOrUpdate(null, null, cf, time, null, false);
log.info("[merge-ok] {}, {}, size={}, length={}, md5={}, content={}", new Object[] { dataId, group, datumList.size(),
cf.getContent().length(), cf.getMd5(), ContentUtils.truncateContent(cf.getContent()) });
log.info("[merge-ok] {}, {}, size={}, length={}, md5={}, content={}", dataId, group,
datumList.size(), cf.getContent().length(), cf.getMd5(),
ContentUtils.truncateContent(cf.getContent()));
}
}
// 删除

15
config/src/main/java/com/alibaba/nacos/config/server/service/dump/DumpTask.java
View File

@ -270,8 +270,7 @@ class DumpAllProcessor implements TaskProcessor {
final String content = cf.getContent();
final String md5 = MD5.getInstance().getMD5String(content);
LogUtil.dumpLog.info("[dump-all-ok] {}, {}, length={}, md5={}",
new Object[] { GroupKey2.getKey(cf.getDataId(), cf.getGroup()), cf.getLastModified(),
content.length(), md5 });
GroupKey2.getKey(cf.getDataId(), cf.getGroup()), cf.getLastModified(), content.length(), md5);
}
defaultLog.info("[all-dump] {} / {}", lastMaxId, currentMaxId);
} else {
@ -307,9 +306,9 @@ class DumpAllBetaProcessor implements TaskProcessor {
for (ConfigInfoBetaWrapper cf : page.getPageItems()) {
boolean result = ConfigService.dumpBeta(cf.getDataId(), cf.getGroup(), cf.getTenant(),
cf.getContent(), cf.getLastModified(), cf.getBetaIps());
LogUtil.dumpLog.info("[dump-all-beta-ok] result={}, {}, {}, length={}, md5={}",
new Object[] { result, GroupKey2.getKey(cf.getDataId(), cf.getGroup()),
cf.getLastModified(), cf.getContent().length(), cf.getMd5() });
LogUtil.dumpLog.info("[dump-all-beta-ok] result={}, {}, {}, length={}, md5={}", result,
GroupKey2.getKey(cf.getDataId(), cf.getGroup()), cf.getLastModified(), cf.getContent()
.length(), cf.getMd5());
}
actualRowCount += page.getPageItems().size();
@ -345,9 +344,9 @@ class DumpAllTagProcessor implements TaskProcessor {
for (ConfigInfoTagWrapper cf : page.getPageItems()) {
boolean result = ConfigService.dumpTag(cf.getDataId(), cf.getGroup(), cf.getTenant(), cf.getTag(),
cf.getContent(), cf.getLastModified());
LogUtil.dumpLog.info("[dump-all-Tag-ok] result={}, {}, {}, length={}, md5={}",
new Object[] { result, GroupKey2.getKey(cf.getDataId(), cf.getGroup()),
cf.getLastModified(), cf.getContent().length(), cf.getMd5() });
LogUtil.dumpLog.info("[dump-all-Tag-ok] result={}, {}, {}, length={}, md5={}", result,
GroupKey2.getKey(cf.getDataId(), cf.getGroup()), cf.getLastModified(), cf.getContent()
.length(), cf.getMd5());
}
actualRowCount += page.getPageItems().size();

8
config/src/main/java/com/alibaba/nacos/config/server/service/merge/MergeDatumService.java
View File

@ -115,7 +115,8 @@ public class MergeDatumService {
Page<ConfigInfoAggr> page = persistService.findConfigInfoAggrByPage(dataId, group, tenant, pageNo, PAGE_SIZE);
if (page != null) {
datumList.addAll(page.getPageItems());
log.info("[merge-query] {}, {}, size/total={}/{}", new Object[] { dataId, group, datumList.size(), rowCount });
log.info("[merge-query] {}, {}, size/total={}/{}", dataId, group, datumList.size(),
rowCount);
}
}
@ -124,8 +125,9 @@ public class MergeDatumService {
if (datumList.size() > 0) {
ConfigInfo cf = MergeTaskProcessor.merge(dataId, group, tenant, datumList);
persistService.insertOrUpdate(null, null, cf, time, null, false);
log.info("[merge-ok] {}, {}, size={}, length={}, md5={}, content={}", new Object[] { dataId, group, datumList.size(),
cf.getContent().length(), cf.getMd5(), ContentUtils.truncateContent(cf.getContent()) });
log.info("[merge-ok] {}, {}, size={}, length={}, md5={}, content={}", dataId, group,
datumList.size(), cf.getContent().length(), cf.getMd5(),
ContentUtils.truncateContent(cf.getContent()));
}
// 删除
else {

8
config/src/main/java/com/alibaba/nacos/config/server/service/merge/MergeTaskProcessor.java
View File

@ -67,8 +67,7 @@ public class MergeTaskProcessor implements TaskProcessor {
PAGE_SIZE);
if (page != null) {
datumList.addAll(page.getPageItems());
log.info("[merge-query] {}, {}, size/total={}/{}",
new Object[] { dataId, group, datumList.size(), rowCount });
log.info("[merge-query] {}, {}, size/total={}/{}", dataId, group, datumList.size(), rowCount);
}
}
@ -79,9 +78,8 @@ public class MergeTaskProcessor implements TaskProcessor {
persistService.insertOrUpdate(null, null, cf, time, null);
log.info("[merge-ok] {}, {}, size={}, length={}, md5={}, content={}", new Object[] {
dataId, group, datumList.size(), cf.getContent().length(), cf.getMd5(),
ContentUtils.truncateContent(cf.getContent()) });
log.info("[merge-ok] {}, {}, size={}, length={}, md5={}, content={}", dataId, group, datumList.size(),
cf.getContent().length(), cf.getMd5(), ContentUtils.truncateContent(cf.getContent()));
ConfigTraceService.logPersistenceEvent(dataId, group, tenant, null, time.getTime(), SystemConfig.LOCAL_IP, ConfigTraceService.PERSISTENCE_EVENT_MERGE, cf.getContent());
}