Revert wrong migration revertion and revert the right one#31429

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
potiuk merged 2 commits into from
May 19, 2023
Merged

Revert wrong migration revertion and revert the right one #31429

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
978a6f7
Revert "Revert "Save scheduler execution time by caching dags (#30704…
potiuk May 19, 2023
50cc702
Revert "Save scheduler execution time by adding new Index idea for da…
potiuk May 19, 2023
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
18 changes: 15 additions & 3 deletions airflow/jobs/scheduler_job_runner.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,9 @@
from collections import Counter
from dataclasses import dataclass
from datetime import datetime, timedelta
from functools import lru_cache, partial
from pathlib import Path
from typing import TYPE_CHECKING, Any, Collection, Iterable, Iterator
from typing import TYPE_CHECKING, Any, Callable, Collection, Iterable, Iterator

from sqlalchemy import and_, func, not_, or_, text
from sqlalchemy.exc import OperationalError
Expand DownExpand Up@@ -1052,8 +1053,13 @@ def _do_scheduling(self, session: Session) -> int:
callback_tuples = self._schedule_all_dag_runs(guard, dag_runs, session)

# Send the callbacks after we commit to ensure the context is up to date when it gets run
# cache saves time during scheduling of many dag_runs for same dag
cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
partial(self.dagbag.get_dag, session=session)
)
for dag_run, callback_to_run in callback_tuples:
dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
dag = cached_get_dag(dag_run.dag_id)

if not dag:
self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
continue
Expand DownExpand Up@@ -1317,8 +1323,14 @@ def _update_state(dag: DAG, dag_run: DagRun):
tags={"dag_id": dag.dag_id},
)

# cache saves time during scheduling of many dag_runs for same dag
cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
partial(self.dagbag.get_dag, session=session)
)

for dag_run in dag_runs:
dag = dag_run.dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
dag = dag_run.dag = cached_get_dag(dag_run.dag_id)

if not dag:
self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
continue
Expand Down
56 changes: 0 additions & 56 deletions airflow/migrations/versions/0126_2_7_0_add_index_on_last_scheduling_decision_.py
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions airflow/models/dagrun.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,15 +144,6 @@ class DagRun(Base, LoggingMixin):
UniqueConstraint("dag_id", "execution_date", name="dag_run_dag_id_execution_date_key"),
UniqueConstraint("dag_id", "run_id", name="dag_run_dag_id_run_id_key"),
Index("idx_last_scheduling_decision", last_scheduling_decision),
Index(
"idx_last_scheduling_decision_queued",
# Not possible to add .nulls_first(), because only postgresql can handle Index like that.
# Migration script which contains postgres dialect check adds NULLS FIST to index.
last_scheduling_decision,
execution_date,
_state,
postgresql_where=text("state='queued'"),
),
Index("idx_dag_run_dag_id", dag_id),
Index(
"idx_dag_run_running_dags",
Expand Down
2 changes: 1 addition & 1 deletion docs/apache-airflow/img/airflow_erd.sha256
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
811b1c45f8fa985feacacffafc30c82a6049bb33948c33bb218c13c48f971097
4987842fd67d29e194f1117e127d3291ba60d3fbc3e81cba75ce93884c263321
4 changes: 2 additions & 2 deletions docs/apache-airflow/img/airflow_erd.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 1 addition & 4 deletions docs/apache-airflow/migrations-ref.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,7 @@ Here's the list of all the Database Migrations that are executed via when you ru
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| Revision ID | Revises ID | Airflow Version | Description |
+=================================+===================+===================+==============================================================+
| ``14db5484317e`` (head) | ``937cbd173ca1`` | ``2.7.0`` | Add index on last_scheduling_decision NULLS FIRST, |
| | | | execution_date, state for queued dagrun |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``937cbd173ca1`` | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
| ``937cbd173ca1`` (head) | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``98ae134e6fff`` | ``6abdffdd4815`` | ``2.6.0`` | Increase length of user identifier columns in ``ab_user`` |
| | | | and ``ab_register_user`` tables |
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Revert wrong migration revertion and revert the right one#31429

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

potiuk
merged 2 commits into

from

May 19, 2023
 Merged


Revert wrong migration revertion and revert the right one
#31429
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
978a6f7

Revert "Revert "Save scheduler execution time by caching dags (#30704…


potiuk May 19, 2023
50cc702

Revert "Save scheduler execution time by adding new Index idea for da…


potiuk May 19, 2023

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


18 changes: 15 additions & 3 deletions
airflow/jobs/scheduler_job_runner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,9 @@
from collections import Counter
from dataclasses import dataclass
from datetime import datetime, timedelta
from functools import lru_cache, partial
from pathlib import Path
from typing import TYPE_CHECKING, Any, Collection, Iterable, Iterator
from typing import TYPE_CHECKING, Any, Callable, Collection, Iterable, Iterator

from sqlalchemy import and_, func, not_, or_, text
from sqlalchemy.exc import OperationalError
Expand DownExpand Up@@ -1052,8 +1053,13 @@ def _do_scheduling(self, session: Session) -> int:
 callback_tuples = self._schedule_all_dag_runs(guard, dag_runs, session)

 # Send the callbacks after we commit to ensure the context is up to date when it gets run
 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )
 for dag_run, callback_to_run in callback_tuples:
 dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand DownExpand Up@@ -1317,8 +1323,14 @@ def _update_state(dag: DAG, dag_run: DagRun):
 tags={"dag_id": dag.dag_id},
 )

 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )

 for dag_run in dag_runs:
 dag = dag_run.dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = dag_run.dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand Down

