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 89906200CA3 for ; Thu, 18 May 2017 01:09:27 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 883AB160BD5; Wed, 17 May 2017 23:09:27 +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 D5236160BBA for ; Thu, 18 May 2017 01:09:26 +0200 (CEST) Received: (qmail 57319 invoked by uid 500); 17 May 2017 23:09:26 -0000 Mailing-List: contact dev-help@tephra.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tephra.incubator.apache.org Delivered-To: mailing list dev@tephra.incubator.apache.org Received: (qmail 57267 invoked by uid 99); 17 May 2017 23:09:25 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 May 2017 23:09:25 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 73DBE1AF98D for ; Wed, 17 May 2017 23:09:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.02 X-Spam-Level: X-Spam-Status: No, score=-4.02 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, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id sYDF6JMbLafZ for ; Wed, 17 May 2017 23:09:24 +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 D5C025FDEE for ; Wed, 17 May 2017 23:09:23 +0000 (UTC) Received: (qmail 57240 invoked by uid 99); 17 May 2017 23:09:23 -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, 17 May 2017 23:09:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CD8BCE1835; Wed, 17 May 2017 23:09:22 +0000 (UTC) From: poornachandra To: dev@tephra.incubator.apache.org Reply-To: dev@tephra.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-tephra pull request #42: TEPHRA-228 Adding the ability to pass-in ... Content-Type: text/plain Message-Id: <20170517230922.CD8BCE1835@git1-us-west.apache.org> Date: Wed, 17 May 2017 23:09:22 +0000 (UTC) archived-at: Wed, 17 May 2017 23:09:27 -0000 Github user poornachandra commented on a diff in the pull request: https://github.com/apache/incubator-tephra/pull/42#discussion_r117127048 --- Diff: tephra-core/src/main/java/org/apache/tephra/TransactionManager.java --- @@ -347,15 +346,17 @@ private void cleanupTimedOutTransactions() { long currentTime = System.currentTimeMillis(); Map timedOut = Maps.newHashMap(); for (Map.Entry tx : inProgress.entrySet()) { - long expiration = tx.getValue().getExpiration(); + InProgressTx inProgressTx = tx.getValue(); + long expiration = inProgressTx.getExpiration(); if (expiration >= 0L && currentTime > expiration) { // timed out, remember tx id (can't remove while iterating over entries) - timedOut.put(tx.getKey(), tx.getValue().getType()); - LOG.info("Tx invalid list: added tx {} because of timeout", tx.getKey()); + timedOut.put(tx.getKey(), inProgressTx.getType()); + String clientId = inProgressTx.getClientId() != null ? inProgressTx.getClientId() : "unknown"; + LOG.info("Tx invalid list: added tx {} belonging to client '{}' because of timeout.", --- End diff -- Let's add the client id to the log message in `doInvalidate` too. --- 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. ---