Skip to content

Commit

Permalink
Revert "Update submit_job_to_cluster.py (#1708)"
Browse files Browse the repository at this point in the history
This reverts commit cdab25b.
  • Loading branch information
engelke authored Nov 21, 2018
1 parent 279779f commit 4cc90d6
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion dataproc/submit_job_to_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ def get_pyspark_file(filename):
return f, os.path.basename(filename)


def get_region_from_zone(zone):
try:
region_as_list = zone.split('-')[:-1]
return '-'.join(region_as_list)
except (AttributeError, IndexError, ValueError):
raise ValueError('Invalid zone provided, please check your input.')


def upload_pyspark_file(project_id, bucket_name, filename, file):
"""Uploads the PySpark file in this directory to the configured
input bucket."""
Expand Down Expand Up @@ -191,7 +199,7 @@ def get_client():
def main(project_id, zone, cluster_name, bucket_name,
pyspark_file=None, create_new_cluster=True):
dataproc = get_client()
region = 'global'
region = get_region_from_zone(zone)
try:
if pyspark_file:
spark_file, spark_filename = get_pyspark_file(pyspark_file)
Expand Down

0 comments on commit 4cc90d6

Please sign in to comment.