Return-Path: X-Original-To: apmail-brooklyn-dev-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9DB5C18F71 for ; Thu, 22 Oct 2015 14:08:19 +0000 (UTC) Received: (qmail 18057 invoked by uid 500); 22 Oct 2015 14:08:19 -0000 Delivered-To: apmail-brooklyn-dev-archive@brooklyn.apache.org Received: (qmail 18020 invoked by uid 500); 22 Oct 2015 14:08:19 -0000 Mailing-List: contact dev-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list dev@brooklyn.incubator.apache.org Received: (qmail 18009 invoked by uid 99); 22 Oct 2015 14:08:18 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Oct 2015 14:08:18 +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 518841809E0 for ; Thu, 22 Oct 2015 14:08:18 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.971 X-Spam-Level: X-Spam-Status: No, score=0.971 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id cuBw1qRJpwtp for ; Thu, 22 Oct 2015 14:08:09 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 8CB7A42B35 for ; Thu, 22 Oct 2015 14:08:09 +0000 (UTC) Received: (qmail 17411 invoked by uid 99); 22 Oct 2015 14:08:09 -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, 22 Oct 2015 14:08:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1582DE0A31; Thu, 22 Oct 2015 14:08:09 +0000 (UTC) From: neykov To: dev@brooklyn.incubator.apache.org Reply-To: dev@brooklyn.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-brooklyn pull request: Refactoring openIptables executio... Content-Type: text/plain Message-Id: <20151022140809.1582DE0A31@git1-us-west.apache.org> Date: Thu, 22 Oct 2015 14:08:09 +0000 (UTC) Github user neykov commented on a diff in the pull request: https://github.com/apache/incubator-brooklyn/pull/980#discussion_r42751884 --- Diff: software/base/src/main/java/org/apache/brooklyn/entity/machine/MachineInitTasks.java --- @@ -75,13 +72,19 @@ public Void call() { /** * Returns a queued {@link Task} which stops iptables on the given machine. */ - public Task stopIptablesAsync(final SshMachineLocation machine) { - return DynamicTasks.queue("stop iptables", new Callable() { - public Void call() { - stopIptablesImpl(machine); - return null; - } - }); + public ProcessTaskWrapper stopIptablesAsync(final SshMachineLocation machine) { + + log.info("Stopping iptables for {} at {}", entity(), machine); + + List cmds = ImmutableList.of(); + if (isLocationFirewalldEnabled(machine)) { + cmds = ImmutableList.of(IptablesCommands.firewalldServiceStop(), IptablesCommands.firewalldServiceStatus()); + } else { + cmds = ImmutableList.of(IptablesCommands.iptablesServiceStop(), IptablesCommands.iptablesServiceStatus()); + } + ProcessTaskFactory stopIptables = SshTasks.newSshExecTaskFactory(machine, cmds.toArray(new String[cmds.size()])) + .summary("stop iptables"); --- End diff -- Also do a `.requireExitCodeZero` unless the command is expected to fail. --- 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. ---