You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/04/13 05:12:26 UTC
[incubator-linkis] branch dev-1.1.2 updated: Add the log of the ContextService module (#1959)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.2 by this push:
new 0de5b53c9 Add the log of the ContextService module (#1959)
0de5b53c9 is described below
commit 0de5b53c99a67c6952be7b78cfe257a174afb8c2
Author: peacewong <wp...@gmail.com>
AuthorDate: Wed Apr 13 13:12:21 2022 +0800
Add the log of the ContextService module (#1959)
* add cs-cache module log
---
.../cs/contextcache/cache/DefaultContextCache.java | 5 +++--
.../cache/csid/impl/ContextIDValueImpl.java | 5 +++--
.../cs/client/service/CSMetaDataService.java | 1 +
.../cs/client/service/CSNodeServiceImpl.java | 1 +
.../cs/client/service/CSResourceService.java | 2 ++
.../cs/client/service/CSResultDataServiceImpl.java | 6 ++++++
.../linkis/cs/client/service/CSTableService.java | 24 ++++++++++++++++++++++
.../cs/client/service/CSVariableService.java | 11 ++++++++++
.../cs/client/service/CSWorkServiceImpl.java | 1 +
.../client/service/LinkisJobDataServiceImpl.java | 15 +++++++++++++-
.../execution/ruler/NearestContextSearchRuler.java | 5 ++++-
.../cs/server/service/impl/ContextServiceImpl.java | 4 ++++
12 files changed, 74 insertions(+), 6 deletions(-)
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java
index 662abbd4a..feb06b84b 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java
@@ -119,6 +119,7 @@ public class DefaultContextCache implements ContextCache, CSIDListener {
public void put(ContextIDValue contextIDValue) throws CSErrorException {
if (contextIDValue != null && StringUtils.isNotBlank(contextIDValue.getContextID())) {
+ logger.info("update contextID:{}", contextIDValue.getContextID());
cache.put(contextIDValue.getContextID(), contextIDValue);
}
}
@@ -181,14 +182,14 @@ public class DefaultContextCache implements ContextCache, CSIDListener {
logger.info("deal contextID ADD event of {}", contextIDEvent.getContextID());
getContextCacheMetric().addCount();
getContextCacheMetric().setCachedCount(getContextCacheMetric().getCachedCount() + 1);
- logger.info("Now, The cachedCount is (%d)", getContextCacheMetric().getCachedCount());
+ logger.info("Now, The cachedCount is ({})", getContextCacheMetric().getCachedCount());
}
@Override
public void onCSIDRemoved(ContextIDEvent contextIDEvent) {
logger.info("deal contextID remove event of {}", contextIDEvent.getContextID());
getContextCacheMetric().setCachedCount(getContextCacheMetric().getCachedCount() - 1);
- logger.info("Now, The cachedCount is (%d)", getContextCacheMetric().getCachedCount());
+ logger.info("Now, The cachedCount is ({})", getContextCacheMetric().getCachedCount());
}
@Override
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java
index 14b0169af..ae81627c2 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java
@@ -106,8 +106,9 @@ public class ContextIDValueImpl implements ContextIDValue, CSKeyListener {
this.contextIDMetric.setMemory(getContextIDMetric().getMemory() - size);
}
logger.info(
- "Now, The Memory of ContextID({}) are %d",
- contextID, getContextIDMetric().getMemory());
+ "Now, The Memory of ContextID({}) are {}",
+ contextID,
+ getContextIDMetric().getMemory());
logger.debug("Finished to deal csKeyEvent of csID({})", this.contextID);
}
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java
index 016f2deea..9f49e454f 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java
@@ -55,6 +55,7 @@ public class CSMetaDataService implements MetaDataService {
public Map<ContextKey, MetaData> getAllUpstreamMetaData(String contextIDStr, String nodeName)
throws CSErrorException {
if (StringUtils.isBlank(contextIDStr) || StringUtils.isBlank(nodeName)) {
+ logger.warn("contextIDStr or nodeName cannot null");
return null;
}
try {
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java
index e2a1d5e6c..a3d31c5dc 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java
@@ -56,6 +56,7 @@ public class CSNodeServiceImpl implements CSNodeService {
ContextID contextID = SerializeHelper.deserializeContextID(contextIDStr);
contextClient.removeAllValueByKeyPrefixAndContextType(
contextID, ContextType.METADATA, CSCommonUtils.NODE_PREFIX + ndeName);
+ logger.info("contextIDStr: {} and nodeName: {} init cs info", contextIDStr, ndeName);
} catch (Exception e) {
logger.error("Failed to init node cs Info", e);
}
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java
index cb2afb1e0..0aeb1f209 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java
@@ -57,6 +57,7 @@ public class CSResourceService implements ResourceService {
public Map<ContextKey, BMLResource> getAllUpstreamBMLResource(
String contextIDStr, String nodeName) throws CSErrorException {
if (StringUtils.isBlank(contextIDStr) || StringUtils.isBlank(nodeName)) {
+ logger.warn("contextIDStr or nodeName cannot null");
return null;
}
try {
@@ -80,6 +81,7 @@ public class CSResourceService implements ResourceService {
throws CSErrorException {
List<BMLResource> rsList = new ArrayList<>();
if (StringUtils.isBlank(contextIDStr) || StringUtils.isBlank(nodeName)) {
+ logger.warn("contextIDStr or nodeName cannot null");
return rsList;
}
try {
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java
index b149171e8..e9904a126 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java
@@ -62,6 +62,7 @@ public class CSResultDataServiceImpl implements CSResultDataService {
public CSResultData getCSResultData(String contextIDStr, String contextKeyStr)
throws CSErrorException {
if (StringUtils.isBlank(contextIDStr) || StringUtils.isBlank(contextKeyStr)) {
+ logger.warn("contextIDStr or nodeName cannot null");
return null;
}
try {
@@ -99,6 +100,10 @@ public class CSResultDataServiceImpl implements CSResultDataService {
ContextValue contextValue = new CommonContextValue();
contextValue.setValue(csResultData);
contextClient.update(contextID, contextKey, contextValue);
+ logger.info(
+ "succeed to update cs result data,contextIDStr: {}, contextKeyStr: {}",
+ contextKey,
+ contextKeyStr);
} catch (ErrorException e) {
logger.error("Deserialize error. e ", e);
throw new CSErrorException(
@@ -111,6 +116,7 @@ public class CSResultDataServiceImpl implements CSResultDataService {
throws CSErrorException {
List<CSResultData> rsList = new ArrayList<>();
if (StringUtils.isBlank(contextIDStr) || StringUtils.isBlank(nodeName)) {
+ logger.warn("contextIDStr or nodeName cannot null");
return rsList;
}
try {
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java
index d66aaa442..37e33e2ba 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java
@@ -61,12 +61,18 @@ public class CSTableService implements TableService {
@Override
public CSTable getCSTable(ContextID contextID, ContextKey contextKey) throws CSErrorException {
if (null == contextID || null == contextKey) {
+ logger.warn("contextIDStr or nodeName cannot null");
return null;
}
if (contextID instanceof CombinedNodeIDContextID) {
contextID = ((CombinedNodeIDContextID) contextID).getLinkisHaWorkFlowContextID();
}
CSTable csTable = searchService.getContextValue(contextID, contextKey, CSTable.class);
+ logger.info(
+ "contextID: {} and contextKey: {} succeed to get table tableName {}",
+ contextID.getContextId(),
+ contextKey.getKey(),
+ csTable.getName());
return csTable;
}
@@ -75,6 +81,7 @@ public class CSTableService implements TableService {
throws CSErrorException {
List<CSTable> rsList = new ArrayList<>();
if (StringUtils.isBlank(contextIDStr) || StringUtils.isBlank(nodeName)) {
+ logger.warn("contextIDStr or nodeName cannot null");
return rsList;
}
try {
@@ -88,6 +95,11 @@ public class CSTableService implements TableService {
searchService.searchUpstreamContext(
contextID, nodeName, Integer.MAX_VALUE, CSTable.class);
}
+ logger.info(
+ "contextID: {} and nodeName: {} succeed to get tables size {}",
+ contextID.getContextId(),
+ nodeName,
+ rsList.size());
return rsList;
} catch (ErrorException e) {
logger.error("Deserialize contextID error. contextIDStr : " + contextIDStr);
@@ -100,6 +112,7 @@ public class CSTableService implements TableService {
throws CSErrorException {
CSTable csTable = null;
if (StringUtils.isBlank(contextIDStr) || StringUtils.isBlank(nodeName)) {
+ logger.warn("contextIDStr or nodeName cannot null");
return csTable;
}
try {
@@ -110,6 +123,12 @@ public class CSTableService implements TableService {
((CombinedNodeIDContextID) contextID).getLinkisHaWorkFlowContextID();
}
csTable = searchService.searchContext(contextID, keyword, nodeName, CSTable.class);
+ logger.info(
+ "contextID: {} , nodeName: {}, keyword {} succeed to getUpstreamSuitableTable tableName {}",
+ contextID.getContextId(),
+ nodeName,
+ keyword,
+ csTable.getName());
}
} catch (ErrorException e) {
throw new CSErrorException(
@@ -149,6 +168,11 @@ public class CSTableService implements TableService {
contextID = ((CombinedNodeIDContextID) contextID).getLinkisHaWorkFlowContextID();
}
contextClient.update(contextID, contextKey, contextValue);
+ logger.info(
+ "contextID: {} , contextKeyStr: {} succeed to putCSTable tableName {}",
+ contextID.getContextId(),
+ contextKeyStr,
+ csTable.getName());
} catch (ErrorException e) {
throw new CSErrorException(ErrorCode.DESERIALIZE_ERROR, "putCSTable error ", e);
}
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java
index 6c3ae6c8b..2c770c8d0 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java
@@ -52,6 +52,7 @@ public class CSVariableService implements VariableService {
throws CSErrorException {
List<LinkisVariable> rsList = new ArrayList<>();
if (StringUtils.isBlank(contextIDStr) || StringUtils.isBlank(nodeName)) {
+ logger.warn("contextIDStr or nodeName cannot null");
return rsList;
}
try {
@@ -60,6 +61,11 @@ public class CSVariableService implements VariableService {
rsList =
searchService.searchUpstreamContext(
contextID, nodeName, Integer.MAX_VALUE, LinkisVariable.class);
+ logger.info(
+ "contextID: {} and nodeName: {} succeed to getUpstreamVariables size {}",
+ contextID.getContextId(),
+ nodeName,
+ rsList.size());
}
return rsList;
} catch (Throwable e) {
@@ -81,6 +87,11 @@ public class CSVariableService implements VariableService {
ContextValue contextValue = new CommonContextValue();
contextValue.setValue(linkisVariable);
contextClient.update(contextID, contextKey, contextValue);
+ logger.info(
+ "contextID: {} and contextKeyStr: {} succeed to putVariable {}",
+ contextID.getContextId(),
+ contextKeyStr,
+ linkisVariable.getValue());
} catch (ErrorException e) {
logger.error("Deserialize error. e ");
throw new CSErrorException(ErrorCode.DESERIALIZE_ERROR, "Deserialize error. e : ", e);
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java
index e60c8768b..d18b6b7f5 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java
@@ -68,6 +68,7 @@ public class CSWorkServiceImpl implements CSWorkService {
for (WorkType type : workTypes) {
contextClient.removeAllValueByKeyPrefix(contextID, getWorkTypePrefix(type));
}
+ logger.info("contextID: {} initContextServiceInfo", contextID.getContextId());
} catch (Exception e) {
logger.error(
"InitContextInfo error. contextIDStr : {}, workTypes : {}" + contextIDStr,
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java
index 18217e154..59be85867 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java
@@ -59,12 +59,20 @@ public class LinkisJobDataServiceImpl implements LinkisJobDataService {
public LinkisJobData getLinkisJobData(String contextIDStr, String contextKeyStr)
throws CSErrorException {
if (StringUtils.isBlank(contextIDStr) || StringUtils.isBlank(contextKeyStr)) {
+ logger.warn("contextIDStr or nodeName cannot null");
return null;
}
try {
ContextID contextID = SerializeHelper.deserializeContextID(contextIDStr);
ContextKey contextKey = SerializeHelper.deserializeContextKey(contextKeyStr);
- return searchService.getContextValue(contextID, contextKey, LinkisJobData.class);
+ LinkisJobData jobData =
+ searchService.getContextValue(contextID, contextKey, LinkisJobData.class);
+ logger.info(
+ "contextID: {} and contextKeyStr: {} succeed to getLinkisJobData {}",
+ contextID.getContextId(),
+ contextKeyStr,
+ jobData.getJobID());
+ return jobData;
} catch (ErrorException e) {
logger.error(
"Deserialize failed, invalid contextId : "
@@ -96,6 +104,11 @@ public class LinkisJobDataServiceImpl implements LinkisJobDataService {
ContextValue contextValue = new CommonContextValue();
contextValue.setValue(linkisJobData);
contextClient.update(contextID, contextKey, contextValue);
+ logger.info(
+ "contextID: {} and contextKeyStr: {} succeed to putLinkisJobData {}",
+ contextID.getContextId(),
+ contextKeyStr,
+ linkisJobData.getJobID());
} catch (ErrorException e) {
logger.error("Deserialize error. e ", e);
throw new CSErrorException(
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java
index 1cb0e0880..3dc5f4df3 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java
@@ -168,8 +168,11 @@ public class NearestContextSearchRuler extends AbstractContextSearchRuler {
? nearestCondition.getNumber()
: contextKeyValues.size();
filtered = contextKeyValues.subList(0, endIndex);
+ logger.info(
+ "Finished to NearestContextSearchRuler nearest nodes based on flow info: \n, filtered size {}"
+ + BDPJettyServerHelper.gson().toJson(csFlowInfos),
+ filtered.size());
}
-
return filtered;
}
}
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java
index 365b52106..c273335b1 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java
@@ -74,6 +74,10 @@ public class ContextServiceImpl extends ContextService {
// 从缓存取即可,缓存中无会去数据库中拉取
ContextKeyValue keyValue = contextCacheService.get(contextID, contextKey);
if (keyValue == null) {
+ logger.info(
+ "getContextValue is null contextId: {}, key: {}",
+ contextID.getContextId(),
+ contextKey.getKey());
return null;
}
logger.info(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org