You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2016/11/25 09:45:58 UTC
spark git commit: [SPARK-18119][SPARK-CORE] Namenode safemode check
is only performed on one namenode which can stuck the startup of SparkHistory
server
Repository: spark
Updated Branches:
refs/heads/master f58a8aa20 -> f42db0c0c
[SPARK-18119][SPARK-CORE] Namenode safemode check is only performed on one namenode which can stuck the startup of SparkHistory server
## What changes were proposed in this pull request?
Instead of using the setSafeMode method that check the first namenode used the one which permitts to check only for active NNs
## How was this patch tested?
manual tests
Please review https://cwiki.apache.org/confluence/display/SPARK/Contributing+to+Spark before opening a pull request.
This commit is contributed by Criteo SA under the Apache v2 licence.
Author: n.fraison <n....@criteo.com>
Closes #15648 from ashangit/SPARK-18119.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f42db0c0
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f42db0c0
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f42db0c0
Branch: refs/heads/master
Commit: f42db0c0c1434bfcccaa70d0db55e16c4396af04
Parents: f58a8aa
Author: n.fraison <n....@criteo.com>
Authored: Fri Nov 25 09:45:51 2016 +0000
Committer: Sean Owen <so...@cloudera.com>
Committed: Fri Nov 25 09:45:51 2016 +0000
----------------------------------------------------------------------
.../org/apache/spark/deploy/history/FsHistoryProvider.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f42db0c0/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala b/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala
index ca38a47..8ef69b1 100644
--- a/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/history/FsHistoryProvider.scala
@@ -663,9 +663,9 @@ private[history] class FsHistoryProvider(conf: SparkConf, clock: Clock)
false
}
- // For testing.
private[history] def isFsInSafeMode(dfs: DistributedFileSystem): Boolean = {
- dfs.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_GET)
+ /* true to check only for Active NNs status */
+ dfs.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_GET, true)
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org