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 E770D200B8C for ; Mon, 12 Sep 2016 18:30:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E616A160AB8; Mon, 12 Sep 2016 16:30:35 +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 36479160AB2 for ; Mon, 12 Sep 2016 18:30:35 +0200 (CEST) Received: (qmail 86518 invoked by uid 500); 12 Sep 2016 16:30:34 -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 86503 invoked by uid 99); 12 Sep 2016 16:30:34 -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; Mon, 12 Sep 2016 16:30:34 +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 7567ACB6E2 for ; Mon, 12 Sep 2016 16:30:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -5.144 X-Spam-Level: X-Spam-Status: No, score=-5.144 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=-1.124] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 1Jb0QMW0YiDx for ; Mon, 12 Sep 2016 16:30:31 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 0E9745FBC9 for ; Mon, 12 Sep 2016 16:30:30 +0000 (UTC) Received: (qmail 86453 invoked by uid 99); 12 Sep 2016 16:30:30 -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; Mon, 12 Sep 2016 16:30:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 83324DFD4C; Mon, 12 Sep 2016 16:30:30 +0000 (UTC) From: chtyim To: dev@tephra.incubator.apache.org Reply-To: dev@tephra.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-tephra pull request #10: TEPHRA-179 Transaction service high avail... Content-Type: text/plain Message-Id: <20160912163030.83324DFD4C@git1-us-west.apache.org> Date: Mon, 12 Sep 2016 16:30:30 +0000 (UTC) archived-at: Mon, 12 Sep 2016 16:30:36 -0000 Github user chtyim commented on a diff in the pull request: https://github.com/apache/incubator-tephra/pull/10#discussion_r78406297 --- Diff: tephra-core/src/main/java/org/apache/tephra/distributed/TransactionService.java --- @@ -42,28 +45,64 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import javax.annotation.Nullable; /** * */ -public final class TransactionService extends InMemoryTransactionService { +public class TransactionService extends AbstractService { private static final Logger LOG = LoggerFactory.getLogger(TransactionService.class); private LeaderElection leaderElection; private final ZKClient zkClient; + private final DiscoveryService discoveryService; + private final Provider txManagerProvider; + private final String serviceName; + private Cancellable cancelDiscovery; + + // thrift server config + private final String address; + private final int port; + private final int threads; + private final int ioThreads; + private final int maxReadBufferBytes; + + private TransactionManager txManager; private ThriftRPCServer server; @Inject public TransactionService(Configuration conf, ZKClient zkClient, DiscoveryService discoveryService, Provider txManagerProvider) { - super(conf, discoveryService, txManagerProvider); this.zkClient = zkClient; + this.discoveryService = discoveryService; + this.txManagerProvider = txManagerProvider; + + serviceName = conf.get(TxConstants.Service.CFG_DATA_TX_DISCOVERY_SERVICE_NAME, + TxConstants.Service.DEFAULT_DATA_TX_DISCOVERY_SERVICE_NAME); + + address = conf.get(TxConstants.Service.CFG_DATA_TX_BIND_ADDRESS, TxConstants.Service.DEFAULT_DATA_TX_BIND_ADDRESS); + port = conf.getInt(TxConstants.Service.CFG_DATA_TX_BIND_PORT, TxConstants.Service.DEFAULT_DATA_TX_BIND_PORT); + + // Retrieve the number of threads for the service + threads = conf.getInt(TxConstants.Service.CFG_DATA_TX_SERVER_THREADS, + TxConstants.Service.DEFAULT_DATA_TX_SERVER_THREADS); + ioThreads = conf.getInt(TxConstants.Service.CFG_DATA_TX_SERVER_IO_THREADS, + TxConstants.Service.DEFAULT_DATA_TX_SERVER_IO_THREADS); + + maxReadBufferBytes = conf.getInt(TxConstants.Service.CFG_DATA_TX_THRIFT_MAX_READ_BUFFER, + TxConstants.Service.DEFAULT_DATA_TX_THRIFT_MAX_READ_BUFFER); + + LOG.info("Configuring TransactionService" + --- End diff -- Use the `{}` syntax instead of `+`. --- 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. ---