search

apache-spark-on-k8s / spark

Apache Spark enhanced with native Kubernetes scheduler back-end: NOTE this repository is being ARCHIVED as all new development for the kubernetes scheduler back-end is now on https://github.com/apache/spark/
https://spark.apache.org/
Apache License 2.0
612 stars 118 forks source link

Branch 2.2 kubernetes #388

Closed foxish closed 7 years ago

foxish commented 7 years ago

Rebased onto Spark v2.2.0

/cc @apache-spark-on-k8s/contributors

foxish commented 7 years ago

Just realized I forgot to update the POMs. Will push a new change after seeing what issues crop up with integration tests (if any)

ifilonenko commented 7 years ago

rerun integration tests please

ifilonenko commented 7 years ago

LGTM

erikerlandson commented 7 years ago

LGTM, pending integration test completion

foxish commented 7 years ago

rerun integration tests please

foxish commented 7 years ago

(Hitting a flake. Being tracked in https://github.com/apache-spark-on-k8s/spark/issues/389)

foxish commented 7 years ago

rerun integration tests please

foxish commented 7 years ago

Will merge with a merge-commit on green. Neither squashing, nor the rebase-commit will help us here.

ash211 commented 7 years ago

@foxish I just looked through the commits on branch-2.1-kubernetes vs branch-2.2-kubernetes and found one difference:

branch-2.1-kubernetes has this commit that didn't get cherry-picked onto branch-2.2-kubernetes:

b139b46158 Andrew Ash 4 months ago Fix lint-check failures and javadoc8 break (#187)

foxish commented 7 years ago

I see. It should have picked up all commits. Could it be that the same fix existed upstream, and hence was considered empty and omitted by the rebase?

ash211 commented 7 years ago

Ah yes, those changes were already committed upstream in ed84cd06841. Good to go here!