You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2016/10/19 22:48:28 UTC
asterixdb git commit: Make Lock Manager Statistics at FINE granularity
Repository: asterixdb
Updated Branches:
refs/heads/master b3ebc4547 -> 9cfa4dd84
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 <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/9cfa4dd8
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/9cfa4dd8
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/9cfa4dd8
Branch: refs/heads/master
Commit: 9cfa4dd846cd2c931fa900df950cf9ea075e0047
Parents: b3ebc45
Author: Ian Maxon <im...@apache.org>
Authored: Wed Oct 19 13:31:11 2016 -0700
Committer: Ian Maxon <im...@apache.org>
Committed: Wed Oct 19 15:47:35 2016 -0700
----------------------------------------------------------------------
.../src/main/resources/events/cc_start/cc_start.sh | 9 ++++++++-
.../src/main/resources/events/node_join/nc_join.sh | 8 +++++++-
.../management/service/locking/ConcurrentLockManager.java | 4 ++--
3 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9cfa4dd8/asterixdb/asterix-events/src/main/resources/events/cc_start/cc_start.sh
----------------------------------------------------------------------
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 @@ then
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
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9cfa4dd8/asterixdb/asterix-events/src/main/resources/events/node_join/nc_join.sh
----------------------------------------------------------------------
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 @@ fi
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
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9cfa4dd8/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java
----------------------------------------------------------------------
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 @@ public class ConcurrentLockManager implements ILockManager, ILifeCycleComponent
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 @@ public class ConcurrentLockManager implements ILockManager, ILifeCycleComponent
}
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