Skip to content

[SPARK-29720][CORE] Add linux condition to make ProcfsMetricsGetter more complete #26365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ulysses-you wants to merge 2 commits into from
Closed

[SPARK-29720][CORE] Add linux condition to make ProcfsMetricsGetter more complete #26365

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
266bd10
Add linux condition
ulysses-you Nov 2, 2019
410281e
Fix
ulysses-you Nov 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions core/src/main/scala/org/apache/spark/executor/ProcfsMetricsGetter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,14 @@ private[spark] class ProcfsMetricsGetter(procfsDir: String = "/proc/") extends L
SparkEnv.get.conf.get(config.EVENT_LOG_STAGE_EXECUTOR_METRICS)
val shouldLogStageExecutorProcessTreeMetrics =
SparkEnv.get.conf.get(config.EVENT_LOG_PROCESS_TREE_METRICS)
procDirExists.get && shouldLogStageExecutorProcessTreeMetrics && shouldLogStageExecutorMetrics
System.getProperty("os.name").startsWith("Linux") && procDirExists.get &&
shouldLogStageExecutorProcessTreeMetrics && shouldLogStageExecutorMetrics
}
}

private def computePid(): Int = {
if (!isAvailable || testing) {
return -1;
return -1
}
try {
// This can be simplified in java9:
Expand All @@ -88,7 +89,7 @@ private[spark] class ProcfsMetricsGetter(procfsDir: String = "/proc/") extends L

private def computePageSize(): Long = {
if (testing) {
return 4096;
return 4096
}
try {
val cmd = Array("getconf", "PAGESIZE")
Expand Down