Properly wrap getOrElse in a tuple

[mccheah]

No description provided.

[ash211]

I was seeing this when building:

5767 [INFO] --- scala-maven-plugin:3.2.2:compile (scala-compile-first) @ spark-kubernetes_2.11 ---^M
5768 [INFO] Using zinc server for incremental compilation^M
5769 [info] Compiling 9 Scala sources to /home/ubuntu/spark/resource-managers/kubernetes/core/target/scala-2.11/classes...^M
5770 [warn] /home/ubuntu/spark/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/kubernetes/KubernetesClusterSchedulerBackend.scala:566: No automatic adaptation here: use
5771 [warn]         signature: Option.getOrElse[B >: A](default: => B): B^M
5772 [warn]   given arguments: withMaybeShuffleConfigPod, withMaybeShuffleConfigExecutorContainer^M
5773 [warn]  after adaptation: Option.getOrElse((withMaybeShuffleConfigPod, withMaybeShuffleConfigExecutorContainer): (io.fabric8.kubernetes.api.model.Pod, io.fabric8.kubernetes.api.model.Container))^M
5774 [warn]         }.getOrElse(withMaybeShuffleConfigPod, withMaybeShuffleConfigExecutorContainer)^M
5775 [warn]                    ^^M
5776 [error] /home/ubuntu/spark/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/kubernetes/KubernetesClusterSchedulerBackend.scala:566: too many arguments for method ge
5777 [error]         }.getOrElse(withMaybeShuffleConfigPod, withMaybeShuffleConfigExecutorContainer)^M
5778 [error]                    ^^M
5779 [error] /home/ubuntu/spark/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/kubernetes/KubernetesClusterSchedulerBackend.scala:571: type mismatch;^M
5780 [error]  found   : Any^M
5781 [error]  required: io.fabric8.kubernetes.api.model.Pod^M
5782 [error]                   withMaybeSmallFilesMountedPod,^M
5783 [error]                   ^^M
5784 [error] /home/ubuntu/spark/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/kubernetes/KubernetesClusterSchedulerBackend.scala:573: type mismatch;^M
5785 [error]  found   : Any^M
5786 [error]  required: io.fabric8.kubernetes.api.model.Container^M
5787 [error]                 withMaybeSmallFilesMountedContainer))^M
5788 [error]                 ^^M
5789 [error] /home/ubuntu/spark/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/kubernetes/KubernetesClusterSchedulerBackend.scala:591: type mismatch;^M
5790 [error]  found   : Any^M
5791 [error]  required: io.fabric8.kubernetes.api.model.Pod^M
5792 [error]         executorPodWithInitContainer, nodeToLocalTaskCount)^M
5793 [error]         ^^M
5794 [warn] one warning found^M
5795 [error] four errors found^M
5796 [error] Compile failed at Aug 23, 2017 7:53:45 PM [4.000s]^M

[mccheah]

I'm still not sure why this passed in Jenkins before this change though. The code was more or less strictly incorrect and shouldn't have compiled anywhere. IntelliJ compiles this fine too and passes tests.

[erikerlandson]

Wow.