aboutsummaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorzsxwing <zsxwing@gmail.com>2014-12-22 12:11:36 -0800
committerAndrew Or <andrew@databricks.com>2014-12-22 12:11:36 -0800
commit8773705fd4ab167bb06bee7f274b337560e3c293 (patch)
tree300f3243d87a3967cedf82de5b4d33eb01ae8e4c /network
parent39272c8cdb3dc8ffbce44f6ee8055217d041e165 (diff)
downloadspark-8773705fd4ab167bb06bee7f274b337560e3c293.tar.gz
spark-8773705fd4ab167bb06bee7f274b337560e3c293.tar.bz2
spark-8773705fd4ab167bb06bee7f274b337560e3c293.zip
[SPARK-4883][Shuffle] Add a name to the directoryCleaner thread
Author: zsxwing <zsxwing@gmail.com> Closes #3734 from zsxwing/SPARK-4883 and squashes the following commits: e6f2b61 [zsxwing] Fix the name cc74727 [zsxwing] Add a name to the directoryCleaner thread
Diffstat (limited to 'network')
-rw-r--r--network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockManager.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockManager.java b/network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockManager.java
index dfe0ba0595..93e6fdd716 100644
--- a/network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockManager.java
+++ b/network/shuffle/src/main/java/org/apache/spark/network/shuffle/ExternalShuffleBlockManager.java
@@ -37,6 +37,7 @@ import org.apache.spark.network.buffer.FileSegmentManagedBuffer;
import org.apache.spark.network.buffer.ManagedBuffer;
import org.apache.spark.network.shuffle.protocol.ExecutorShuffleInfo;
import org.apache.spark.network.util.JavaUtils;
+import org.apache.spark.network.util.NettyUtils;
import org.apache.spark.network.util.TransportConf;
/**
@@ -49,7 +50,7 @@ import org.apache.spark.network.util.TransportConf;
* the Executor's memory, unlike the IndexShuffleBlockManager.
*/
public class ExternalShuffleBlockManager {
- private final Logger logger = LoggerFactory.getLogger(ExternalShuffleBlockManager.class);
+ private static final Logger logger = LoggerFactory.getLogger(ExternalShuffleBlockManager.class);
// Map containing all registered executors' metadata.
private final ConcurrentMap<AppExecId, ExecutorShuffleInfo> executors;
@@ -60,8 +61,9 @@ public class ExternalShuffleBlockManager {
private final TransportConf conf;
public ExternalShuffleBlockManager(TransportConf conf) {
- // TODO: Give this thread a name.
- this(conf, Executors.newSingleThreadExecutor());
+ this(conf, Executors.newSingleThreadExecutor(
+ // Add `spark` prefix because it will run in NM in Yarn mode.
+ NettyUtils.createThreadFactory("spark-shuffle-directory-cleaner")));
}
// Allows tests to have more control over when directories are cleaned up.