From commits-return-2395-archive-asf-public=cust-asf.ponee.io@bookkeeper.apache.org Wed Jan 17 16:08:24 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 1008818062C for ; Wed, 17 Jan 2018 16:08:24 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 004D8160C35; Wed, 17 Jan 2018 15:08:24 +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 448F5160C1B for ; Wed, 17 Jan 2018 16:08:23 +0100 (CET) Received: (qmail 34172 invoked by uid 500); 17 Jan 2018 15:08:22 -0000 Mailing-List: contact commits-help@bookkeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bookkeeper-dev@bookkeeper.apache.org Delivered-To: mailing list commits@bookkeeper.apache.org Received: (qmail 34163 invoked by uid 99); 17 Jan 2018 15:08:22 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jan 2018 15:08:22 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id BFF8680FA8; Wed, 17 Jan 2018 15:08:21 +0000 (UTC) Date: Wed, 17 Jan 2018 15:08:21 +0000 To: "commits@bookkeeper.apache.org" Subject: [bookkeeper] branch branch-4.6 updated: Issue #981: Revert "ISSUE #561: Remove exec commands to start in the shell pid" MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <151620170168.31331.15021873021119187496@gitbox.apache.org> From: eolivelli@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: bookkeeper X-Git-Refname: refs/heads/branch-4.6 X-Git-Reftype: branch X-Git-Oldrev: 569a4822595d31e1929d096588290e5719723dbc X-Git-Newrev: ed7fd114444a9f8f392ca026328eb9d4541f3e50 X-Git-Rev: ed7fd114444a9f8f392ca026328eb9d4541f3e50 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. eolivelli pushed a commit to branch branch-4.6 in repository https://gitbox.apache.org/repos/asf/bookkeeper.git The following commit(s) were added to refs/heads/branch-4.6 by this push: new ed7fd11 Issue #981: Revert "ISSUE #561: Remove exec commands to start in the shell pid" ed7fd11 is described below commit ed7fd114444a9f8f392ca026328eb9d4541f3e50 Author: Ivan Kelly AuthorDate: Wed Jan 17 16:08:02 2018 +0100 Issue #981: Revert "ISSUE #561: Remove exec commands to start in the shell pid" This reverts commit 7d7497b70507ea3d31b184ebe04d98c733e2cf5b. Author: Ivan Kelly Reviewers: Enrico Olivelli , Jia Zhai , Sijie Guo This closes #994 from ivankelly/revert-exec, closes #981, closes #561 (cherry picked from commit 25b0d93405e87efeb35ca50cbd04ab14488ceaea) Signed-off-by: Enrico Olivelli --- bookkeeper-server/bin/bookkeeper | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bookkeeper-server/bin/bookkeeper b/bookkeeper-server/bin/bookkeeper index b3510e3..5dece81 100755 --- a/bookkeeper-server/bin/bookkeeper +++ b/bookkeeper-server/bin/bookkeeper @@ -218,21 +218,21 @@ OPTS="$OPTS -Dbookkeeper.log.file=$BOOKIE_LOG_FILE" #Change to BK_HOME to support relative paths cd "$BK_HOME" if [ $COMMAND == "bookie" ]; then - $JAVA $OPTS $JMX_ARGS org.apache.bookkeeper.server.Main --conf $BOOKIE_CONF $@ + exec $JAVA $OPTS $JMX_ARGS org.apache.bookkeeper.server.Main --conf $BOOKIE_CONF $@ elif [ $COMMAND == "autorecovery" ]; then - $JAVA $OPTS $JMX_ARGS org.apache.bookkeeper.replication.AutoRecoveryMain --conf $BOOKIE_CONF $@ + exec $JAVA $OPTS $JMX_ARGS org.apache.bookkeeper.replication.AutoRecoveryMain --conf $BOOKIE_CONF $@ elif [ $COMMAND == "localbookie" ]; then NUMBER=$1 shift - $JAVA $OPTS $JMX_ARGS -Dzookeeper.4lw.commands.whitelist='*' org.apache.bookkeeper.util.LocalBookKeeper $NUMBER $BOOKIE_CONF $@ + exec $JAVA $OPTS $JMX_ARGS -Dzookeeper.4lw.commands.whitelist='*' org.apache.bookkeeper.util.LocalBookKeeper $NUMBER $BOOKIE_CONF $@ elif [ $COMMAND == "upgrade" ]; then - $JAVA $OPTS org.apache.bookkeeper.bookie.FileSystemUpgrade --conf $BOOKIE_CONF $@ + exec $JAVA $OPTS org.apache.bookkeeper.bookie.FileSystemUpgrade --conf $BOOKIE_CONF $@ elif [ $COMMAND == "shell" ]; then ENTRY_FORMATTER_ARG="-DentryFormatterClass=${ENTRY_FORMATTER_CLASS:-org.apache.bookkeeper.util.StringEntryFormatter}" - $JAVA $OPTS $ENTRY_FORMATTER_ARG org.apache.bookkeeper.bookie.BookieShell -conf $BOOKIE_CONF $@ + exec $JAVA $OPTS $ENTRY_FORMATTER_ARG org.apache.bookkeeper.bookie.BookieShell -conf $BOOKIE_CONF $@ elif [ $COMMAND == "help" ]; then bookkeeper_help; else - $JAVA $OPTS $COMMAND $@ + exec $JAVA $OPTS $COMMAND $@ fi -- To stop receiving notification emails like this one, please contact ['"commits@bookkeeper.apache.org" '].