Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19919 Tidying up logging; ADDENDUM Fix tests w/ mocked Servers

This commit is contained in:
Michael Stack 2018-02-03 09:25:16 -08:00
parent 06dec20582
commit 12f3c82a86
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
View File

@ -121,8 +121,12 @@ public class SplitLogManager {
throws IOException { throws IOException {
this.server = master; this.server = master;
this.conf = conf; this.conf = conf;
// Get Server Thread name. Sometimes the Server is mocked so may not implement HasThread.
// For example, in tests.
String name = master instanceof HasThread? ((HasThread)master).getName():
master.getServerName().toShortString();
this.choreService = this.choreService =
new ChoreService(((HasThread)master).getName() + ".splitLogManager."); new ChoreService(name + ".splitLogManager.");
if (server.getCoordinatedStateManager() != null) { if (server.getCoordinatedStateManager() != null) {
SplitLogManagerCoordination coordination = getSplitLogManagerCoordination(); SplitLogManagerCoordination coordination = getSplitLogManagerCoordination();
Set<String> failedDeletions = Collections.synchronizedSet(new HashSet<String>()); Set<String> failedDeletions = Collections.synchronizedSet(new HashSet<String>());

6
hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java
View File

@ -1624,7 +1624,11 @@ public class AssignmentManager implements ServerListener {
} }
private void startAssignmentThread() { private void startAssignmentThread() {
assignThread = new Thread(((HasThread)this.master).getName()) { // Get Server Thread name. Sometimes the Server is mocked so may not implement HasThread.
// For example, in tests.
String name = master instanceof HasThread? ((HasThread)master).getName():
master.getServerName().toShortString();
assignThread = new Thread(name) {
@Override @Override
public void run() { public void run() {
while (isRunning()) { while (isRunning()) {