56 changes: 0 additions & 56 deletions
airflow/migrations/versions/0126_2_7_0_add_index_on_last_scheduling_decision_.py

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
airflow/models/dagrun.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,15 +144,6 @@ class DagRun(Base, LoggingMixin):
 UniqueConstraint("dag_id", "execution_date", name="dag_run_dag_id_execution_date_key"),
 UniqueConstraint("dag_id", "run_id", name="dag_run_dag_id_run_id_key"),
 Index("idx_last_scheduling_decision", last_scheduling_decision),
 Index(
 "idx_last_scheduling_decision_queued",
 # Not possible to add .nulls_first(), because only postgresql can handle Index like that.
 # Migration script which contains postgres dialect check adds NULLS FIST to index.
 last_scheduling_decision,
 execution_date,
 _state,
 postgresql_where=text("state='queued'"),
 ),
 Index("idx_dag_run_dag_id", dag_id),
 Index(
 "idx_dag_run_running_dags",
Expand Down

2 changes: 1 addition & 1 deletion
docs/apache-airflow/img/airflow_erd.sha256

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
811b1c45f8fa985feacacffafc30c82a6049bb33948c33bb218c13c48f971097
4987842fd67d29e194f1117e127d3291ba60d3fbc3e81cba75ce93884c263321

4 changes: 2 additions & 2 deletions
docs/apache-airflow/img/airflow_erd.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 1 addition & 4 deletions
docs/apache-airflow/migrations-ref.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,7 @@ Here's the list of all the Database Migrations that are executed via when you ru
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| Revision ID | Revises ID | Airflow Version | Description |
+=================================+===================+===================+==============================================================+
| ``14db5484317e`` (head) | ``937cbd173ca1`` | ``2.7.0`` | Add index on last_scheduling_decision NULLS FIRST, |
| | | | execution_date, state for queued dagrun |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``937cbd173ca1`` | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
| ``937cbd173ca1`` (head) | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``98ae134e6fff`` | ``6abdffdd4815`` | ``2.6.0`` | Increase length of user identifier columns in ``ab_user`` |
| | | | and ``ab_register_user`` tables |
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Revert wrong migration revertion and revert the right one#31429

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

potiuk
merged 2 commits into

from

May 19, 2023
 Merged


Revert wrong migration revertion and revert the right one
#31429
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
978a6f7

Revert "Revert "Save scheduler execution time by caching dags (#30704…


potiuk May 19, 2023
50cc702

Revert "Save scheduler execution time by adding new Index idea for da…


potiuk May 19, 2023

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


18 changes: 15 additions & 3 deletions
airflow/jobs/scheduler_job_runner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,9 @@
from collections import Counter
from dataclasses import dataclass
from datetime import datetime, timedelta
from functools import lru_cache, partial
from pathlib import Path
from typing import TYPE_CHECKING, Any, Collection, Iterable, Iterator
from typing import TYPE_CHECKING, Any, Callable, Collection, Iterable, Iterator

from sqlalchemy import and_, func, not_, or_, text
from sqlalchemy.exc import OperationalError
Expand DownExpand Up@@ -1052,8 +1053,13 @@ def _do_scheduling(self, session: Session) -> int:
 callback_tuples = self._schedule_all_dag_runs(guard, dag_runs, session)

 # Send the callbacks after we commit to ensure the context is up to date when it gets run
 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )
 for dag_run, callback_to_run in callback_tuples:
 dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand DownExpand Up@@ -1317,8 +1323,14 @@ def _update_state(dag: DAG, dag_run: DagRun):
 tags={"dag_id": dag.dag_id},
 )

 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )

 for dag_run in dag_runs:
 dag = dag_run.dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = dag_run.dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand Down

