You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/02 19:19:04 UTC
[1/6] git commit: log Initializing at info
Updated Branches:
refs/heads/cassandra-1.2 9ff7d6f02 -> ec673ac99
refs/heads/trunk be8c9abf9 -> 532db4d24
log Initializing at info
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1172436
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1172436
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1172436
Branch: refs/heads/cassandra-1.2
Commit: a11724366d3706a5fb079c75ef844ee3c808ac90
Parents: 9ff7d6f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 1 23:59:53 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 2 00:00:01 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1172436/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 81ced05..0000deb 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -223,8 +223,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
Caching caching = metadata.getCaching();
- if (logger.isDebugEnabled())
- logger.debug("Starting CFS {}", columnFamily);
+ logger.info("Initializing {}.{}", table.name, columnFamily);
// scan for sstables corresponding to this cf and load them
data = new DataTracker(this);
[4/6] git commit: add "all time blocked" to StatusLogger output patch
by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5825
Posted by jb...@apache.org.
add "all time blocked" to StatusLogger output
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5825
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec673ac9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec673ac9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec673ac9
Branch: refs/heads/trunk
Commit: ec673ac99708ba6c0d62a50f6c870d846a7435ba
Parents: a117243
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Aug 2 12:16:17 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 2 12:16:17 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/utils/StatusLogger.java | 11 ++++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec673ac9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 377b5a1..8eff1fd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
* nodetool history logging (CASSANDRA-5823)
* (Hadoop) fix support for Thrift tables in CqlPagingRecordReader
(CASSANDRA-5752)
+ * add "all time blocked" to StatusLogger output (CASSANDRA-5825)
1.2.8
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec673ac9/src/java/org/apache/cassandra/utils/StatusLogger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/StatusLogger.java b/src/java/org/apache/cassandra/utils/StatusLogger.java
index 4cb7898..cf5c5fa 100644
--- a/src/java/org/apache/cassandra/utils/StatusLogger.java
+++ b/src/java/org/apache/cassandra/utils/StatusLogger.java
@@ -50,7 +50,7 @@ public class StatusLogger
MBeanServer server = ManagementFactory.getPlatformMBeanServer();
// everything from o.a.c.concurrent
- logger.info(String.format("%-25s%10s%10s%10s", "Pool Name", "Active", "Pending", "Blocked"));
+ logger.info(String.format("%-25s%10s%10s%15s%10s%18s", "Pool Name", "Active", "Pending", "Completed", "Blocked", "All Time Blocked"));
Set<ObjectName> request, internal;
try
{
@@ -65,8 +65,13 @@ public class StatusLogger
{
String poolName = objectName.getKeyProperty("type");
JMXEnabledThreadPoolExecutorMBean threadPoolProxy = JMX.newMBeanProxy(server, objectName, JMXEnabledThreadPoolExecutorMBean.class);
- logger.info(String.format("%-25s%10s%10s%10s",
- poolName, threadPoolProxy.getActiveCount(), threadPoolProxy.getPendingTasks(), threadPoolProxy.getCurrentlyBlockedTasks()));
+ logger.info(String.format("%-25s%10s%10s%15s%10s%18s",
+ poolName,
+ threadPoolProxy.getActiveCount(),
+ threadPoolProxy.getPendingTasks(),
+ threadPoolProxy.getCompletedTasks(),
+ threadPoolProxy.getCurrentlyBlockedTasks(),
+ threadPoolProxy.getTotalBlockedTasks()));
}
// one offs
CompactionManager cm = CompactionManager.instance;
[6/6] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/532db4d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/532db4d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/532db4d2
Branch: refs/heads/trunk
Commit: 532db4d24e96da7a65c104c4382d0097bd41037e
Parents: aa2936a ec673ac
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Aug 2 12:19:01 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 2 12:19:01 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/utils/StatusLogger.java | 11 ++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/532db4d2/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/532db4d2/src/java/org/apache/cassandra/utils/StatusLogger.java
----------------------------------------------------------------------
[2/6] git commit: log Initializing at info
Posted by jb...@apache.org.
log Initializing at info
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1172436
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1172436
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1172436
Branch: refs/heads/trunk
Commit: a11724366d3706a5fb079c75ef844ee3c808ac90
Parents: 9ff7d6f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 1 23:59:53 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 2 00:00:01 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1172436/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 81ced05..0000deb 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -223,8 +223,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
Caching caching = metadata.getCaching();
- if (logger.isDebugEnabled())
- logger.debug("Starting CFS {}", columnFamily);
+ logger.info("Initializing {}.{}", table.name, columnFamily);
// scan for sstables corresponding to this cf and load them
data = new DataTracker(this);
[3/6] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa2936a8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa2936a8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa2936a8
Branch: refs/heads/trunk
Commit: aa2936a89c9ad2047a3632b8dd6775e6e8c984d0
Parents: be8c9ab a117243
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Aug 2 00:00:56 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 2 00:00:56 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa2936a8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 5b00656,0000deb..7b11672
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -250,8 -223,7 +250,7 @@@ public class ColumnFamilyStore implemen
Caching caching = metadata.getCaching();
- if (logger.isDebugEnabled())
- logger.debug("Starting CFS {}", name);
- logger.info("Initializing {}.{}", table.name, columnFamily);
++ logger.info("Initializing {}.{}", keyspace.getName(), name);
// scan for sstables corresponding to this cf and load them
data = new DataTracker(this);
[5/6] git commit: add "all time blocked" to StatusLogger output patch
by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5825
Posted by jb...@apache.org.
add "all time blocked" to StatusLogger output
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5825
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec673ac9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec673ac9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec673ac9
Branch: refs/heads/cassandra-1.2
Commit: ec673ac99708ba6c0d62a50f6c870d846a7435ba
Parents: a117243
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Aug 2 12:16:17 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Aug 2 12:16:17 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/utils/StatusLogger.java | 11 ++++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec673ac9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 377b5a1..8eff1fd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
* nodetool history logging (CASSANDRA-5823)
* (Hadoop) fix support for Thrift tables in CqlPagingRecordReader
(CASSANDRA-5752)
+ * add "all time blocked" to StatusLogger output (CASSANDRA-5825)
1.2.8
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec673ac9/src/java/org/apache/cassandra/utils/StatusLogger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/StatusLogger.java b/src/java/org/apache/cassandra/utils/StatusLogger.java
index 4cb7898..cf5c5fa 100644
--- a/src/java/org/apache/cassandra/utils/StatusLogger.java
+++ b/src/java/org/apache/cassandra/utils/StatusLogger.java
@@ -50,7 +50,7 @@ public class StatusLogger
MBeanServer server = ManagementFactory.getPlatformMBeanServer();
// everything from o.a.c.concurrent
- logger.info(String.format("%-25s%10s%10s%10s", "Pool Name", "Active", "Pending", "Blocked"));
+ logger.info(String.format("%-25s%10s%10s%15s%10s%18s", "Pool Name", "Active", "Pending", "Completed", "Blocked", "All Time Blocked"));
Set<ObjectName> request, internal;
try
{
@@ -65,8 +65,13 @@ public class StatusLogger
{
String poolName = objectName.getKeyProperty("type");
JMXEnabledThreadPoolExecutorMBean threadPoolProxy = JMX.newMBeanProxy(server, objectName, JMXEnabledThreadPoolExecutorMBean.class);
- logger.info(String.format("%-25s%10s%10s%10s",
- poolName, threadPoolProxy.getActiveCount(), threadPoolProxy.getPendingTasks(), threadPoolProxy.getCurrentlyBlockedTasks()));
+ logger.info(String.format("%-25s%10s%10s%15s%10s%18s",
+ poolName,
+ threadPoolProxy.getActiveCount(),
+ threadPoolProxy.getPendingTasks(),
+ threadPoolProxy.getCompletedTasks(),
+ threadPoolProxy.getCurrentlyBlockedTasks(),
+ threadPoolProxy.getTotalBlockedTasks()));
}
// one offs
CompactionManager cm = CompactionManager.instance;