From commits-return-12920-archive-asf-public=cust-asf.ponee.io@airflow.incubator.apache.org Thu Mar 1 08:47:42 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 6456818064D for ; Thu, 1 Mar 2018 08:47:42 +0100 (CET) Received: (qmail 45385 invoked by uid 500); 1 Mar 2018 07:47:41 -0000 Mailing-List: contact commits-help@airflow.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airflow.incubator.apache.org Delivered-To: mailing list commits@airflow.incubator.apache.org Received: (qmail 45376 invoked by uid 99); 1 Mar 2018 07:47:41 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2018 07:47:41 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 7BD53C19D3 for ; Thu, 1 Mar 2018 07:47:40 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -11.731 X-Spam-Level: X-Spam-Status: No, score=-11.731 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01, USER_IN_DEF_SPF_WL=-7.5] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id OiVY_Fb9z4Fw for ; Thu, 1 Mar 2018 07:47:38 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 79C125F181 for ; Thu, 1 Mar 2018 07:47:37 +0000 (UTC) Received: (qmail 45352 invoked by uid 99); 1 Mar 2018 07:47:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2018 07:47:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A14F5E944C; Thu, 1 Mar 2018 07:47:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fokko@apache.org To: commits@airflow.incubator.apache.org Message-Id: <9e47c3b4d21a443c9cb85500c08d6192@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-airflow git commit: [AIRFLOW-2160] Fix bad rowid deserialization Date: Thu, 1 Mar 2018 07:47:36 +0000 (UTC) Repository: incubator-airflow Updated Branches: refs/heads/master c61d836b4 -> a27bd620d [AIRFLOW-2160] Fix bad rowid deserialization Use Flask-Admin's iterdecode to correctly decode task instance rowids when they contain a dot Closes #3081 from cmlad/fix-bad-rowid- deserialization Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/a27bd620 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/a27bd620 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/a27bd620 Branch: refs/heads/master Commit: a27bd620d97950773c7732908eb3c597315fdd0e Parents: c61d836 Author: Christian Mladenov Authored: Thu Mar 1 08:46:43 2018 +0100 Committer: Fokko Driesprong Committed: Thu Mar 1 08:46:43 2018 +0100 ---------------------------------------------------------------------- airflow/www/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/a27bd620/airflow/www/views.py ---------------------------------------------------------------------- diff --git a/airflow/www/views.py b/airflow/www/views.py index 8694cbf..44ef8e0 100644 --- a/airflow/www/views.py +++ b/airflow/www/views.py @@ -2570,7 +2570,7 @@ class TaskInstanceModelView(ModelViewOnly): # Collect dags upfront as dagbag.get_dag() will reset the session for id_str in ids: - task_id, dag_id, execution_date = id_str.split(',') + task_id, dag_id, execution_date = iterdecode(id_str) dag = dagbag.get_dag(dag_id) task_details = dag_to_task_details.setdefault(dag, []) task_details.append((task_id, execution_date)) @@ -2604,7 +2604,7 @@ class TaskInstanceModelView(ModelViewOnly): TI = models.TaskInstance count = len(ids) for id in ids: - task_id, dag_id, execution_date = id.split(',') + task_id, dag_id, execution_date = iterdecode(id) execution_date = parse_execution_date(execution_date) ti = session.query(TI).filter(TI.task_id == task_id,