56 changes: 0 additions & 56 deletions
airflow/migrations/versions/0126_2_7_0_add_index_on_last_scheduling_decision_.py

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
airflow/models/dagrun.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,15 +144,6 @@ class DagRun(Base, LoggingMixin):
 UniqueConstraint("dag_id", "execution_date", name="dag_run_dag_id_execution_date_key"),
 UniqueConstraint("dag_id", "run_id", name="dag_run_dag_id_run_id_key"),
 Index("idx_last_scheduling_decision", last_scheduling_decision),
 Index(
 "idx_last_scheduling_decision_queued",
 # Not possible to add .nulls_first(), because only postgresql can handle Index like that.
 # Migration script which contains postgres dialect check adds NULLS FIST to index.
 last_scheduling_decision,
 execution_date,
 _state,
 postgresql_where=text("state='queued'"),
 ),
 Index("idx_dag_run_dag_id", dag_id),
 Index(
 "idx_dag_run_running_dags",
Expand Down

2 changes: 1 addition & 1 deletion
docs/apache-airflow/img/airflow_erd.sha256

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
811b1c45f8fa985feacacffafc30c82a6049bb33948c33bb218c13c48f971097
4987842fd67d29e194f1117e127d3291ba60d3fbc3e81cba75ce93884c263321

4 changes: 2 additions & 2 deletions
docs/apache-airflow/img/airflow_erd.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 1 addition & 4 deletions
docs/apache-airflow/migrations-ref.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,7 @@ Here's the list of all the Database Migrations that are executed via when you ru
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| Revision ID | Revises ID | Airflow Version | Description |
+=================================+===================+===================+==============================================================+
| ``14db5484317e`` (head) | ``937cbd173ca1`` | ``2.7.0`` | Add index on last_scheduling_decision NULLS FIRST, |
| | | | execution_date, state for queued dagrun |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``937cbd173ca1`` | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
| ``937cbd173ca1`` (head) | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``98ae134e6fff`` | ``6abdffdd4815`` | ``2.6.0`` | Increase length of user identifier columns in ``ab_user`` |
| | | | and ``ab_register_user`` tables |
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Revert wrong migration revertion and revert the right one#31429

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

potiuk
merged 2 commits into

from

May 19, 2023
 Merged


Revert wrong migration revertion and revert the right one
#31429
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
978a6f7

Revert "Revert "Save scheduler execution time by caching dags (#30704…


potiuk May 19, 2023
50cc702

Revert "Save scheduler execution time by adding new Index idea for da…


potiuk May 19, 2023

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


18 changes: 15 additions & 3 deletions
airflow/jobs/scheduler_job_runner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,9 @@
from collections import Counter
from dataclasses import dataclass
from datetime import datetime, timedelta
from functools import lru_cache, partial
from pathlib import Path
from typing import TYPE_CHECKING, Any, Collection, Iterable, Iterator
from typing import TYPE_CHECKING, Any, Callable, Collection, Iterable, Iterator

from sqlalchemy import and_, func, not_, or_, text
from sqlalchemy.exc import OperationalError
Expand DownExpand Up@@ -1052,8 +1053,13 @@ def _do_scheduling(self, session: Session) -> int:
 callback_tuples = self._schedule_all_dag_runs(guard, dag_runs, session)

 # Send the callbacks after we commit to ensure the context is up to date when it gets run
 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )
 for dag_run, callback_to_run in callback_tuples:
 dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand DownExpand Up@@ -1317,8 +1323,14 @@ def _update_state(dag: DAG, dag_run: DagRun):
 tags={"dag_id": dag.dag_id},
 )

 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )

 for dag_run in dag_runs:
 dag = dag_run.dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = dag_run.dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand Down

