diff --git a/src/java/org/apache/hadoop/hbase/client/HTable.java b/src/java/org/apache/hadoop/hbase/client/HTable.java
index 026de9a5e46..eb7ec99e084 100644
--- a/src/java/org/apache/hadoop/hbase/client/HTable.java
+++ b/src/java/org/apache/hadoop/hbase/client/HTable.java
@@ -1524,7 +1524,6 @@ public class HTable {
} catch (IOException e) {
if (e instanceof UnknownScannerException &&
lastNext + scannerTimeout < System.currentTimeMillis()) {
-
ScannerTimeoutException ex = new ScannerTimeoutException();
ex.initCause(e);
throw ex;
@@ -1538,7 +1537,6 @@ public class HTable {
countdown--;
}
}
-
} while (countdown > 0 && nextScanner(countdown));
}
diff --git a/src/java/org/apache/hadoop/hbase/io/BlockFSInputStream.java b/src/java/org/apache/hadoop/hbase/io/BlockFSInputStream.java
index 1edf600e9b8..b79451bffba 100644
--- a/src/java/org/apache/hadoop/hbase/io/BlockFSInputStream.java
+++ b/src/java/org/apache/hadoop/hbase/io/BlockFSInputStream.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import org.apache.commons.logging.Log;
@@ -48,7 +49,15 @@ public class BlockFSInputStream extends FSInputStream {
* also want BlockFSInputStream to be self-contained.
*/
private static final ScheduledExecutorService EXECUTOR =
- Executors.newSingleThreadScheduledExecutor();
+ Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+ public Thread newThread(Runnable r) {
+ Thread t = new Thread(r);
+ t.setDaemon(true);
+ t.setName("BlockFSInputStream referenceQueue Checker");
+ return t;
+ }
+
+ });
/*
* The registration of this object in EXECUTOR.
@@ -101,11 +110,12 @@ public class BlockFSInputStream extends FSInputStream {
}
};
// Register a Runnable that runs checkReferences on a period.
+ final int hashcode = hashCode();
this.registration = EXECUTOR.scheduleAtFixedRate(new Runnable() {
public void run() {
int cleared = checkReferences();
if (LOG.isDebugEnabled() && cleared > 0) {
- LOG.debug("Cleared " + cleared);
+ LOG.debug("Cleared " + cleared + " in " + hashcode);
}
}
}, 10, 10, TimeUnit.SECONDS);
diff --git a/src/webapps/master/master.jsp b/src/webapps/master/master.jsp
index 328f23a829a..3ef94581ba8 100644
--- a/src/webapps/master/master.jsp
+++ b/src/webapps/master/master.jsp
@@ -25,7 +25,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
+
HBase Master: <%= master.getMasterAddress().getHostname()%>:<%= master.getMasterAddress().getPort() %>
diff --git a/src/webapps/regionserver/regionserver.jsp b/src/webapps/regionserver/regionserver.jsp
index 3a72c4a3ac8..be1e60f7a34 100644
--- a/src/webapps/regionserver/regionserver.jsp
+++ b/src/webapps/regionserver/regionserver.jsp
@@ -20,7 +20,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
+
HBase Region Server: <%= serverInfo.getServerAddress().getHostname() %>:<%= serverInfo.getServerAddress().getPort() %>