zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject svn commit: r1759739 - in /zookeeper/trunk: CHANGES.txt bin/zkServer.sh
Date Thu, 08 Sep 2016 04:02:37 GMT
Author: phunt
Date: Thu Sep  8 04:02:37 2016
New Revision: 1759739

URL: http://svn.apache.org/viewvc?rev=1759739&view=rev
Log:
ZOOKEEPER-2536: When provide path for 'dataDir' with trailing space, it is taking correct
path (by trucating space) for snapshot but creating temporary file with some junk folder name
for zookeeper_server.pid (Rakesh Kumar Singh via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/bin/zkServer.sh

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1759739&r1=1759738&r2=1759739&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Thu Sep  8 04:02:37 2016
@@ -365,6 +365,12 @@ BUGFIXES:
   ZOOKEEPER-2558: Potential memory leak in recordio.c
   (Michael Han via phunt)
 
+  ZOOKEEPER-2536: When provide path for 'dataDir' with trailing space,
+  it is taking correct path (by trucating space) for snapshot but
+  creating temporary file with some junk folder name for
+  zookeeper_server.pid (Rakesh Kumar Singh via phunt)
+
+
 IMPROVEMENTS:
   ZOOKEEPER-2024 Major throughput improvement with mixed workloads (Kfir Lev-Ari via shralex)
 

Modified: zookeeper/trunk/bin/zkServer.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkServer.sh?rev=1759739&r1=1759738&r2=1759739&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkServer.sh (original)
+++ zookeeper/trunk/bin/zkServer.sh Thu Sep  8 04:02:37 2016
@@ -111,6 +111,7 @@ case "$OSTYPE" in
   ;;
 esac
 ZOO_DATADIR="$($GREP "^[[:space:]]*dataDir" "$ZOOCFG" | sed -e 's/.*=//')"
+ZOO_DATADIR="$(echo -e "${ZOO_DATADIR}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
 ZOO_DATALOGDIR="$($GREP "^[[:space:]]*dataLogDir" "$ZOOCFG" | sed -e 's/.*=//')"
 
 # iff autocreate is turned off and the datadirs don't exist fail



Mime
View raw message