56 changes: 0 additions & 56 deletions
airflow/migrations/versions/0126_2_7_0_add_index_on_last_scheduling_decision_.py

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
airflow/models/dagrun.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,15 +144,6 @@ class DagRun(Base, LoggingMixin):
 UniqueConstraint("dag_id", "execution_date", name="dag_run_dag_id_execution_date_key"),
 UniqueConstraint("dag_id", "run_id", name="dag_run_dag_id_run_id_key"),
 Index("idx_last_scheduling_decision", last_scheduling_decision),
 Index(
 "idx_last_scheduling_decision_queued",
 # Not possible to add .nulls_first(), because only postgresql can handle Index like that.
 # Migration script which contains postgres dialect check adds NULLS FIST to index.
 last_scheduling_decision,
 execution_date,
 _state,
 postgresql_where=text("state='queued'"),
 ),
 Index("idx_dag_run_dag_id", dag_id),
 Index(
 "idx_dag_run_running_dags",
Expand Down

2 changes: 1 addition & 1 deletion
docs/apache-airflow/img/airflow_erd.sha256

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
811b1c45f8fa985feacacffafc30c82a6049bb33948c33bb218c13c48f971097
4987842fd67d29e194f1117e127d3291ba60d3fbc3e81cba75ce93884c263321

4 changes: 2 additions & 2 deletions
docs/apache-airflow/img/airflow_erd.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 1 addition & 4 deletions
docs/apache-airflow/migrations-ref.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,7 @@ Here's the list of all the Database Migrations that are executed via when you ru
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| Revision ID | Revises ID | Airflow Version | Description |
+=================================+===================+===================+==============================================================+
| ``14db5484317e`` (head) | ``937cbd173ca1`` | ``2.7.0`` | Add index on last_scheduling_decision NULLS FIRST, |
| | | | execution_date, state for queued dagrun |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``937cbd173ca1`` | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
| ``937cbd173ca1`` (head) | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``98ae134e6fff`` | ``6abdffdd4815`` | ``2.6.0`` | Increase length of user identifier columns in ``ab_user`` |
| | | | and ``ab_register_user`` tables |
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Revert wrong migration revertion and revert the right one#31429

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

potiuk
merged 2 commits into

from

May 19, 2023
 Merged


Revert wrong migration revertion and revert the right one
#31429
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
978a6f7

Revert "Revert "Save scheduler execution time by caching dags (#30704…


potiuk May 19, 2023
50cc702

Revert "Save scheduler execution time by adding new Index idea for da…


potiuk May 19, 2023

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


18 changes: 15 additions & 3 deletions
airflow/jobs/scheduler_job_runner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,9 @@
from collections import Counter
from dataclasses import dataclass
from datetime import datetime, timedelta
from functools import lru_cache, partial
from pathlib import Path
from typing import TYPE_CHECKING, Any, Collection, Iterable, Iterator
from typing import TYPE_CHECKING, Any, Callable, Collection, Iterable, Iterator

from sqlalchemy import and_, func, not_, or_, text
from sqlalchemy.exc import OperationalError
Expand DownExpand Up@@ -1052,8 +1053,13 @@ def _do_scheduling(self, session: Session) -> int:
 callback_tuples = self._schedule_all_dag_runs(guard, dag_runs, session)

 # Send the callbacks after we commit to ensure the context is up to date when it gets run
 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )
 for dag_run, callback_to_run in callback_tuples:
 dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand DownExpand Up@@ -1317,8 +1323,14 @@ def _update_state(dag: DAG, dag_run: DagRun):
 tags={"dag_id": dag.dag_id},
 )

 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )

 for dag_run in dag_runs:
 dag = dag_run.dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = dag_run.dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand Down

