Skip to content
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.

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

Fix: Resolve Issue With Name Node Corruption In New york Dataset #459

Merged
merged 4 commits into from
Aug 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 11 additions & 10 deletions datasets/new_york/pipelines/new_york/new_york_dag.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@
project_id="{{ var.value.gcp_project }}",
location="us-central1-c",
body={
"name": "new-york",
"name": "pubds-new-york",
"initial_node_count": 4,
"network": "{{ var.value.vpc_network }}",
"ip_allocation_policy": {"cluster_ipv4_cidr_block": "/26"},
"node_config": {
"machine_type": "e2-standard-16",
"oauth_scopes": [
Expand All @@ -55,10 +56,10 @@
name="311_service_requests",
project_id="{{ var.value.gcp_project }}",
location="us-central1-c",
cluster_name="new-york",
cluster_name="pubds-new-york",
namespace="default",
image_pull_policy="Always",
image="{{ var.json.new_york.container_registry.ny_311_service_requests.run_csv_transform_kub }}",
image="{{ var.json.new_york.container_registry.run_csv_transform_kub_ny_311_service_requests }}",
env_vars={
"PIPELINE_NAME": "{{ var.json.new_york.ny_311_service_requests.pipeline_name }}",
"SOURCE_URL": "{{ var.json.new_york.ny_311_service_requests.source_url }}",
Expand Down Expand Up @@ -86,10 +87,10 @@
name="citibike_stations",
project_id="{{ var.value.gcp_project }}",
location="us-central1-c",
cluster_name="new-york",
cluster_name="pubds-new-york",
namespace="default",
image_pull_policy="Always",
image="{{ var.json.new_york.container_registry.citibike_stations.run_csv_transform_kub }}",
image="{{ var.json.new_york.container_registry.run_csv_transform_kub_citibike_stations }}",
env_vars={
"PIPELINE_NAME": "{{ var.json.new_york.citibike_stations.pipeline_name }}",
"SOURCE_URL_STATIONS_JSON": "{{ var.json.new_york.citibike_stations.source_url_stations }}",
Expand Down Expand Up @@ -121,10 +122,10 @@
name="nypd_mv_collisions",
project_id="{{ var.value.gcp_project }}",
location="us-central1-c",
cluster_name="new-york",
cluster_name="pubds-new-york",
namespace="default",
image_pull_policy="Always",
image="{{ var.json.new_york.container_registry.nypd_mv_collisions.run_csv_transform_kub }}",
image="{{ var.json.new_york.container_registry.run_csv_transform_kub_nypd_mv_collisions }}",
env_vars={
"PIPELINE_NAME": "{{ var.json.new_york.nypd_mv_collisions.pipeline_name }}",
"SOURCE_URL": "{{ var.json.new_york.nypd_mv_collisions.source_url }}",
Expand Down Expand Up @@ -155,10 +156,10 @@
name="tree_census_1995",
project_id="{{ var.value.gcp_project }}",
location="us-central1-c",
cluster_name="new-york",
cluster_name="pubds-new-york",
namespace="default",
image_pull_policy="Always",
image="{{ var.json.new_york.container_registry.tree_census_1995.run_csv_transform_kub }}",
image="{{ var.json.new_york.container_registry.run_csv_transform_kub_tree_census_1995 }}",
env_vars={
"PIPELINE_NAME": "{{ var.json.new_york.tree_census_1995.pipeline_name }}",
"SOURCE_URL": "{{ var.json.new_york.tree_census_1995.source_url }}",
Expand All @@ -181,7 +182,7 @@
task_id="delete_cluster",
project_id="{{ var.value.gcp_project }}",
location="us-central1-c",
name="new-york",
name="pubds-new-york",
)

(
Expand Down
22 changes: 12 additions & 10 deletions datasets/new_york/pipelines/new_york/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,11 @@ dag:
project_id: "{{ var.value.gcp_project }}"
location: "us-central1-c"
body:
name: new-york
name: pubds-new-york
initial_node_count: 4
network: "{{ var.value.vpc_network }}"
ip_allocation_policy:
cluster_ipv4_cidr_block: "/26"
node_config:
machine_type: e2-standard-16
oauth_scopes:
Expand All @@ -55,10 +57,10 @@ dag:
name: "311_service_requests"
project_id: "{{ var.value.gcp_project }}"
location: "us-central1-c"
cluster_name: new-york
cluster_name: pubds-new-york
namespace: "default"
image_pull_policy: "Always"
image: "{{ var.json.new_york.container_registry.ny_311_service_requests.run_csv_transform_kub }}"
image: "{{ var.json.new_york.container_registry.run_csv_transform_kub_ny_311_service_requests }}"
env_vars:
PIPELINE_NAME: "{{ var.json.new_york.ny_311_service_requests.pipeline_name }}"
SOURCE_URL: "{{ var.json.new_york.ny_311_service_requests.source_url }}"
Expand Down Expand Up @@ -225,10 +227,10 @@ dag:
name: "citibike_stations"
project_id: "{{ var.value.gcp_project }}"
location: "us-central1-c"
cluster_name: new-york
cluster_name: pubds-new-york
namespace: "default"
image_pull_policy: "Always"
image: "{{ var.json.new_york.container_registry.citibike_stations.run_csv_transform_kub }}"
image: "{{ var.json.new_york.container_registry.run_csv_transform_kub_citibike_stations }}"
env_vars:
PIPELINE_NAME: "{{ var.json.new_york.citibike_stations.pipeline_name }}"
SOURCE_URL_STATIONS_JSON: "{{ var.json.new_york.citibike_stations.source_url_stations }}"
Expand Down Expand Up @@ -366,10 +368,10 @@ dag:
name: "nypd_mv_collisions"
project_id: "{{ var.value.gcp_project }}"
location: "us-central1-c"
cluster_name: new-york
cluster_name: pubds-new-york
namespace: "default"
image_pull_policy: "Always"
image: "{{ var.json.new_york.container_registry.nypd_mv_collisions.run_csv_transform_kub }}"
image: "{{ var.json.new_york.container_registry.run_csv_transform_kub_nypd_mv_collisions }}"
env_vars:
PIPELINE_NAME: "{{ var.json.new_york.nypd_mv_collisions.pipeline_name }}"
SOURCE_URL: "{{ var.json.new_york.nypd_mv_collisions.source_url }}"
Expand Down Expand Up @@ -511,10 +513,10 @@ dag:
name: "tree_census_1995"
project_id: "{{ var.value.gcp_project }}"
location: "us-central1-c"
cluster_name: new-york
cluster_name: pubds-new-york
namespace: "default"
image_pull_policy: "Always"
image: "{{ var.json.new_york.container_registry.tree_census_1995.run_csv_transform_kub }}"
image: "{{ var.json.new_york.container_registry.run_csv_transform_kub_tree_census_1995 }}"
env_vars:
PIPELINE_NAME: "{{ var.json.new_york.tree_census_1995.pipeline_name }}"
SOURCE_URL: "{{ var.json.new_york.tree_census_1995.source_url }}"
Expand Down Expand Up @@ -600,7 +602,7 @@ dag:
task_id: "delete_cluster"
project_id: "{{ var.value.gcp_project }}"
location: "us-central1-c"
name: new-york
name: pubds-new-york

graph_paths:
- "create_cluster >> [transform_csv_nypd_mv_collisions, transform_csv_ny_citibike_stations, transform_csv_ny_tree_census_1995, transform_csv_ny_311_service_requests ] >> delete_cluster"