Skip to content

[SPARK-8619][Streaming]Don't recover keytab and principal configuration within Streaming checkpoint #7008

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
SaintBacchus wants to merge 3 commits into from
Closed

[SPARK-8619][Streaming]Don't recover keytab and principal configuration within Streaming checkpoint #7008

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d8f800
Don't recover keytab and principal configuration within Streaming che…
SaintBacchus Jun 25, 2015
9b8e92c
Fix code style and add a short comment.
SaintBacchus Jun 30, 2015
d50dbdf
Delect one blank space
SaintBacchus Jun 30, 2015
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
12 changes: 10 additions & 2 deletions streaming/src/main/scala/org/apache/spark/streaming/Checkpoint.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,19 @@ class Checkpoint(@transient ssc: StreamingContext, val checkpointTime: Time)
val sparkConfPairs = ssc.conf.getAll

def createSparkConf(): SparkConf = {
val reloadConfs = List(

@andrewor14 andrewor14 Jun 29, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can you call this propertiesToReload? It's confusing to have reloadConfs here and newReloadConf down there when they're not describing the same thing.

@andrewor14 andrewor14 Jun 29, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

also, please add a short comment here to explain why this is necessary.

"spark.master",
"spark.yarn.keytab",
"spark.yarn.principal")

val newSparkConf = new SparkConf(loadDefaults = false).setAll(sparkConfPairs)
.remove("spark.driver.host")
.remove("spark.driver.port")
val newMasterOption = new SparkConf(loadDefaults = true).getOption("spark.master")
newMasterOption.foreach { newMaster => newSparkConf.setMaster(newMaster) }
val newReloadConf = new SparkConf(loadDefaults = true)
reloadConfs.foreach { conf =>
newReloadConf.getOption(conf)
.foreach(confValue => newSparkConf.set(conf, confValue))

@andrewor14 andrewor14 Jun 29, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

style

propertiesToReload.foreach { prop =>
  newReloadConf.getOption(prop).foreach { value =>
    newSparkConf.set(prop, value)
  }
}

@SaintBacchus SaintBacchus Jun 30, 2015

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Modified the code style

}
newSparkConf
}

Expand Down