56 changes: 0 additions & 56 deletions
airflow/migrations/versions/0126_2_7_0_add_index_on_last_scheduling_decision_.py

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
airflow/models/dagrun.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,15 +144,6 @@ class DagRun(Base, LoggingMixin):
 UniqueConstraint("dag_id", "execution_date", name="dag_run_dag_id_execution_date_key"),
 UniqueConstraint("dag_id", "run_id", name="dag_run_dag_id_run_id_key"),
 Index("idx_last_scheduling_decision", last_scheduling_decision),
 Index(
 "idx_last_scheduling_decision_queued",
 # Not possible to add .nulls_first(), because only postgresql can handle Index like that.
 # Migration script which contains postgres dialect check adds NULLS FIST to index.
 last_scheduling_decision,
 execution_date,
 _state,
 postgresql_where=text("state='queued'"),
 ),
 Index("idx_dag_run_dag_id", dag_id),
 Index(
 "idx_dag_run_running_dags",
Expand Down

2 changes: 1 addition & 1 deletion
docs/apache-airflow/img/airflow_erd.sha256

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
811b1c45f8fa985feacacffafc30c82a6049bb33948c33bb218c13c48f971097
4987842fd67d29e194f1117e127d3291ba60d3fbc3e81cba75ce93884c263321

4 changes: 2 additions & 2 deletions
docs/apache-airflow/img/airflow_erd.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 1 addition & 4 deletions
docs/apache-airflow/migrations-ref.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,7 @@ Here's the list of all the Database Migrations that are executed via when you ru
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| Revision ID | Revises ID | Airflow Version | Description |
+=================================+===================+===================+==============================================================+
| ``14db5484317e`` (head) | ``937cbd173ca1`` | ``2.7.0`` | Add index on last_scheduling_decision NULLS FIRST, |
| | | | execution_date, state for queued dagrun |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``937cbd173ca1`` | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
| ``937cbd173ca1`` (head) | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``98ae134e6fff`` | ``6abdffdd4815`` | ``2.6.0`` | Increase length of user identifier columns in ``ab_user`` |
| | | | and ``ab_register_user`` tables |
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Revert wrong migration revertion and revert the right one#31429

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

potiuk
merged 2 commits into

from

May 19, 2023
 Merged


Revert wrong migration revertion and revert the right one
#31429
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
978a6f7

Revert "Revert "Save scheduler execution time by caching dags (#30704…


potiuk May 19, 2023
50cc702

Revert "Save scheduler execution time by adding new Index idea for da…


potiuk May 19, 2023

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


18 changes: 15 additions & 3 deletions
airflow/jobs/scheduler_job_runner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,9 @@
from collections import Counter
from dataclasses import dataclass
from datetime import datetime, timedelta
from functools import lru_cache, partial
from pathlib import Path
from typing import TYPE_CHECKING, Any, Collection, Iterable, Iterator
from typing import TYPE_CHECKING, Any, Callable, Collection, Iterable, Iterator

from sqlalchemy import and_, func, not_, or_, text
from sqlalchemy.exc import OperationalError
Expand DownExpand Up@@ -1052,8 +1053,13 @@ def _do_scheduling(self, session: Session) -> int:
 callback_tuples = self._schedule_all_dag_runs(guard, dag_runs, session)

 # Send the callbacks after we commit to ensure the context is up to date when it gets run
 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )
 for dag_run, callback_to_run in callback_tuples:
 dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand DownExpand Up@@ -1317,8 +1323,14 @@ def _update_state(dag: DAG, dag_run: DagRun):
 tags={"dag_id": dag.dag_id},
 )

 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )

 for dag_run in dag_runs:
 dag = dag_run.dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = dag_run.dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand Down

