aboutsummaryrefslogtreecommitdiff
path: root/common/network-shuffle
diff options
context:
space:
mode:
authorSean Owen <sowen@cloudera.com>2016-08-31 11:09:14 -0700
committerMarcelo Vanzin <vanzin@cloudera.com>2016-08-31 11:09:14 -0700
commit5d84c7fd83502aeb551d46a740502db4862508fe (patch)
treecd05ad83b9b8814670ba02521e3b85f87809b4e8 /common/network-shuffle
parent9bcb33c54117cebc9e087017bf4e4163edaeff17 (diff)
downloadspark-5d84c7fd83502aeb551d46a740502db4862508fe.tar.gz
spark-5d84c7fd83502aeb551d46a740502db4862508fe.tar.bz2
spark-5d84c7fd83502aeb551d46a740502db4862508fe.zip
[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 <sowen@cloudera.com> Closes #14896 from srowen/SPARK-17332.
Diffstat (limited to 'common/network-shuffle')
-rw-r--r--common/network-shuffle/src/main/java/org/apache/spark/network/sasl/ShuffleSecretManager.java3
-rw-r--r--common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockHandler.java2
-rw-r--r--common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleClient.java2
-rw-r--r--common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/OneForOneBlockFetcher.java2
-rw-r--r--common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/RetryingBlockFetcher.java2
-rw-r--r--common/network-shuffle/src/main/java/org/apache/spark/network/shuffle/mesos/MesosExternalShuffleClient.java2
6 files changed, 7 insertions, 6 deletions
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<String, String> 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(