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 83D6C200C63 for ; Thu, 11 May 2017 15:26:10 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 82969160BD0; Thu, 11 May 2017 13:26:10 +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 BE586160BCC for ; Thu, 11 May 2017 15:26:09 +0200 (CEST) Received: (qmail 20838 invoked by uid 500); 11 May 2017 13:26:09 -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 20710 invoked by uid 99); 11 May 2017 13:26:08 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 May 2017 13:26:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 3D09A188A71 for ; Thu, 11 May 2017 13:26:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.021 X-Spam-Level: X-Spam-Status: No, score=-4.021 tagged_above=-999 required=6.31 tests=[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=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 9E1cB1D-tigV for ; Thu, 11 May 2017 13:26:06 +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 494745FB4E for ; Thu, 11 May 2017 13:26:05 +0000 (UTC) Received: (qmail 20324 invoked by uid 99); 11 May 2017 13:26:04 -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, 11 May 2017 13:26:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 62C8CE7DA2; Thu, 11 May 2017 13:26:04 +0000 (UTC) From: mxmrlv To: dev@ariatosca.incubator.apache.org Reply-To: dev@ariatosca.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-ariatosca pull request #129: ARIA-213 Sporadic tests failures over... Content-Type: text/plain Message-Id: <20170511132604.62C8CE7DA2@git1-us-west.apache.org> Date: Thu, 11 May 2017 13:26:04 +0000 (UTC) archived-at: Thu, 11 May 2017 13:26:10 -0000 Github user mxmrlv commented on a diff in the pull request: https://github.com/apache/incubator-ariatosca/pull/129#discussion_r115981331 --- Diff: aria/storage/instrumentation.py --- @@ -177,22 +232,30 @@ def apply_tracked_changes(tracked_changes, model): instance = None for attribute_name, value in tracked_attributes.items(): if value.initial != value.current: - if not instance: - instance = mapi.get(instance_id) + instance = instance or mapi.get(instance_id) setattr(instance, attribute_name, value.current) if instance: _validate_version_id(instance, mapi) mapi.update(instance) successfully_updated_changes[mapi_name][instance_id] = [ v.dict for v in tracked_attributes.values()] + + for mapi_name, new_instance in new_instances.items(): + successfully_updated_changes[mapi_name] = dict() + mapi = getattr(model, mapi_name) + for new_instance_kwargs in sorted(new_instance.values()): + instance = mapi.model_cls(**new_instance_kwargs) + mapi.put(instance) + successfully_updated_changes[mapi_name][instance.id] = new_instance_kwargs except BaseException: for key, value in successfully_updated_changes.items(): if not value: del successfully_updated_changes[key] - model.logger.error( - 'Registering all the changes to the storage has failed. {0}' - 'The successful updates were: {0} ' - '{1}'.format(os.linesep, json.dumps(successfully_updated_changes, indent=4))) + # TODO: if the successful has _STUB, the logging fails because it can't serialize the object --- End diff -- open jira --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---