From 5d84c7fd83502aeb551d46a740502db4862508fe Mon Sep 17 00:00:00 2001 From: Sean Owen Date: Wed, 31 Aug 2016 11:09:14 -0700 Subject: [SPARK-17332][CORE] Make Java Loggers static members ## What changes were proposed in this pull request? Make all Java Loggers static members ## How was this patch tested? Jenkins Author: Sean Owen Closes #14896 from srowen/SPARK-17332. --- .../src/main/java/org/apache/spark/network/TransportContext.java | 2 +- .../src/main/java/org/apache/spark/network/client/TransportClient.java | 2 +- .../java/org/apache/spark/network/client/TransportClientFactory.java | 2 +- .../java/org/apache/spark/network/client/TransportResponseHandler.java | 2 +- .../main/java/org/apache/spark/network/protocol/MessageDecoder.java | 3 ++- .../main/java/org/apache/spark/network/protocol/MessageEncoder.java | 2 +- .../main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java | 2 +- .../src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java | 2 +- .../src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java | 2 +- .../java/org/apache/spark/network/server/OneForOneStreamManager.java | 2 +- .../src/main/java/org/apache/spark/network/server/RpcHandler.java | 2 +- .../java/org/apache/spark/network/server/TransportChannelHandler.java | 2 +- .../java/org/apache/spark/network/server/TransportRequestHandler.java | 2 +- .../src/main/java/org/apache/spark/network/server/TransportServer.java | 2 +- .../main/java/org/apache/spark/network/sasl/ShuffleSecretManager.java | 3 ++- .../org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java | 2 +- .../java/org/apache/spark/network/shuffle/ExternalShuffleClient.java | 2 +- .../java/org/apache/spark/network/shuffle/OneForOneBlockFetcher.java | 2 +- .../java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java | 2 +- .../apache/spark/network/shuffle/mesos/MesosExternalShuffleClient.java | 2 +- .../main/java/org/apache/spark/network/yarn/YarnShuffleService.java | 2 +- 21 files changed, 23 insertions(+), 21 deletions(-) (limited to 'common') diff --git a/common/network-common/src/main/java/org/apache/spark/network/TransportContext.java b/common/network-common/src/main/java/org/apache/spark/network/TransportContext.java index 5320b28bc0..5b69e2bb03 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/TransportContext.java +++ b/common/network-common/src/main/java/org/apache/spark/network/TransportContext.java @@ -56,7 +56,7 @@ import org.apache.spark.network.util.TransportFrameDecoder; * processes to send messages back to the client on an existing channel. */ public class TransportContext { - private final Logger logger = LoggerFactory.getLogger(TransportContext.class); + private static final Logger logger = LoggerFactory.getLogger(TransportContext.class); private final TransportConf conf; private final RpcHandler rpcHandler; diff --git a/common/network-common/src/main/java/org/apache/spark/network/client/TransportClient.java b/common/network-common/src/main/java/org/apache/spark/network/client/TransportClient.java index a67683b892..600b80e2c5 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/client/TransportClient.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/TransportClient.java @@ -72,7 +72,7 @@ import static org.apache.spark.network.util.NettyUtils.getRemoteAddress; * Concurrency: thread safe and can be called from multiple threads. */ public class TransportClient implements Closeable { - private final Logger logger = LoggerFactory.getLogger(TransportClient.class); + private static final Logger logger = LoggerFactory.getLogger(TransportClient.class); private final Channel channel; private final TransportResponseHandler handler; diff --git a/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java b/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java index 1c9916baee..e895f13f45 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java @@ -73,7 +73,7 @@ public class TransportClientFactory implements Closeable { } } - private final Logger logger = LoggerFactory.getLogger(TransportClientFactory.class); + private static final Logger logger = LoggerFactory.getLogger(TransportClientFactory.class); private final TransportContext context; private final TransportConf conf; diff --git a/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java b/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java index 179667296e..41bead546c 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java @@ -48,7 +48,7 @@ import org.apache.spark.network.util.TransportFrameDecoder; * Concurrency: thread safe and can be called from multiple threads. */ public class TransportResponseHandler extends MessageHandler { - private final Logger logger = LoggerFactory.getLogger(TransportResponseHandler.class); + private static final Logger logger = LoggerFactory.getLogger(TransportResponseHandler.class); private final Channel channel; diff --git a/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageDecoder.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageDecoder.java index f045318618..f0956438ad 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageDecoder.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageDecoder.java @@ -33,7 +33,8 @@ import org.slf4j.LoggerFactory; @ChannelHandler.Sharable public final class MessageDecoder extends MessageToMessageDecoder { - private final Logger logger = LoggerFactory.getLogger(MessageDecoder.class); + private static final Logger logger = LoggerFactory.getLogger(MessageDecoder.class); + @Override public void decode(ChannelHandlerContext ctx, ByteBuf in, List out) { Message.Type msgType = Message.Type.decode(in); diff --git a/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageEncoder.java b/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageEncoder.java index 664df57fec..276f16637e 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageEncoder.java +++ b/common/network-common/src/main/java/org/apache/spark/network/protocol/MessageEncoder.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; @ChannelHandler.Sharable public final class MessageEncoder extends MessageToMessageEncoder { - private final Logger logger = LoggerFactory.getLogger(MessageEncoder.class); + private static final Logger logger = LoggerFactory.getLogger(MessageEncoder.class); /*** * Encodes a Message by invoking its encode() method. For non-data messages, we will add one diff --git a/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java index 68381037d6..9e5c616ee5 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java +++ b/common/network-common/src/main/java/org/apache/spark/network/sasl/SaslClientBootstrap.java @@ -38,7 +38,7 @@ import org.apache.spark.network.util.TransportConf; * server should be setup with a {@link SaslRpcHandler} with matching keys for the given appId. */ public class SaslClientBootstrap implements TransportClientBootstrap { - private final Logger logger = LoggerFactory.getLogger(SaslClientBootstrap.class); + private static final Logger logger = LoggerFactory.getLogger(SaslClientBootstrap.class); private final boolean encrypt; private final TransportConf conf; diff --git a/common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java b/common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java index 94685e91b8..b6256debb8 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java +++ b/common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslClient.java @@ -43,7 +43,7 @@ import static org.apache.spark.network.sasl.SparkSaslServer.*; * firstToken, which is then followed by a set of challenges and responses. */ public class SparkSaslClient implements SaslEncryptionBackend { - private final Logger logger = LoggerFactory.getLogger(SparkSaslClient.class); + private static final Logger logger = LoggerFactory.getLogger(SparkSaslClient.class); private final String secretKeyId; private final SecretKeyHolder secretKeyHolder; diff --git a/common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java b/common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java index b802a5af63..e24fdf0c74 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java +++ b/common/network-common/src/main/java/org/apache/spark/network/sasl/SparkSaslServer.java @@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory; * connections on some socket.) */ public class SparkSaslServer implements SaslEncryptionBackend { - private final Logger logger = LoggerFactory.getLogger(SparkSaslServer.class); + private static final Logger logger = LoggerFactory.getLogger(SparkSaslServer.class); /** * This is passed as the server name when creating the sasl client/server. diff --git a/common/network-common/src/main/java/org/apache/spark/network/server/OneForOneStreamManager.java b/common/network-common/src/main/java/org/apache/spark/network/server/OneForOneStreamManager.java index ae7e520b2f..ee367f9998 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/server/OneForOneStreamManager.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/OneForOneStreamManager.java @@ -36,7 +36,7 @@ import org.apache.spark.network.client.TransportClient; * individually fetched as chunks by the client. Each registered buffer is one chunk. */ public class OneForOneStreamManager extends StreamManager { - private final Logger logger = LoggerFactory.getLogger(OneForOneStreamManager.class); + private static final Logger logger = LoggerFactory.getLogger(OneForOneStreamManager.class); private final AtomicLong nextStreamId; private final ConcurrentHashMap streams; diff --git a/common/network-common/src/main/java/org/apache/spark/network/server/RpcHandler.java b/common/network-common/src/main/java/org/apache/spark/network/server/RpcHandler.java index a99c3015b0..8f7554e2e0 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/server/RpcHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/RpcHandler.java @@ -83,7 +83,7 @@ public abstract class RpcHandler { private static class OneWayRpcCallback implements RpcResponseCallback { - private final Logger logger = LoggerFactory.getLogger(OneWayRpcCallback.class); + private static final Logger logger = LoggerFactory.getLogger(OneWayRpcCallback.class); @Override public void onSuccess(ByteBuffer response) { diff --git a/common/network-common/src/main/java/org/apache/spark/network/server/TransportChannelHandler.java b/common/network-common/src/main/java/org/apache/spark/network/server/TransportChannelHandler.java index 884ea7d115..c33848c840 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/server/TransportChannelHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/TransportChannelHandler.java @@ -49,7 +49,7 @@ import static org.apache.spark.network.util.NettyUtils.getRemoteAddress; * timeout if the client is continuously sending but getting no responses, for simplicity. */ public class TransportChannelHandler extends SimpleChannelInboundHandler { - private final Logger logger = LoggerFactory.getLogger(TransportChannelHandler.class); + private static final Logger logger = LoggerFactory.getLogger(TransportChannelHandler.class); private final TransportClient client; private final TransportResponseHandler responseHandler; diff --git a/common/network-common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java b/common/network-common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java index e67a034cb8..0373ed950e 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java @@ -53,7 +53,7 @@ import static org.apache.spark.network.util.NettyUtils.getRemoteAddress; * The messages should have been processed by the pipeline setup by {@link TransportServer}. */ public class TransportRequestHandler extends MessageHandler { - private final Logger logger = LoggerFactory.getLogger(TransportRequestHandler.class); + private static final Logger logger = LoggerFactory.getLogger(TransportRequestHandler.class); /** The Netty channel that this handler is associated with. */ private final Channel channel; diff --git a/common/network-common/src/main/java/org/apache/spark/network/server/TransportServer.java b/common/network-common/src/main/java/org/apache/spark/network/server/TransportServer.java index a67db4f69f..0d7a677820 100644 --- a/common/network-common/src/main/java/org/apache/spark/network/server/TransportServer.java +++ b/common/network-common/src/main/java/org/apache/spark/network/server/TransportServer.java @@ -44,7 +44,7 @@ import org.apache.spark.network.util.TransportConf; * Server for the efficient, low-level streaming service. */ public class TransportServer implements Closeable { - private final Logger logger = LoggerFactory.getLogger(TransportServer.class); + private static final Logger logger = LoggerFactory.getLogger(TransportServer.class); private final TransportContext context; private final TransportConf conf; diff --git a/common/network-shuffle/src/main/java/org/apache/spark/network/sasl/ShuffleSecretManager.java b/common/network-shuffle/src/main/java/org/apache/spark/network/sasl/ShuffleSecretManager.java index 56a025c4d9..426a604f4f 100644 --- a/common/network-shuffle/src/main/java/org/apache/spark/network/sasl/ShuffleSecretManager.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/sasl/ShuffleSecretManager.java @@ -29,7 +29,8 @@ import org.apache.spark.network.util.JavaUtils; * A class that manages shuffle secret used by the external shuffle service. */ public class ShuffleSecretManager implements SecretKeyHolder { - private final Logger logger = LoggerFactory.getLogger(ShuffleSecretManager.class); + private static final Logger logger = LoggerFactory.getLogger(ShuffleSecretManager.class); + private final ConcurrentHashMap shuffleSecretMap; // Spark user used for authenticating SASL connections diff --git a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java index d05d0ac4d2..6e02430a8e 100644 --- a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java @@ -54,7 +54,7 @@ import org.apache.spark.network.util.TransportConf; * level shuffle block. */ public class ExternalShuffleBlockHandler extends RpcHandler { - private final Logger logger = LoggerFactory.getLogger(ExternalShuffleBlockHandler.class); + private static final Logger logger = LoggerFactory.getLogger(ExternalShuffleBlockHandler.class); @VisibleForTesting final ExternalShuffleBlockResolver blockManager; diff --git a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleClient.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleClient.java index 58ca87d9d3..772fb88325 100644 --- a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleClient.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleClient.java @@ -44,7 +44,7 @@ import org.apache.spark.network.util.TransportConf; * executors. */ public class ExternalShuffleClient extends ShuffleClient { - private final Logger logger = LoggerFactory.getLogger(ExternalShuffleClient.class); + private static final Logger logger = LoggerFactory.getLogger(ExternalShuffleClient.class); private final TransportConf conf; private final boolean saslEnabled; diff --git a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/OneForOneBlockFetcher.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/OneForOneBlockFetcher.java index 1b2ddbf1ed..35f69fe35c 100644 --- a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/OneForOneBlockFetcher.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/OneForOneBlockFetcher.java @@ -41,7 +41,7 @@ import org.apache.spark.network.shuffle.protocol.StreamHandle; * {@link org.apache.spark.network.server.OneForOneStreamManager} on the server side. */ public class OneForOneBlockFetcher { - private final Logger logger = LoggerFactory.getLogger(OneForOneBlockFetcher.class); + private static final Logger logger = LoggerFactory.getLogger(OneForOneBlockFetcher.class); private final TransportClient client; private final OpenBlocks openMessage; diff --git a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java index d81cf869dd..72bd0f803d 100644 --- a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java @@ -64,7 +64,7 @@ public class RetryingBlockFetcher { private static final ExecutorService executorService = Executors.newCachedThreadPool( NettyUtils.createThreadFactory("Block Fetch Retry")); - private final Logger logger = LoggerFactory.getLogger(RetryingBlockFetcher.class); + private static final Logger logger = LoggerFactory.getLogger(RetryingBlockFetcher.class); /** Used to initiate new Block Fetches on our remaining blocks. */ private final BlockFetchStarter fetchStarter; diff --git a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/mesos/MesosExternalShuffleClient.java b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/mesos/MesosExternalShuffleClient.java index 2add9c83a7..42cedd9943 100644 --- a/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/mesos/MesosExternalShuffleClient.java +++ b/common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/mesos/MesosExternalShuffleClient.java @@ -44,7 +44,7 @@ import org.apache.spark.network.util.TransportConf; * has to detect this itself. */ public class MesosExternalShuffleClient extends ExternalShuffleClient { - private final Logger logger = LoggerFactory.getLogger(MesosExternalShuffleClient.class); + private static final Logger logger = LoggerFactory.getLogger(MesosExternalShuffleClient.class); private final ScheduledExecutorService heartbeaterThread = Executors.newSingleThreadScheduledExecutor( diff --git a/common/network-yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java b/common/network-yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java index 22e47ac1b7..2cf3f53e6d 100644 --- a/common/network-yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java +++ b/common/network-yarn/src/main/java/org/apache/spark/network/yarn/YarnShuffleService.java @@ -58,7 +58,7 @@ import org.apache.spark.network.yarn.util.HadoopConfigProvider; * the service's. */ public class YarnShuffleService extends AuxiliaryService { - private final Logger logger = LoggerFactory.getLogger(YarnShuffleService.class); + private static final Logger logger = LoggerFactory.getLogger(YarnShuffleService.class); // Port on which the shuffle server listens for fetch requests private static final String SPARK_SHUFFLE_SERVICE_PORT_KEY = "spark.shuffle.service.port"; -- cgit v1.2.3