Skip to content

Commit

Permalink
Addressed latest comments
Browse files Browse the repository at this point in the history
  • Loading branch information
liyinan926 committed Dec 11, 2017
1 parent 2e7810b commit cbcd30e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions core/src/test/scala/org/apache/spark/util/UtilsSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1148,16 +1148,16 @@ class UtilsSuite extends SparkFunSuite with ResetSystemProperties with Logging {

test("check Kubernetes master URL") {
val k8sMasterURLHttps = Utils.checkAndGetK8sMasterUrl("k8s://https://host:port")
assert(k8sMasterURLHttps == "k8s:https://host:port")
assert(k8sMasterURLHttps === "k8s:https://host:port")

val k8sMasterURLHttp = Utils.checkAndGetK8sMasterUrl("k8s://http://host:port")
assert(k8sMasterURLHttp == "k8s:http://host:port")
assert(k8sMasterURLHttp === "k8s:http://host:port")

val k8sMasterURLWithoutScheme = Utils.checkAndGetK8sMasterUrl("k8s://127.0.0.1:8443")
assert(k8sMasterURLWithoutScheme == "k8s:https://127.0.0.1:8443")
assert(k8sMasterURLWithoutScheme === "k8s:https://127.0.0.1:8443")

val k8sMasterURLWithoutScheme2 = Utils.checkAndGetK8sMasterUrl("k8s://127.0.0.1")
assert(k8sMasterURLWithoutScheme2 == "k8s:https://127.0.0.1")
assert(k8sMasterURLWithoutScheme2 === "k8s:https://127.0.0.1")

intercept[IllegalArgumentException] {
Utils.checkAndGetK8sMasterUrl("k8s:https://host:port")
Expand Down
8 changes: 4 additions & 4 deletions docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ of the most common options to set are:
<td>
The amount of off-heap memory (in megabytes) to be allocated per driver in cluster mode. This is
memory that accounts for things like VM overheads, interned strings, other native overheads, etc.
This tends to grow with the container size (typically 6-10%). This option is supported in Yarn
mode and Kubernetes mode.
This tends to grow with the container size (typically 6-10%). This option is currently supported
on YARN and Kubernetes.
</td>
</tr>
<tr>
Expand All @@ -180,8 +180,8 @@ of the most common options to set are:
<td>
The amount of off-heap memory (in megabytes) to be allocated per executor. This is memory that
accounts for things like VM overheads, interned strings, other native overheads, etc. This tends
to grow with the executor size (typically 6-10%). This option is supported in Yarn mode and
Kubernetes mode.
to grow with the executor size (typically 6-10%). This option is currently supported on YARN and
Kubernetes.
</td>
</tr>
<tr>
Expand Down

0 comments on commit cbcd30e

Please sign in to comment.