Skip to content

DEVO-417: revert use execution_date for collection name. #514

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 4, 2021
Merged

DEVO-417: revert use execution_date for collection name. #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b693008
Revert "DEVO-364: Use execution_date macro to generate collection name."
dkinzer Aug 4, 2021
182ee76
Revert "DEVO-249: Use execution_date macro to create collection name."
dkinzer Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions cob_datapipeline/prod_az_reindex_dag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
AZ_CLIENT_SECRET = Variable.get("AZ_CLIENT_SECRET")
AZ_BRANCH = Variable.get("AZ_PROD_BRANCH")

EXECUTION_DATE = '-{{ execution_date.strftime("%Y-%m-%d_%H-%M-%S") }}'

# CREATE DAG
DEFAULT_ARGS = {
'owner': 'airflow',
Expand All @@ -64,6 +62,13 @@
Tasks with custom logic are relegated to individual Python files.
"""

SET_COLLECTION_NAME = PythonOperator(
task_id='set_collection_name',
python_callable=datetime.now().strftime,
op_args=["%Y-%m-%d_%H-%M-%S"],
dag=DAG
)

GET_NUM_SOLR_DOCS_PRE = task_solrgetnumdocs(
DAG,
ALIAS,
Expand All @@ -74,7 +79,7 @@
CREATE_COLLECTION = tasks.create_sc_collection(
DAG,
SOLR_CONN.conn_id,
CONFIGSET + EXECUTION_DATE,
CONFIGSET + "-{{ ti.xcom_pull(task_ids='set_collection_name') }}",
REPLICATION_FACTOR,
CONFIGSET
)
Expand All @@ -84,7 +89,7 @@
bash_command=AIRFLOW_HOME + "/dags/cob_datapipeline/scripts/ingest_databases.sh ",
env={**os.environ, **{
"HOME": AIRFLOW_USER_HOME,
"SOLR_AZ_URL": tasks.get_solr_url(SOLR_CONN, CONFIGSET + EXECUTION_DATE),
"SOLR_AZ_URL": tasks.get_solr_url(SOLR_CONN, CONFIGSET + "-{{ ti.xcom_pull(task_ids='set_collection_name') }}"),
"AZ_CLIENT_ID": AZ_CLIENT_ID,
"AZ_CLIENT_SECRET": AZ_CLIENT_SECRET,
"AZ_BRANCH": AZ_BRANCH,
Expand All @@ -96,14 +101,14 @@

GET_NUM_SOLR_DOCS_POST = task_solrgetnumdocs(
DAG,
CONFIGSET + EXECUTION_DATE,
CONFIGSET +"-{{ ti.xcom_pull(task_ids='set_collection_name') }}",
'get_num_solr_docs_post',
conn_id=SOLR_CONN.conn_id)

SOLR_ALIAS_SWAP = tasks.swap_sc_alias(
DAG,
SOLR_CONN.conn_id,
CONFIGSET + EXECUTION_DATE,
CONFIGSET +"-{{ ti.xcom_pull(task_ids='set_collection_name') }}",
ALIAS
)

Expand All @@ -124,15 +129,15 @@
PUSH_COLLECTION = PushVariable(
task_id="push_collection",
name="AZ_PROD_COLLECTIONS",
value=CONFIGSET + EXECUTION_DATE,
value=CONFIGSET +"-{{ ti.xcom_pull(task_ids='set_collection_name') }}",
dag=DAG)

DELETE_COLLECTIONS = DeleteCollectionListVariable(
task_id="delete_collections",
solr_conn_id='SOLRCLOUD',
list_variable="AZ_PROD_COLLECTIONS",
skip_from_last=2,
skip_included=[CONFIGSET + EXECUTION_DATE],
skip_included=[CONFIGSET +"-{{ ti.xcom_pull(task_ids='set_collection_name') }}"],
dag=DAG)

POST_SLACK = PythonOperator(
Expand All @@ -143,7 +148,8 @@
)

# SET UP TASK DEPENDENCIES
CREATE_COLLECTION.set_upstream(GET_NUM_SOLR_DOCS_PRE)
SET_COLLECTION_NAME.set_upstream(GET_NUM_SOLR_DOCS_PRE)
CREATE_COLLECTION.set_upstream(SET_COLLECTION_NAME)
INDEX_DATABASES.set_upstream(CREATE_COLLECTION)
GET_NUM_SOLR_DOCS_POST.set_upstream(INDEX_DATABASES)
SOLR_ALIAS_SWAP.set_upstream(GET_NUM_SOLR_DOCS_POST)
Expand Down
23 changes: 14 additions & 9 deletions cob_datapipeline/qa_az_reindex_dag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
AZ_CLIENT_SECRET = Variable.get("AZ_CLIENT_SECRET")
AZ_BRANCH = Variable.get("AZ_QA_BRANCH")

EXECUTION_DATE = '-{{ execution_date.strftime("%Y-%m-%d_%H-%M-%S") }}'

# CREATE DAG
DEFAULT_ARGS = {
"owner": "cob-qa",
Expand All @@ -64,6 +62,12 @@
Tasks with custom logic are relegated to individual Python files.
"""

SET_COLLECTION_NAME = PythonOperator(
task_id="set_collection_name",
python_callable=datetime.now().strftime,
op_args=["%Y-%m-%d_%H-%M-%S"],
dag=DAG
)

GET_NUM_SOLR_DOCS_PRE = task_solrgetnumdocs(
DAG,
Expand All @@ -75,7 +79,7 @@
CREATE_COLLECTION = tasks.create_sc_collection(
DAG,
SOLR_CONN.conn_id,
CONFIGSET + EXECUTION_DATE,
CONFIGSET + "-{{ ti.xcom_pull(task_ids='set_collection_name') }}",
REPLICATION_FACTOR,
CONFIGSET
)
Expand All @@ -85,7 +89,7 @@
bash_command=AIRFLOW_HOME + "/dags/cob_datapipeline/scripts/ingest_databases.sh ",
env={**os.environ, **{
"HOME": AIRFLOW_USER_HOME,
"SOLR_AZ_URL": tasks.get_solr_url(SOLR_CONN, CONFIGSET + EXECUTION_DATE),
"SOLR_AZ_URL": tasks.get_solr_url(SOLR_CONN, CONFIGSET + "-{{ ti.xcom_pull(task_ids='set_collection_name') }}"),
"AZ_CLIENT_ID": AZ_CLIENT_ID,
"AZ_CLIENT_SECRET": AZ_CLIENT_SECRET,
"AZ_BRANCH": AZ_BRANCH,
Expand All @@ -97,14 +101,14 @@

GET_NUM_SOLR_DOCS_POST = task_solrgetnumdocs(
DAG,
CONFIGSET + EXECUTION_DATE,
CONFIGSET +"-{{ ti.xcom_pull(task_ids='set_collection_name') }}",
"get_num_solr_docs_post",
conn_id=SOLR_CONN.conn_id)

SOLR_ALIAS_SWAP = tasks.swap_sc_alias(
DAG,
SOLR_CONN.conn_id,
CONFIGSET + EXECUTION_DATE,
CONFIGSET +"-{{ ti.xcom_pull(task_ids='set_collection_name') }}",
ALIAS
)

Expand All @@ -125,15 +129,15 @@
PUSH_COLLECTION = PushVariable(
task_id="push_collection",
name="AZ_QA_COLLECTIONS",
value=CONFIGSET + EXECUTION_DATE,
value=CONFIGSET +"-{{ ti.xcom_pull(task_ids='set_collection_name') }}",
dag=DAG)

DELETE_COLLECTIONS = DeleteCollectionListVariable(
task_id="delete_collections",
solr_conn_id='SOLRCLOUD',
list_variable="AZ_QA_COLLECTIONS",
skip_from_last=2,
skip_included=[CONFIGSET + EXECUTION_DATE],
skip_included=[CONFIGSET +"-{{ ti.xcom_pull(task_ids='set_collection_name') }}"],
dag=DAG)

POST_SLACK = PythonOperator(
Expand All @@ -144,7 +148,8 @@
)

# SET UP TASK DEPENDENCIES
CREATE_COLLECTION.set_upstream(GET_NUM_SOLR_DOCS_PRE)
SET_COLLECTION_NAME.set_upstream(GET_NUM_SOLR_DOCS_PRE)
CREATE_COLLECTION.set_upstream(SET_COLLECTION_NAME)
INDEX_DATABASES.set_upstream(CREATE_COLLECTION)
GET_NUM_SOLR_DOCS_POST.set_upstream(INDEX_DATABASES)
SOLR_ALIAS_SWAP.set_upstream(GET_NUM_SOLR_DOCS_POST)
Expand Down
6 changes: 4 additions & 2 deletions tests/prod_az_reindex_dag_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def test_dag_interval_is_variable(self):
def test_dag_tasks_present(self):
"""Unit test that the DAG instance contains the expected tasks."""
self.assertEqual(self.tasks, [
"set_collection_name",
"get_num_solr_docs_pre",
"create_collection",
"index_az",
Expand All @@ -37,7 +38,8 @@ def test_dag_tasks_present(self):
def test_dag_task_order(self):
"""Unit test that the DAG instance contains the expected dependencies."""
expected_task_deps = {
"create_collection": "get_num_solr_docs_pre",
"set_collection_name": "get_num_solr_docs_pre",
"create_collection": "set_collection_name",
"index_az": "create_collection",
"get_num_solr_docs_post": "index_az",
"solr_alias_swap": "get_num_solr_docs_post",
Expand All @@ -62,4 +64,4 @@ def test_index_az_task(self):
self.assertEqual(task.env["AZ_BRANCH"], "AZ_BRANCH")
self.assertEqual(task.env["AZ_CLIENT_ID"], "AZ_CLIENT_ID")
self.assertEqual(task.env["AZ_CLIENT_SECRET"], "AZ_CLIENT_SECRET")
self.assertEqual(task.env["SOLR_AZ_URL"], "http://127.0.0.1:8983/solr/tul_cob-az-0-{{ execution_date.strftime(\"%Y-%m-%d_%H-%M-%S\") }}")
self.assertEqual(task.env["SOLR_AZ_URL"], "http://127.0.0.1:8983/solr/tul_cob-az-0-{{ ti.xcom_pull(task_ids='set_collection_name') }}")
6 changes: 4 additions & 2 deletions tests/qa_az_reindex_dag_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def test_dag_interval_is_variable(self):
def test_dag_tasks_present(self):
"""Unit test that the DAG instance contains the expected tasks."""
self.assertEqual(self.tasks, [
"set_collection_name",
"get_num_solr_docs_pre",
"create_collection",
"index_az",
Expand All @@ -37,7 +38,8 @@ def test_dag_tasks_present(self):
def test_dag_task_order(self):
"""Unit test that the DAG instance contains the expected dependencies."""
expected_task_deps = {
"create_collection": "get_num_solr_docs_pre",
"set_collection_name": "get_num_solr_docs_pre",
"create_collection": "set_collection_name",
"index_az": "create_collection",
"get_num_solr_docs_post": "index_az",
"solr_alias_swap": "get_num_solr_docs_post",
Expand All @@ -62,4 +64,4 @@ def test_index_databases_task(self):
self.assertEqual(task.env["AZ_BRANCH"], "AZ_BRANCH")
self.assertEqual(task.env["AZ_CLIENT_ID"], "AZ_CLIENT_ID")
self.assertEqual(task.env["AZ_CLIENT_SECRET"], "AZ_CLIENT_SECRET")
self.assertEqual(task.env["SOLR_AZ_URL"], "http://127.0.0.1:8983/solr/tul_cob-az-0-{{ execution_date.strftime(\"%Y-%m-%d_%H-%M-%S\") }}")
self.assertEqual(task.env["SOLR_AZ_URL"], "http://127.0.0.1:8983/solr/tul_cob-az-0-{{ ti.xcom_pull(task_ids='set_collection_name') }}")