56 changes: 0 additions & 56 deletions
airflow/migrations/versions/0126_2_7_0_add_index_on_last_scheduling_decision_.py

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
airflow/models/dagrun.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,15 +144,6 @@ class DagRun(Base, LoggingMixin):
 UniqueConstraint("dag_id", "execution_date", name="dag_run_dag_id_execution_date_key"),
 UniqueConstraint("dag_id", "run_id", name="dag_run_dag_id_run_id_key"),
 Index("idx_last_scheduling_decision", last_scheduling_decision),
 Index(
 "idx_last_scheduling_decision_queued",
 # Not possible to add .nulls_first(), because only postgresql can handle Index like that.
 # Migration script which contains postgres dialect check adds NULLS FIST to index.
 last_scheduling_decision,
 execution_date,
 _state,
 postgresql_where=text("state='queued'"),
 ),
 Index("idx_dag_run_dag_id", dag_id),
 Index(
 "idx_dag_run_running_dags",
Expand Down

2 changes: 1 addition & 1 deletion
docs/apache-airflow/img/airflow_erd.sha256

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
811b1c45f8fa985feacacffafc30c82a6049bb33948c33bb218c13c48f971097
4987842fd67d29e194f1117e127d3291ba60d3fbc3e81cba75ce93884c263321

4 changes: 2 additions & 2 deletions
docs/apache-airflow/img/airflow_erd.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 1 addition & 4 deletions
docs/apache-airflow/migrations-ref.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,7 @@ Here's the list of all the Database Migrations that are executed via when you ru
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| Revision ID | Revises ID | Airflow Version | Description |
+=================================+===================+===================+==============================================================+
| ``14db5484317e`` (head) | ``937cbd173ca1`` | ``2.7.0`` | Add index on last_scheduling_decision NULLS FIRST, |
| | | | execution_date, state for queued dagrun |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``937cbd173ca1`` | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
| ``937cbd173ca1`` (head) | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``98ae134e6fff`` | ``6abdffdd4815`` | ``2.6.0`` | Increase length of user identifier columns in ``ab_user`` |
| | | | and ``ab_register_user`` tables |
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Revert wrong migration revertion and revert the right one#31429

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

potiuk
merged 2 commits into

from

May 19, 2023
 Merged


Revert wrong migration revertion and revert the right one
#31429
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
978a6f7

Revert "Revert "Save scheduler execution time by caching dags (#30704…


potiuk May 19, 2023
50cc702

Revert "Save scheduler execution time by adding new Index idea for da…


potiuk May 19, 2023

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


18 changes: 15 additions & 3 deletions
airflow/jobs/scheduler_job_runner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,9 @@
from collections import Counter
from dataclasses import dataclass
from datetime import datetime, timedelta
from functools import lru_cache, partial
from pathlib import Path
from typing import TYPE_CHECKING, Any, Collection, Iterable, Iterator
from typing import TYPE_CHECKING, Any, Callable, Collection, Iterable, Iterator

from sqlalchemy import and_, func, not_, or_, text
from sqlalchemy.exc import OperationalError
Expand DownExpand Up@@ -1052,8 +1053,13 @@ def _do_scheduling(self, session: Session) -> int:
 callback_tuples = self._schedule_all_dag_runs(guard, dag_runs, session)

 # Send the callbacks after we commit to ensure the context is up to date when it gets run
 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )
 for dag_run, callback_to_run in callback_tuples:
 dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand DownExpand Up@@ -1317,8 +1323,14 @@ def _update_state(dag: DAG, dag_run: DagRun):
 tags={"dag_id": dag.dag_id},
 )

 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )

 for dag_run in dag_runs:
 dag = dag_run.dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = dag_run.dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand Down

56 changes: 0 additions & 56 deletions
airflow/migrations/versions/0126_2_7_0_add_index_on_last_scheduling_decision_.py

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
airflow/models/dagrun.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,15 +144,6 @@ class DagRun(Base, LoggingMixin):
 UniqueConstraint("dag_id", "execution_date", name="dag_run_dag_id_execution_date_key"),
 UniqueConstraint("dag_id", "run_id", name="dag_run_dag_id_run_id_key"),
 Index("idx_last_scheduling_decision", last_scheduling_decision),
 Index(
 "idx_last_scheduling_decision_queued",
 # Not possible to add .nulls_first(), because only postgresql can handle Index like that.
 # Migration script which contains postgres dialect check adds NULLS FIST to index.
 last_scheduling_decision,
 execution_date,
 _state,
 postgresql_where=text("state='queued'"),
 ),
 Index("idx_dag_run_dag_id", dag_id),
 Index(
 "idx_dag_run_running_dags",
Expand Down

2 changes: 1 addition & 1 deletion
docs/apache-airflow/img/airflow_erd.sha256

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
811b1c45f8fa985feacacffafc30c82a6049bb33948c33bb218c13c48f971097
4987842fd67d29e194f1117e127d3291ba60d3fbc3e81cba75ce93884c263321

4 changes: 2 additions & 2 deletions
docs/apache-airflow/img/airflow_erd.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 1 addition & 4 deletions
docs/apache-airflow/migrations-ref.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,7 @@ Here's the list of all the Database Migrations that are executed via when you ru
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| Revision ID | Revises ID | Airflow Version | Description |
+=================================+===================+===================+==============================================================+
| ``14db5484317e`` (head) | ``937cbd173ca1`` | ``2.7.0`` | Add index on last_scheduling_decision NULLS FIRST, |
| | | | execution_date, state for queued dagrun |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``937cbd173ca1`` | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
| ``937cbd173ca1`` (head) | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``98ae134e6fff`` | ``6abdffdd4815`` | ``2.6.0`` | Increase length of user identifier columns in ``ab_user`` |
| | | | and ``ab_register_user`` tables |
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Revert wrong migration revertion and revert the right one#31429

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

potiuk
merged 2 commits into

from

May 19, 2023
 Merged


Revert wrong migration revertion and revert the right one
#31429
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
978a6f7

Revert "Revert "Save scheduler execution time by caching dags (#30704…


potiuk May 19, 2023
50cc702

Revert "Save scheduler execution time by adding new Index idea for da…


potiuk May 19, 2023

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


18 changes: 15 additions & 3 deletions
airflow/jobs/scheduler_job_runner.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,8 +28,9 @@
from collections import Counter
from dataclasses import dataclass
from datetime import datetime, timedelta
from functools import lru_cache, partial
from pathlib import Path
from typing import TYPE_CHECKING, Any, Collection, Iterable, Iterator
from typing import TYPE_CHECKING, Any, Callable, Collection, Iterable, Iterator

from sqlalchemy import and_, func, not_, or_, text
from sqlalchemy.exc import OperationalError
Expand DownExpand Up@@ -1052,8 +1053,13 @@ def _do_scheduling(self, session: Session) -> int:
 callback_tuples = self._schedule_all_dag_runs(guard, dag_runs, session)

 # Send the callbacks after we commit to ensure the context is up to date when it gets run
 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )
 for dag_run, callback_to_run in callback_tuples:
 dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand DownExpand Up@@ -1317,8 +1323,14 @@ def _update_state(dag: DAG, dag_run: DagRun):
 tags={"dag_id": dag.dag_id},
 )

 # cache saves time during scheduling of many dag_runs for same dag
 cached_get_dag: Callable[[str], DAG | None] = lru_cache()(
 partial(self.dagbag.get_dag, session=session)
 )

 for dag_run in dag_runs:
 dag = dag_run.dag = self.dagbag.get_dag(dag_run.dag_id, session=session)
 dag = dag_run.dag = cached_get_dag(dag_run.dag_id)

 if not dag:
 self.log.error("DAG '%s' not found in serialized_dag table", dag_run.dag_id)
 continue
