Ian Maxon has submitted this change and it was merged. Change subject: Make Lock Manager Statistics at FINE granularity ......................................................................
Make Lock Manager Statistics at FINE granularity It seems like in some scenarios the Lock manager can output a large volume of logs and this can get excessive quickly. Our default level is at INFO so I thought FINE might be more appropriate. I also made the Managix Log append rather than clobber the old logs. Change-Id: Id26ac346a5fa1410e1b74a4fa88ae9f45f791be2 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1303 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]> --- M asterixdb/asterix-events/src/main/resources/events/cc_start/cc_start.sh M asterixdb/asterix-events/src/main/resources/events/node_join/nc_join.sh M asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java 3 files changed, 17 insertions(+), 4 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified; No violations found; Verified diff --git a/asterixdb/asterix-events/src/main/resources/events/cc_start/cc_start.sh b/asterixdb/asterix-events/src/main/resources/events/cc_start/cc_start.sh index b7481e9..c761744 100644 --- a/asterixdb/asterix-events/src/main/resources/events/cc_start/cc_start.sh +++ b/asterixdb/asterix-events/src/main/resources/events/cc_start/cc_start.sh @@ -67,4 +67,11 @@ ccArgs=$ccArgs' -cc-root '$CC_ROOT fi cd $WORKING_DIR -$ASTERIX_HOME/bin/asterixcc echo $ccArgs &> $LOG_DIR/cc.log \ No newline at end of file +DATE=`date` + +cat <<EOF >> $LOG_DIR/cc.log +-------------------------------------------------------------------------------- +LOG START: $DATE +-------------------------------------------------------------------------------- +EOF +$ASTERIX_HOME/bin/asterixcc echo $ccArgs &>> $LOG_DIR/cc.log \ No newline at end of file diff --git a/asterixdb/asterix-events/src/main/resources/events/node_join/nc_join.sh b/asterixdb/asterix-events/src/main/resources/events/node_join/nc_join.sh index 4884872..1a3de9a 100644 --- a/asterixdb/asterix-events/src/main/resources/events/node_join/nc_join.sh +++ b/asterixdb/asterix-events/src/main/resources/events/node_join/nc_join.sh @@ -28,4 +28,10 @@ cd $WORKING_DIR -$ASTERIX_HOME/bin/asterixnc -node-id $NC_ID -cc-host $CC_HOST -cc-port $CLUSTER_NET_PORT -cluster-net-ip-address $IP_LOCATION -data-ip-address $IP_LOCATION -iodevices $IO_DEVICES -result-ip-address $IP_LOCATION -- $INITIAL_RUN_FLAG &> $LOG_DIR/${NC_ID}.log +DATE=`date` +cat <<EOF >> $LOG_DIR/${NC_ID}.log +-------------------------------------------------------------------------------- +LOG START: $DATE +-------------------------------------------------------------------------------- +EOF +$ASTERIX_HOME/bin/asterixnc -node-id $NC_ID -cc-host $CC_HOST -cc-port $CLUSTER_NET_PORT -cluster-net-ip-address $IP_LOCATION -data-ip-address $IP_LOCATION -iodevices $IO_DEVICES -result-ip-address $IP_LOCATION -- $INITIAL_RUN_FLAG &>> $LOG_DIR/${NC_ID}.log diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java index 8dcc1be..faec2ed 100644 --- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java +++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java @@ -555,7 +555,7 @@ LOGGER.finer("del job slot " + TypeUtil.Global.toString(jobSlot)); jobArenaMgr.deallocate(jobSlot); jobId2JobSlotMap.remove(jobId); - stats.logCounters(LOGGER, Level.INFO, true); + stats.logCounters(LOGGER, Level.FINE, true); } private long findOrAllocJobSlot(int jobId) { @@ -662,7 +662,7 @@ } private long findResourceInGroup(ResourceGroup group, int dsId, int entityHashValue) { - stats.logCounters(LOGGER, Level.INFO, false); + stats.logCounters(LOGGER, Level.FINE, false); long resSlot = group.firstResourceIndex.get(); while (resSlot != NILL) { // either we already have a lock on this resource or we have a -- To view, visit https://asterix-gerrit.ics.uci.edu/1303 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id26ac346a5fa1410e1b74a4fa88ae9f45f791be2 Gerrit-PatchSet: 6 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Jianfeng Jia <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
