Skip to content

Commit

Permalink
Merge pull request #2646 from joshpeng-quibi/fix/fail-fast-output
Browse files Browse the repository at this point in the history
Fix fast-fail not logging original error message
  • Loading branch information
beckjake authored Jul 27, 2020
2 parents f09bb17 + d2869e4 commit b9cf0cf
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
## dbt 0.17.2 (Release TBD)


### Fixes
- fast-fail option with adapters that don't support cancelling queries will now passthrough the original error messages ([#2644](https://github.com/fishtown-analytics/dbt/issues/2644))

Contributors:
- [@joshpeng-quibi](https://github.com/joshpeng-quibi) ([#2646](https://github.com/fishtown-analytics/dbt/pull/2646))
## dbt 0.17.2b1 (July 21, 2020)


Expand Down
16 changes: 8 additions & 8 deletions core/dbt/task/runnable.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,15 +295,15 @@ def _cancel_connections(self, pool):

yellow = dbt.ui.printer.COLOR_FG_YELLOW
dbt.ui.printer.print_timestamped_line(msg, yellow)
raise

for conn_name in adapter.cancel_open_connections():
if self.manifest is not None:
node = self.manifest.nodes.get(conn_name)
if node is not None and node.is_ephemeral_model:
continue
# if we don't have a manifest/don't have a node, print anyway.
dbt.ui.printer.print_cancel_line(conn_name)
else:
for conn_name in adapter.cancel_open_connections():
if self.manifest is not None:
node = self.manifest.nodes.get(conn_name)
if node is not None and node.is_ephemeral_model:
continue
# if we don't have a manifest/don't have a node, print anyway.
dbt.ui.printer.print_cancel_line(conn_name)

pool.join()

Expand Down

0 comments on commit b9cf0cf

Please sign in to comment.