Expand Down

56 changes: 0 additions & 56 deletions
airflow/migrations/versions/0126_2_7_0_add_index_on_last_scheduling_decision_.py

View file


Open in desktop


This file was deleted.


9 changes: 0 additions & 9 deletions
airflow/models/dagrun.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,15 +144,6 @@ class DagRun(Base, LoggingMixin):
 UniqueConstraint("dag_id", "execution_date", name="dag_run_dag_id_execution_date_key"),
 UniqueConstraint("dag_id", "run_id", name="dag_run_dag_id_run_id_key"),
 Index("idx_last_scheduling_decision", last_scheduling_decision),
 Index(
 "idx_last_scheduling_decision_queued",
 # Not possible to add .nulls_first(), because only postgresql can handle Index like that.
 # Migration script which contains postgres dialect check adds NULLS FIST to index.
 last_scheduling_decision,
 execution_date,
 _state,
 postgresql_where=text("state='queued'"),
 ),
 Index("idx_dag_run_dag_id", dag_id),
 Index(
 "idx_dag_run_running_dags",
Expand Down

2 changes: 1 addition & 1 deletion
docs/apache-airflow/img/airflow_erd.sha256

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
811b1c45f8fa985feacacffafc30c82a6049bb33948c33bb218c13c48f971097
4987842fd67d29e194f1117e127d3291ba60d3fbc3e81cba75ce93884c263321

4 changes: 2 additions & 2 deletions
docs/apache-airflow/img/airflow_erd.svg

View file


Open in desktop

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

5 changes: 1 addition & 4 deletions
docs/apache-airflow/migrations-ref.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,10 +39,7 @@ Here's the list of all the Database Migrations that are executed via when you ru
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| Revision ID | Revises ID | Airflow Version | Description |
+=================================+===================+===================+==============================================================+
| ``14db5484317e`` (head) | ``937cbd173ca1`` | ``2.7.0`` | Add index on last_scheduling_decision NULLS FIRST, |
| | | | execution_date, state for queued dagrun |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``937cbd173ca1`` | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
| ``937cbd173ca1`` (head) | ``98ae134e6fff`` | ``2.7.0`` | Add index to task_instance table |
+---------------------------------+-------------------+-------------------+--------------------------------------------------------------+
| ``98ae134e6fff`` | ``6abdffdd4815`` | ``2.6.0`` | Increase length of user identifier columns in ``ab_user`` |
| | | | and ``ab_register_user`` tables |
Expand Down