Skip to content

Commit 24aefca

Browse files
committed
rename HadoopThread to SubjectInheritingThread and add more Javadoc
1 parent f6343ab commit 24aefca

File tree

320 files changed

+978
-932
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+978
-932
lines changed

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurableBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.apache.hadoop.util.Preconditions;
2323
import org.apache.hadoop.thirdparty.com.google.common.collect.Maps;
2424
import org.apache.hadoop.util.Time;
25-
import org.apache.hadoop.util.concurrent.HadoopThread;
25+
import org.apache.hadoop.util.concurrent.SubjectInheritingThread;
2626
import org.apache.hadoop.conf.ReconfigurationUtil.PropertyChange;
2727
import org.slf4j.Logger;
2828
import org.slf4j.LoggerFactory;
@@ -106,7 +106,7 @@ public Collection<PropertyChange> getChangedProperties(
106106
/**
107107
* A background thread to apply configuration changes.
108108
*/
109-
private static class ReconfigurationThread extends HadoopThread {
109+
private static class ReconfigurationThread extends SubjectInheritingThread {
110110
private ReconfigurableBase parent;
111111

112112
ReconfigurationThread(ReconfigurableBase base) {

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CachingGetSpaceUsed.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.hadoop.classification.InterfaceAudience;
2121
import org.apache.hadoop.classification.InterfaceStability;
2222
import org.apache.hadoop.classification.VisibleForTesting;
23-
import org.apache.hadoop.util.concurrent.HadoopThread;
23+
import org.apache.hadoop.util.concurrent.SubjectInheritingThread;
2424
import org.slf4j.Logger;
2525
import org.slf4j.LoggerFactory;
2626

@@ -108,7 +108,7 @@ void init() {
108108
*/
109109
private void initRefreshThread(boolean runImmediately) {
110110
if (refreshInterval > 0) {
111-
refreshUsed = new HadoopThread(new RefreshThread(this, runImmediately),
111+
refreshUsed = new SubjectInheritingThread(new RefreshThread(this, runImmediately),
112112
"refreshUsed-" + dirPath);
113113
refreshUsed.setDaemon(true);
114114
refreshUsed.start();

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DelegationTokenRenewer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.apache.hadoop.security.token.Token;
3131
import org.apache.hadoop.security.token.TokenIdentifier;
3232
import org.apache.hadoop.util.Time;
33-
import org.apache.hadoop.util.concurrent.HadoopThread;
33+
import org.apache.hadoop.util.concurrent.SubjectInheritingThread;
3434
import org.slf4j.Logger;
3535
import org.slf4j.LoggerFactory;
3636

@@ -39,7 +39,7 @@
3939
*/
4040
@InterfaceAudience.Private
4141
public class DelegationTokenRenewer
42-
extends HadoopThread {
42+
extends SubjectInheritingThread {
4343
private static final Logger LOG = LoggerFactory
4444
.getLogger(DelegationTokenRenewer.class);
4545

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
import org.apache.hadoop.util.ReflectionUtils;
8282
import org.apache.hadoop.util.ShutdownHookManager;
8383
import org.apache.hadoop.util.StringUtils;
84-
import org.apache.hadoop.util.concurrent.HadoopThread;
84+
import org.apache.hadoop.util.concurrent.SubjectInheritingThread;
8585
import org.apache.hadoop.tracing.Tracer;
8686
import org.apache.hadoop.tracing.TraceScope;
8787
import org.apache.hadoop.util.Preconditions;
@@ -4088,7 +4088,7 @@ private interface StatisticsAggregator<T> {
40884088
static {
40894089
STATS_DATA_REF_QUEUE = new ReferenceQueue<>();
40904090
// start a single daemon cleaner thread
4091-
STATS_DATA_CLEANER = new HadoopThread(new StatisticsDataReferenceCleaner());
4091+
STATS_DATA_CLEANER = new SubjectInheritingThread(new StatisticsDataReferenceCleaner());
40924092
STATS_DATA_CLEANER.
40934093
setName(StatisticsDataReferenceCleaner.class.getName());
40944094
STATS_DATA_CLEANER.setDaemon(true);

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/StreamPumper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package org.apache.hadoop.ha;
1919

20-
import org.apache.hadoop.util.concurrent.HadoopThread;
20+
import org.apache.hadoop.util.concurrent.SubjectInheritingThread;
2121
import org.slf4j.Logger;
2222

2323
import java.io.BufferedReader;
@@ -51,7 +51,7 @@ enum StreamType {
5151
this.stream = stream;
5252
this.type = type;
5353

54-
thread = new HadoopThread(new Runnable() {
54+
thread = new SubjectInheritingThread(new Runnable() {
5555
@Override
5656
public void run() {
5757
try {

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import org.apache.hadoop.util.StringUtils;
5555
import org.apache.hadoop.util.Time;
5656
import org.apache.hadoop.util.concurrent.AsyncGet;
57-
import org.apache.hadoop.util.concurrent.HadoopThread;
57+
import org.apache.hadoop.util.concurrent.SubjectInheritingThread;
5858
import org.apache.hadoop.tracing.Span;
5959
import org.apache.hadoop.tracing.Tracer;
6060
import org.slf4j.Logger;
@@ -408,7 +408,7 @@ public synchronized void setRpcResponse(Writable rpcResponse) {
408408
/** Thread that reads responses and notifies callers. Each connection owns a
409409
* socket connected to a remote address. Calls are multiplexed through this
410410
* socket: responses may be delivered out of order. */
411-
private class Connection extends HadoopThread {
411+
private class Connection extends SubjectInheritingThread {
412412
private InetSocketAddress server; // server ip:port
413413
private final ConnectionId remoteId; // connection id
414414
private AuthMethod authMethod; // authentication method
@@ -449,7 +449,7 @@ private class Connection extends HadoopThread {
449449
Consumer<Connection> removeMethod) {
450450
this.remoteId = remoteId;
451451
this.server = remoteId.getAddress();
452-
this.rpcRequestThread = new HadoopThread(new RpcRequestSender(),
452+
this.rpcRequestThread = new SubjectInheritingThread(new RpcRequestSender(),
453453
"IPC Parameter Sending Thread for " + remoteId);
454454
this.rpcRequestThread.setDaemon(true);
455455

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
import org.apache.hadoop.util.ProtoUtil;
125125
import org.apache.hadoop.util.StringUtils;
126126
import org.apache.hadoop.util.Time;
127-
import org.apache.hadoop.util.concurrent.HadoopThread;
127+
import org.apache.hadoop.util.concurrent.SubjectInheritingThread;
128128

129129
import java.util.concurrent.atomic.AtomicBoolean;
130130
import org.apache.hadoop.tracing.Span;
@@ -1473,7 +1473,7 @@ public String toString() {
14731473
}
14741474

14751475
/** Listens on the socket. Creates jobs for the handler threads*/
1476-
private class Listener extends HadoopThread {
1476+
private class Listener extends SubjectInheritingThread {
14771477

14781478
private ServerSocketChannel acceptChannel = null; //the accept channel
14791479
private Selector selector = null; //the selector that we use for the server
@@ -1522,7 +1522,7 @@ void setIsAuxiliary() {
15221522
this.isOnAuxiliaryPort = true;
15231523
}
15241524

1525-
private class Reader extends HadoopThread {
1525+
private class Reader extends SubjectInheritingThread {
15261526
final private BlockingQueue<Connection> pendingConnections;
15271527
private final Selector readSelector;
15281528

@@ -1762,7 +1762,7 @@ Reader getReader() {
17621762
}
17631763

17641764
// Sends responses of RPC back to clients.
1765-
private class Responder extends HadoopThread {
1765+
private class Responder extends SubjectInheritingThread {
17661766
private final Selector writeSelector;
17671767
private int pending; // connections waiting to register
17681768

@@ -3221,7 +3221,7 @@ private void internalQueueCall(Call call, boolean blocking)
32213221
}
32223222

32233223
/** Handles queued calls . */
3224-
private class Handler extends HadoopThread {
3224+
private class Handler extends SubjectInheritingThread {
32253225
public Handler(int instanceNumber) {
32263226
this.setDaemon(true);
32273227
this.setName("IPC Server handler "+ instanceNumber +

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSinkAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.apache.hadoop.metrics2.MetricsFilter;
3535
import org.apache.hadoop.metrics2.MetricsSink;
3636
import org.apache.hadoop.util.Time;
37-
import org.apache.hadoop.util.concurrent.HadoopThread;
37+
import org.apache.hadoop.util.concurrent.SubjectInheritingThread;
3838
import org.slf4j.Logger;
3939
import org.slf4j.LoggerFactory;
4040

@@ -49,7 +49,7 @@ class MetricsSinkAdapter implements SinkQueue.Consumer<MetricsBuffer> {
4949
private final MetricsSink sink;
5050
private final MetricsFilter sourceFilter, recordFilter, metricFilter;
5151
private final SinkQueue<MetricsBuffer> queue;
52-
private final HadoopThread sinkThread;
52+
private final SubjectInheritingThread sinkThread;
5353
private volatile boolean stopping = false;
5454
private volatile boolean inError = false;
5555
private final int periodMs, firstRetryDelay, retryCount;
@@ -85,7 +85,7 @@ class MetricsSinkAdapter implements SinkQueue.Consumer<MetricsBuffer> {
8585
"Dropped updates per sink", 0);
8686
qsize = registry.newGauge("Sink_"+ name + "Qsize", "Queue size", 0);
8787

88-
sinkThread = new HadoopThread() {
88+
sinkThread = new SubjectInheritingThread() {
8989
@Override public void work() {
9090
publishMetricsFromQueue();
9191
}

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/unix/DomainSocketWatcher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.apache.hadoop.util.NativeCodeLoader;
3737
import org.apache.hadoop.classification.VisibleForTesting;
3838
import org.apache.hadoop.util.Preconditions;
39-
import org.apache.hadoop.util.concurrent.HadoopThread;
39+
import org.apache.hadoop.util.concurrent.SubjectInheritingThread;
4040
import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Uninterruptibles;
4141
import org.slf4j.Logger;
4242
import org.slf4j.LoggerFactory;
@@ -440,7 +440,7 @@ private void sendCallbackAndRemove(String caller,
440440
}
441441

442442
@VisibleForTesting
443-
final Thread watcherThread = new HadoopThread(new Runnable() {
443+
final Thread watcherThread = new SubjectInheritingThread(new Runnable() {
444444
@Override
445445
public void run() {
446446
if (LOG.isDebugEnabled()) {

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
import org.apache.hadoop.util.Shell;
9090
import org.apache.hadoop.util.StringUtils;
9191
import org.apache.hadoop.util.Time;
92-
import org.apache.hadoop.util.concurrent.HadoopThread;
92+
import org.apache.hadoop.util.concurrent.SubjectInheritingThread;
9393
import org.slf4j.Logger;
9494
import org.slf4j.LoggerFactory;
9595

@@ -930,7 +930,7 @@ private void executeAutoRenewalTask(final String userName,
930930
new ThreadFactory() {
931931
@Override
932932
public Thread newThread(Runnable r) {
933-
Thread t = new HadoopThread(r);
933+
Thread t = new SubjectInheritingThread(r);
934934
t.setDaemon(true);
935935
t.setName("TGT Renewer for " + userName);
936936
return t;

0 commit comments

Comments
 (0)