Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9F95A200BD7 for ; Wed, 2 Nov 2016 16:59:25 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9E3D1160B0F; Wed, 2 Nov 2016 15:59:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E80F0160B0C for ; Wed, 2 Nov 2016 16:59:24 +0100 (CET) Received: (qmail 44885 invoked by uid 500); 2 Nov 2016 15:58:37 -0000 Mailing-List: contact dev-help@ariatosca.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ariatosca.incubator.apache.org Delivered-To: mailing list dev@ariatosca.incubator.apache.org Received: (qmail 44845 invoked by uid 99); 2 Nov 2016 15:58:37 -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; Wed, 02 Nov 2016 15:58:37 +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 25A73CCDAC for ; Wed, 2 Nov 2016 15:58:37 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] 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 93SkWvcpj_bA for ; Wed, 2 Nov 2016 15:58:36 +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 85EC25FBCF for ; Wed, 2 Nov 2016 15:58:35 +0000 (UTC) Received: (qmail 25314 invoked by uid 99); 2 Nov 2016 15:47:25 -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; Wed, 02 Nov 2016 15:47:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8A079E0A05; Wed, 2 Nov 2016 15:47:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dankilman@apache.org To: dev@ariatosca.incubator.apache.org Message-Id: <3c98d427b6dd44289756c885c28edc5a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ariatosca git commit: fixes Date: Wed, 2 Nov 2016 15:47:25 +0000 (UTC) archived-at: Wed, 02 Nov 2016 15:59:25 -0000 Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-14-workflow-engine-tests ff5098ca8 -> 1efdef505 fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/1efdef50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/1efdef50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/1efdef50 Branch: refs/heads/ARIA-14-workflow-engine-tests Commit: 1efdef505ee82fa609a594664d1b370f3fc15a89 Parents: ff5098c Author: Dan Kilman Authored: Wed Nov 2 17:47:15 2016 +0200 Committer: Dan Kilman Committed: Wed Nov 2 17:47:15 2016 +0200 ---------------------------------------------------------------------- aria/storage/models.py | 2 +- aria/workflows/core/engine.py | 3 ++- aria/workflows/core/tasks.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1efdef50/aria/storage/models.py ---------------------------------------------------------------------- diff --git a/aria/storage/models.py b/aria/storage/models.py index eb6b8e8..e5fc1ac 100644 --- a/aria/storage/models.py +++ b/aria/storage/models.py @@ -237,7 +237,7 @@ class Operation(Model): id = Field(type=basestring, default=uuid_generator) status = Field(type=basestring, choices=STATES, default=PENDING) execution_id = Field(type=basestring) - eta = Field(type=datetime, default=0) + eta = Field(type=datetime, default=datetime.now) started_at = Field(type=datetime, default=None) ended_at = Field(type=datetime, default=None) max_retries = Field(type=int, default=0) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1efdef50/aria/workflows/core/engine.py ---------------------------------------------------------------------- diff --git a/aria/workflows/core/engine.py b/aria/workflows/core/engine.py index 7a2431c..5cd4604 100644 --- a/aria/workflows/core/engine.py +++ b/aria/workflows/core/engine.py @@ -18,6 +18,7 @@ The workflow engine. Executes workflows """ import time +from datetime import datetime import networkx @@ -63,7 +64,7 @@ class Engine(logger.LoggerMixin): raise def _executable_tasks(self): - now = time.time() + now = datetime.now() return (task for task in self._tasks_iter() if task.status == models.Operation.PENDING and task.eta <= now and http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/1efdef50/aria/workflows/core/tasks.py ---------------------------------------------------------------------- diff --git a/aria/workflows/core/tasks.py b/aria/workflows/core/tasks.py index 625802a..98d7c13 100644 --- a/aria/workflows/core/tasks.py +++ b/aria/workflows/core/tasks.py @@ -17,7 +17,7 @@ Workflow tasks """ -import time +from datetime import datetime from aria import logger from aria.storage import models @@ -64,7 +64,7 @@ class BaseWorkflowTask(BaseTask): def __init__(self, *args, **kwargs): super(BaseWorkflowTask, self).__init__(*args, **kwargs) self.status = models.Operation.PENDING - self.eta = time.time() + self.eta = datetime.now() class StartWorkflowTask(BaseWorkflowTask):