[ASTERIXDB-3307][*DB] Better logging to identify query requests
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
Use both request UUID and clientContextID for logs identifying
query requests.
Change-Id: I1154a478281e8c757178c0c826ce8d68699c4a08
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17942
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Ali Alsuliman <ali.al.solaiman@gmail.com>
Reviewed-by: Murtadha Hubail <mhubail@apache.org>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
index 6678c52..a33102c 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
@@ -278,7 +278,10 @@
if (forceReadOnly) {
param.setReadOnly(true);
}
- LOGGER.info(() -> "handleRequest: " + LogRedactionUtil.statement(param.toString()));
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("handleRequest: uuid={}, clientContextID={}, {}", requestRef.getUuid(),
+ param.getClientContextID(), LogRedactionUtil.statement(param.toString()));
+ }
delivery = param.getMode();
setSessionConfig(sessionOutput, param, delivery);
final ResultProperties resultProperties = new ResultProperties(delivery, param.getMaxResultReads());
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java
index 05bc87b..e314177 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/message/ExecuteStatementRequestMessage.java
@@ -243,7 +243,8 @@
@Override
public String toString() {
- return String.format("%s(id=%s, from=%s, uuid=%s): %s", getClass().getSimpleName(), requestMessageId,
- requestNodeId, requestReference.getUuid(), LogRedactionUtil.statement(statementsText));
+ return String.format("%s(id=%s, from=%s, uuid=%s, clientContextID=%s): %s", getClass().getSimpleName(),
+ requestMessageId, requestNodeId, requestReference.getUuid(), clientContextID,
+ LogRedactionUtil.statement(statementsText));
}
}
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index c2be64f..8c750b0 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -5337,9 +5337,9 @@
}
}
jobId = JobUtils.runJob(hcc, jobSpec, jobFlags, false);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("createAndRunJob jobId:{}, uuid:{}", jobId,
- requestParameters.getRequestReference().getUuid());
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("Created job {} for query uuid:{}, clientContextID:{}", jobId,
+ requestParameters.getRequestReference().getUuid(), requestParameters.getClientContextId());
}
clientRequest.setJobId(jobId);
if (jId != null) {