You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by dd...@apache.org on 2014/07/02 21:59:43 UTC
git commit: Added debug
Repository: hbase
Updated Branches:
refs/heads/hbase-10070 2e6476ee3 -> ba692601c
Added debug
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ba692601
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ba692601
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ba692601
Branch: refs/heads/hbase-10070
Commit: ba692601c1302ec818f15ef552af2004ee49b6d3
Parents: 2e6476e
Author: Devaraj Das <dd...@Devaraj-Dass-MacBook-Pro-2.local>
Authored: Thu Jun 26 14:58:50 2014 -0700
Committer: Devaraj Das <dd...@Devaraj-Dass-MacBook-Pro-2.local>
Committed: Thu Jun 26 14:58:50 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/RegionLocations.java | 7 +++++--
.../java/org/apache/hadoop/hbase/client/ClientScanner.java | 2 ++
.../org/apache/hadoop/hbase/client/ConnectionManager.java | 2 +-
.../java/org/apache/hadoop/hbase/client/ScannerCallable.java | 2 +-
.../hadoop/hbase/client/TestRestoreSnapshotFromClient.java | 2 +-
hbase-server/src/test/resources/log4j.properties | 1 +
6 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ba692601/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLocations.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLocations.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLocations.java
index 8b77af1..30648cb 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLocations.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLocations.java
@@ -20,7 +20,10 @@ package org.apache.hadoop.hbase;
import java.util.Collection;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.client.MetaCache;
import org.apache.hadoop.hbase.util.Bytes;
/**
@@ -181,7 +184,7 @@ public class RegionLocations {
return new RegionLocations(newLocations);
}
-
+ private static final Log LOG = LogFactory.getLog(RegionLocations.class);
/**
* Merges this RegionLocations list with the given list assuming
* same range, and keeping the most up to date version of the
@@ -193,7 +196,7 @@ public class RegionLocations {
*/
public RegionLocations mergeLocations(RegionLocations other) {
assert other != null;
-
+LOG.debug("MERGELOCATIONS CALLED");
HRegionLocation[] newLocations = null;
// Use the length from other, since it is coming from meta. Otherwise,
http://git-wip-us.apache.org/repos/asf/hbase/blob/ba692601/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
index 14a5608..33e3698 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
@@ -110,6 +110,8 @@ public class ClientScanner extends AbstractClientScanner {
public ClientScanner(final Configuration conf, final Scan scan, final TableName tableName,
ClusterConnection connection, RpcRetryingCallerFactory rpcFactory, ExecutorService pool,
int primaryOperationTimeout) throws IOException {
+ LOG.debug("Scan table=" + tableName
+ + ", startRow=" + Bytes.toStringBinary(scan.getStartRow()));
if (LOG.isTraceEnabled()) {
LOG.trace("Scan table=" + tableName
+ ", startRow=" + Bytes.toStringBinary(scan.getStartRow()));
http://git-wip-us.apache.org/repos/asf/hbase/blob/ba692601/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
index d3f4078..ac6173e 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
@@ -1278,7 +1278,7 @@ class ConnectionManager {
// so it won't interfere.
metaCache.clearCache(tableName, row, replicaId);
}
-
+ LOG.debug("Querying the meta region for " + Bytes.toString(metaKey));
// Query the meta region for the location of the meta region
regionInfoRow = ProtobufUtil.getRowOrBefore(service,
metaLocation.getRegionInfo().getRegionName(), metaKey,
http://git-wip-us.apache.org/repos/asf/hbase/blob/ba692601/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
index b6ec9a4..41c2af9 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java
@@ -115,7 +115,7 @@ public class ScannerCallable extends RegionServerCallable<Result[]> {
this.scan = scan;
this.scanMetrics = scanMetrics;
Configuration conf = connection.getConfiguration();
- logScannerActivity = conf.getBoolean(LOG_SCANNER_ACTIVITY, false);
+ logScannerActivity = conf.getBoolean(LOG_SCANNER_ACTIVITY, true);
logCutOffLatency = conf.getInt(LOG_SCANNER_LATENCY_CUTOFF, 1000);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/ba692601/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java
index 4cdc815..ff9dab3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java
@@ -158,7 +158,7 @@ public class TestRestoreSnapshotFromClient {
admin.enableTable(tableName);
SnapshotTestingUtils.verifyRowCount(TEST_UTIL, tableName, 0);
SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());
-
+assert(false);
// Restore from snapshot-1
admin.disableTable(tableName);
admin.restoreSnapshot(snapshotName1);
http://git-wip-us.apache.org/repos/asf/hbase/blob/ba692601/hbase-server/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/resources/log4j.properties b/hbase-server/src/test/resources/log4j.properties
index 6ee91ef..c58413b 100644
--- a/hbase-server/src/test/resources/log4j.properties
+++ b/hbase-server/src/test/resources/log4j.properties
@@ -57,6 +57,7 @@ log4j.appender.console.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %C{2}(%L):
log4j.logger.org.apache.hadoop=WARN
log4j.logger.org.apache.zookeeper=ERROR
log4j.logger.org.apache.hadoop.hbase=DEBUG
+log4j.logger.org.apache.hadoop.hbase.client.MetaCache=Trace
#These two settings are workarounds against spurious logs from the minicluster.
#See HBASE-4709