Skip to content

[SPARK-13979][Core] Killed executor is re spawned without AWS key… #14601

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
agsachin wants to merge 5 commits into from
Closed

[SPARK-13979][Core] Killed executor is re spawned without AWS key… #14601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9efc140
[SPARK-13979][Spark Core]Killed executor is respawned without AWS key…
agsachin Aug 11, 2016
89e7c97
corrected the position of comment
agsachin Aug 16, 2016
ab6ab9b
Update SparkHadoopUtil.scala
agsachin Aug 21, 2016
9765dc9
Update SparkHadoopUtil.scala
agsachin Aug 21, 2016
dee4e6d
added fs.* instead of filesystem specific
agsachin Feb 25, 2017
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: 6 additions & 1 deletion core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,16 @@ class SparkHadoopUtil extends Logging {
hadoopConf.set("fs.s3n.awsSecretAccessKey", accessKey)
hadoopConf.set("fs.s3a.secret.key", accessKey)
}
// Copy any "spark.hadoop.foo=bar" system properties into conf as "foo=bar"
conf.getAll.foreach { case (key, value) =>
// Copy any "spark.hadoop.foo=bar" system properties into conf as "foo=bar"
if (key.startsWith("spark.hadoop.")) {
Copy link
Member

@lresende lresende Aug 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the comment above does not apply for the whole loop anymore and should be moved to this if statement

Copy link
Contributor Author

@agsachin agsachin Aug 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

hadoopConf.set(key.substring("spark.hadoop.".length), value)
}
// fix added for SPARK-13979
// Copy any "fs.*=bar" properties into conf it will cover almost all filesystem
else if (key.startsWith("fs.")){
hadoopConf.set(key, value)
}
}
val bufferSize = conf.get("spark.buffer.size", "65536")
hadoopConf.set("io.file.buffer.size", bufferSize)
Expand Down
8 changes: 6 additions & 2 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSourceStrategy.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ private[sql] object DataSourceStrategy extends Strategy with Logging {
case PhysicalOperation(projects, filters, l @ LogicalRelation(t: HadoopFsRelation, _)) =>
// See buildPartitionedTableScan for the reason that we need to create a shard
// broadcast HadoopConf.
val sharedHadoopConf = SparkHadoopUtil.get.conf
// fix added for SPARK-13979
// val sharedHadoopConf = SparkHadoopUtil.get.conf
val sharedHadoopConf = t.sqlContext.sparkContext.hadoopConfiguration
val confBroadcast =
t.sqlContext.sparkContext.broadcast(new SerializableConfiguration(sharedHadoopConf))
pruneFilterProject(
Expand Down Expand Up @@ -156,7 +158,9 @@ private[sql] object DataSourceStrategy extends Strategy with Logging {

// Because we are creating one RDD per partition, we need to have a shared HadoopConf.
// Otherwise, the cost of broadcasting HadoopConf in every RDD will be high.
val sharedHadoopConf = SparkHadoopUtil.get.conf
// fix added for SPARK-13979
// val sharedHadoopConf = SparkHadoopUtil.get.conf
val sharedHadoopConf = relation.sqlContext.sparkContext.hadoopConfiguration
val confBroadcast =
relation.sqlContext.sparkContext.broadcast(new SerializableConfiguration(sharedHadoopConf))
val partitionColumnNames = partitionColumns.fieldNames.toSet
Expand Down