Repository: cassandra Updated Branches: refs/heads/trunk 56d81ac53 -> a2b1b8abc
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a849efe/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index e57208a..af56c3a 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -984,7 +984,7 @@ public class StorageProxy implements StorageProxyMBean int ttl = HintedHandOffManager.calculateHintTTL(mutation); if (ttl > 0) { - logger.debug("Adding hint for {}", target); + logger.trace("Adding hint for {}", target); writeHintForMutation(mutation, System.currentTimeMillis(), ttl, target); // Notify the handler only for CL == ANY if (responseHandler != null && responseHandler.consistencyLevel == ConsistencyLevel.ANY) @@ -1390,8 +1390,8 @@ public class StorageProxy implements StorageProxyMBean rows.add(row); } - if (logger.isDebugEnabled()) - logger.debug("Read: {} ms.", TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - exec.handler.start)); + if (logger.isTraceEnabled()) + logger.trace("Read: {} ms.", TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - exec.handler.start)); } catch (ReadTimeoutException|ReadFailureException ex) { @@ -1469,7 +1469,7 @@ public class StorageProxy implements StorageProxyMBean if (Tracing.isTracing()) Tracing.trace("Timed out waiting on digest mismatch repair requests"); else - logger.debug("Timed out waiting on digest mismatch repair requests"); + logger.trace("Timed out waiting on digest mismatch repair requests"); // the caught exception here will have CL.ALL from the repair command, // not whatever CL the initial command was at (CASSANDRA-7947) int blockFor = consistencyLevel.blockFor(Keyspace.open(command.getKeyspace())); @@ -1488,7 +1488,7 @@ public class StorageProxy implements StorageProxyMBean if (Tracing.isTracing()) Tracing.trace("Timed out waiting on digest mismatch repair acknowledgements"); else - logger.debug("Timed out waiting on digest mismatch repair acknowledgements"); + logger.trace("Timed out waiting on digest mismatch repair acknowledgements"); int blockFor = consistencyLevel.blockFor(Keyspace.open(command.getKeyspace())); throw new ReadTimeoutException(consistencyLevel, blockFor-1, blockFor, true); } @@ -1710,7 +1710,7 @@ public class StorageProxy implements StorageProxyMBean ? 1 : Math.max(1, Math.min(ranges.size(), (int) Math.ceil(command.limit() / resultRowsPerRange))); - logger.debug("Estimated result rows per range: {}; requested rows: {}, ranges.size(): {}; concurrent range requests: {}", + logger.trace("Estimated result rows per range: {}; requested rows: {}, ranges.size(): {}; concurrent range requests: {}", resultRowsPerRange, command.limit(), ranges.size(), @@ -1896,7 +1896,7 @@ public class StorageProxy implements StorageProxyMBean actualRowsPerRange = fetchedRows / i; concurrencyFactor = Math.max(1, Math.min(ranges.size() - i, Math.round(remainingRows / actualRowsPerRange))); } - logger.debug("Didn't get enough response rows; actual rows per range: {}; remaining rows: {}, new concurrent requests: {}", + logger.trace("Didn't get enough response rows; actual rows per range: {}; remaining rows: {}, new concurrent requests: {}", actualRowsPerRange, (int) remainingRows, concurrencyFactor); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a849efe/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java index 64662bf..1abc928 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -295,7 +295,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("get_slice"); + logger.trace("get_slice"); } try @@ -343,7 +343,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("multiget_slice"); + logger.trace("multiget_slice"); } try @@ -450,7 +450,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("get"); + logger.trace("get"); } try @@ -519,7 +519,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("get_count"); + logger.trace("get_count"); } try @@ -541,7 +541,7 @@ public class CassandraServer implements Cassandra.Iface int averageColumnSize = (int) (cfs.metric.meanRowSize.getValue() / cfs.getMeanColumns()); pageSize = Math.min(COUNT_PAGE_SIZE, 4 * 1024 * 1024 / averageColumnSize); pageSize = Math.max(2, pageSize); - logger.debug("average row column size is {}; using pageSize of {}", averageColumnSize, pageSize); + logger.trace("average row column size is {}; using pageSize of {}", averageColumnSize, pageSize); } else { @@ -599,7 +599,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("multiget_count"); + logger.trace("multiget_count"); } try @@ -680,7 +680,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("insert"); + logger.trace("insert"); } try @@ -720,7 +720,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("cas"); + logger.trace("cas"); } try @@ -947,7 +947,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("batch_mutate"); + logger.trace("batch_mutate"); } try @@ -980,7 +980,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("atomic_batch_mutate"); + logger.trace("atomic_batch_mutate"); } try @@ -1039,7 +1039,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("remove"); + logger.trace("remove"); } try @@ -1126,7 +1126,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("range_slice"); + logger.trace("range_slice"); } try @@ -1210,7 +1210,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("get_paged_slice"); + logger.trace("get_paged_slice"); } try @@ -1305,7 +1305,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("scan"); + logger.trace("scan"); } try @@ -1495,7 +1495,7 @@ public class CassandraServer implements Cassandra.Iface public String system_add_column_family(CfDef cf_def) throws InvalidRequestException, SchemaDisagreementException, TException { - logger.debug("add_column_family"); + logger.trace("add_column_family"); try { @@ -1522,7 +1522,7 @@ public class CassandraServer implements Cassandra.Iface public String system_drop_column_family(String column_family) throws InvalidRequestException, SchemaDisagreementException, TException { - logger.debug("drop_column_family"); + logger.trace("drop_column_family"); ThriftClientState cState = state(); @@ -1542,7 +1542,7 @@ public class CassandraServer implements Cassandra.Iface public String system_add_keyspace(KsDef ks_def) throws InvalidRequestException, SchemaDisagreementException, TException { - logger.debug("add_keyspace"); + logger.trace("add_keyspace"); try { @@ -1583,7 +1583,7 @@ public class CassandraServer implements Cassandra.Iface public String system_drop_keyspace(String keyspace) throws InvalidRequestException, SchemaDisagreementException, TException { - logger.debug("drop_keyspace"); + logger.trace("drop_keyspace"); try { @@ -1605,7 +1605,7 @@ public class CassandraServer implements Cassandra.Iface public String system_update_keyspace(KsDef ks_def) throws InvalidRequestException, SchemaDisagreementException, TException { - logger.debug("update_keyspace"); + logger.trace("update_keyspace"); try { @@ -1627,7 +1627,7 @@ public class CassandraServer implements Cassandra.Iface public String system_update_column_family(CfDef cf_def) throws InvalidRequestException, SchemaDisagreementException, TException { - logger.debug("update_column_family"); + logger.trace("update_column_family"); try { @@ -1674,7 +1674,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("truncating {}.{}", cState.getKeyspace(), cfname); + logger.trace("truncating {}.{}", cState.getKeyspace(), cfname); } schedule(DatabaseDescriptor.getTruncateRpcTimeout()); @@ -1723,7 +1723,7 @@ public class CassandraServer implements Cassandra.Iface public Map<String, List<String>> describe_schema_versions() throws TException, InvalidRequestException { - logger.debug("checking schema agreement"); + logger.trace("checking schema agreement"); return StorageProxy.describeSchemaVersions(); } @@ -1741,7 +1741,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("add"); + logger.trace("add"); } try @@ -1797,7 +1797,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("remove_counter"); + logger.trace("remove_counter"); } try @@ -1890,7 +1890,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("execute_cql3_query"); + logger.trace("execute_cql3_query"); } ThriftClientState cState = state(); @@ -1920,7 +1920,7 @@ public class CassandraServer implements Cassandra.Iface public CqlPreparedResult prepare_cql3_query(ByteBuffer query, Compression compression) throws TException { - logger.debug("prepare_cql3_query"); + logger.trace("prepare_cql3_query"); String queryString = uncompress(query, compression); ThriftClientState cState = state(); @@ -1952,7 +1952,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("execute_prepared_cql3_query"); + logger.trace("execute_prepared_cql3_query"); } try @@ -2001,7 +2001,7 @@ public class CassandraServer implements Cassandra.Iface } else { - logger.debug("get_multi_slice"); + logger.trace("get_multi_slice"); } try { http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a849efe/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java index a025004..bde5310 100644 --- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java +++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java @@ -126,7 +126,7 @@ public class CustomTThreadPoolServer extends TServer catch (RejectedExecutionException e) { // worker thread decremented activeClients but hadn't finished exiting - logger.debug("Dropping client connection because our limit of {} has been reached", args.maxWorkerThreads); + logger.trace("Dropping client connection because our limit of {} has been reached", args.maxWorkerThreads); continue; } @@ -211,7 +211,7 @@ public class CustomTThreadPoolServer extends TServer { // Assume the client died and continue silently // Log at debug to allow debugging of "frame too large" errors (see CASSANDRA-3142). - logger.debug("Thrift transport error occurred during processing of message.", ttx); + logger.trace("Thrift transport error occurred during processing of message.", ttx); } catch (TException tx) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a849efe/src/java/org/apache/cassandra/thrift/ThriftValidation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/ThriftValidation.java b/src/java/org/apache/cassandra/thrift/ThriftValidation.java index 3768952..d735676 100644 --- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java +++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java @@ -451,8 +451,8 @@ public class ThriftValidation } catch (MarshalException me) { - if (logger.isDebugEnabled()) - logger.debug("rejecting invalid value {}", ByteBufferUtil.bytesToHex(summarize(column.value))); + if (logger.isTraceEnabled()) + logger.trace("rejecting invalid value {}", ByteBufferUtil.bytesToHex(summarize(column.value))); throw new org.apache.cassandra.exceptions.InvalidRequestException(String.format("(%s) [%s][%s][%s] failed validation", me.getMessage(), http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a849efe/src/java/org/apache/cassandra/tracing/Tracing.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tracing/Tracing.java b/src/java/org/apache/cassandra/tracing/Tracing.java index 3f9f54d..ccc2637 100644 --- a/src/java/org/apache/cassandra/tracing/Tracing.java +++ b/src/java/org/apache/cassandra/tracing/Tracing.java @@ -152,7 +152,7 @@ public class Tracing TraceState state = this.state.get(); if (state == null) // inline isTracing to avoid implicit two calls to state.get() { - logger.debug("request complete"); + logger.trace("request complete"); } else { http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a849efe/src/java/org/apache/cassandra/transport/Message.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/Message.java b/src/java/org/apache/cassandra/transport/Message.java index 440d481..ab794df 100644 --- a/src/java/org/apache/cassandra/transport/Message.java +++ b/src/java/org/apache/cassandra/transport/Message.java @@ -503,7 +503,7 @@ public abstract class Message QueryState qstate = connection.validateNewMessage(request.type, connection.getVersion(), request.getStreamId()); - logger.debug("Received: {}, v={}", request, connection.getVersion()); + logger.trace("Received: {}, v={}", request, connection.getVersion()); response = request.execute(qstate); response.setStreamId(request.getStreamId()); response.setWarnings(ClientWarn.getWarnings()); @@ -522,7 +522,7 @@ public abstract class Message ClientWarn.resetWarnings(); } - logger.debug("Responding: {}, v={}", response, connection.getVersion()); + logger.trace("Responding: {}, v={}", response, connection.getVersion()); flush(new FlushItem(ctx, response, request.getSourceFrame())); } @@ -597,7 +597,7 @@ public abstract class Message if (ioExceptionsAtDebugLevel.contains(exception.getMessage())) { // Likely unclean client disconnects - logger.debug(message, exception); + logger.trace(message, exception); } else { http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a849efe/src/java/org/apache/cassandra/triggers/CustomClassLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/triggers/CustomClassLoader.java b/src/java/org/apache/cassandra/triggers/CustomClassLoader.java index ecb34a2..965da4b 100644 --- a/src/java/org/apache/cassandra/triggers/CustomClassLoader.java +++ b/src/java/org/apache/cassandra/triggers/CustomClassLoader.java @@ -112,7 +112,7 @@ public class CustomClassLoader extends URLClassLoader } catch (ClassNotFoundException ex) { - logger.debug("Class not found using parent class loader,", ex); + logger.trace("Class not found using parent class loader,", ex); // Don't throw the exception here, try triggers directory. } Class<?> clazz = this.findClass(name); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a849efe/src/java/org/apache/cassandra/utils/CLibrary.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/CLibrary.java b/src/java/org/apache/cassandra/utils/CLibrary.java index fed314b..4ca5d53 100644 --- a/src/java/org/apache/cassandra/utils/CLibrary.java +++ b/src/java/org/apache/cassandra/utils/CLibrary.java @@ -70,7 +70,7 @@ public final class CLibrary catch (UnsatisfiedLinkError e) { logger.warn("JNA link failure, one or more native method will be unavailable."); - logger.debug("JNA link failure details: {}", e.getMessage()); + logger.trace("JNA link failure details: {}", e.getMessage()); } catch (NoSuchMethodError e) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a849efe/src/java/org/apache/cassandra/utils/EstimatedHistogram.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java index a5c51c8..93d142a 100644 --- a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java +++ b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java @@ -234,7 +234,7 @@ public class EstimatedHistogram } /** - * log.debug() every record in the histogram + * log.trace() every record in the histogram * * @param log */ @@ -265,7 +265,7 @@ public class EstimatedHistogram // calculation, and accept the unnecessary whitespace prefixes that will occasionally occur if (i == 0 && count == 0) continue; - log.debug(String.format(formatstr, names[i], count)); + log.trace(String.format(formatstr, names[i], count)); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a849efe/src/java/org/apache/cassandra/utils/Mx4jTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/Mx4jTool.java b/src/java/org/apache/cassandra/utils/Mx4jTool.java index e8fdb29..41a5b33 100644 --- a/src/java/org/apache/cassandra/utils/Mx4jTool.java +++ b/src/java/org/apache/cassandra/utils/Mx4jTool.java @@ -42,7 +42,7 @@ public class Mx4jTool { try { - logger.debug("Will try to load mx4j now, if it's in the classpath"); + logger.trace("Will try to load mx4j now, if it's in the classpath"); MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); ObjectName processorName = new ObjectName("Server:name=XSLTProcessor"); @@ -65,7 +65,7 @@ public class Mx4jTool } catch (ClassNotFoundException e) { - logger.debug("Will not load MX4J, mx4j-tools.jar is not in the classpath"); + logger.trace("Will not load MX4J, mx4j-tools.jar is not in the classpath"); } catch(Exception e) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a849efe/src/java/org/apache/cassandra/utils/OutputHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/OutputHandler.java b/src/java/org/apache/cassandra/utils/OutputHandler.java index b203663..88c54ce 100644 --- a/src/java/org/apache/cassandra/utils/OutputHandler.java +++ b/src/java/org/apache/cassandra/utils/OutputHandler.java @@ -44,7 +44,7 @@ public interface OutputHandler public void debug(String msg) { - logger.debug(msg); + logger.trace(msg); } public void warn(String msg) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a849efe/src/java/org/apache/cassandra/utils/TopKSampler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/TopKSampler.java b/src/java/org/apache/cassandra/utils/TopKSampler.java index a8bd602..37fcb60 100644 --- a/src/java/org/apache/cassandra/utils/TopKSampler.java +++ b/src/java/org/apache/cassandra/utils/TopKSampler.java @@ -110,7 +110,7 @@ public class TopKSampler<T> hll.offerHashed(hash); } catch (Exception e) { - logger.debug("Failure to offer sample", e); + logger.trace("Failure to offer sample", e); } } }
