hadoop-zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject svn commit: r776889 - in /hadoop/zookeeper/trunk: CHANGES.txt build.xml src/c/tests/zkServer.sh src/contrib/rest/src/test/zkServer.sh src/recipes/lock/src/c/tests/zkServer.sh
Date Wed, 20 May 2009 22:41:11 GMT
Author: phunt
Date: Wed May 20 22:41:10 2009
New Revision: 776889

URL: http://svn.apache.org/viewvc?rev=776889&view=rev
Log:
ZOOKEEPER-411. Building zookeeper fails on RHEL 5 64 bit during test-cppunit

Modified:
    hadoop/zookeeper/trunk/CHANGES.txt
    hadoop/zookeeper/trunk/build.xml
    hadoop/zookeeper/trunk/src/c/tests/zkServer.sh
    hadoop/zookeeper/trunk/src/contrib/rest/src/test/zkServer.sh
    hadoop/zookeeper/trunk/src/recipes/lock/src/c/tests/zkServer.sh

Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=776889&r1=776888&r2=776889&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Wed May 20 22:41:10 2009
@@ -74,13 +74,20 @@
 
   ZOOKEEPER-400. Issues with procedure to close ledger. (flavio)
 
-  ZOOKEEPER-405. nullpointer exception in zookeeper java shell. (mahadev via breed)
+  ZOOKEEPER-405. nullpointer exception in zookeeper java shell.
+  (mahadev via breed)
 
-  ZOOKEEPER-410. address all findbugs warnings in client/server classes. (phunt via breed)
+  ZOOKEEPER-410. address all findbugs warnings in client/server classes.
+  (phunt via breed)
   
   ZOOKEEPER-403. cleanup javac compiler warnings. (flavio via breed)
 
-  ZOOKEEPER-407. address all findbugs warnings in org.apache.zookeeper.server.quorum.** packages.
(flavio via breed)
+  ZOOKEEPER-407. address all findbugs warnings in
+  org.apache.zookeeper.server.quorum.** packages.
+  (flavio via breed)
+
+  ZOOKEEPER-411. Building zookeeper fails on RHEL 5 64 bit during test-cppunit
+  (mahadev via phunt)
 
 IMPROVEMENTS:
   ZOOKEEPER-308. improve the atomic broadcast performance 3x.
@@ -130,24 +137,26 @@
  
   ZOOKEEPER-389. add help/usage to the c shell cli.c (phunt via mahadev)
 
-  ZOOKEEPER-376. ant test target re-compiles cppunit code every time (phunt
-via mahadev)
+  ZOOKEEPER-376. ant test target re-compiles cppunit code every time
+  (phunt via mahadev)
 
   ZOOKEEPER-391. bookeeper mainline code should not be calling
-printStackTrace. (flavio via mahadev) 
+  printStackTrace. (flavio via mahadev) 
  
   ZOOKEEPER-300. zk jmx code is calling printStackTrace when creating bean
-name (should not be) (phunt via mahadev)
+  name (should not be) (phunt via mahadev)
 
   ZOOKEEPER-94. JMX tests are needed to verify that the JMX MBeans work
-properly (phunt via mahadev)
+  properly (phunt via mahadev)
 
-  ZOOKEEPER-404. nightly build failed on hudson. (henry robinson and pat via
-mahadev)
+  ZOOKEEPER-404. nightly build failed on hudson.
+  (henry robinson and pat via mahadev)
 
-  ZOOKEEPER-345. the CLIs should allow addAuth to be invoked. (henry robinson via breed)
+  ZOOKEEPER-345. the CLIs should allow addAuth to be invoked.
+  (henry robinson via breed)
 
-  ZOOKEEPER-292. commit configure scripts (autotools) to svn for c projects and include in
release (phunt via breed)
+  ZOOKEEPER-292. commit configure scripts (autotools) to svn for c projects and
+  include in release (phunt via breed)
  
 NEW FEATURES:
 

Modified: hadoop/zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/build.xml?rev=776889&r1=776888&r2=776889&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/build.xml (original)
+++ hadoop/zookeeper/trunk/build.xml Wed May 20 22:41:10 2009
@@ -699,11 +699,10 @@
             depends="compile_jute, jar, create-cppunit-makefile"
             if="cppunit"
 		description="to run cppunit test cases">
-        <property name="fuser.bin" value="/sbin"/>
         <property name="lib.cppunit" value="/usr/local/lib"/>
 	<exec dir="${test.cppunit.dir}" executable="make" failonerror="true">
 		<env key="LD_LIBRARY_PATH" value="${lib.cppunit}"/>
-		<env key="PATH" path="${env.PATH};${c.src.dir};${fuser.bin};"/>
+		<env key="PATH" path="${env.PATH};${c.src.dir};"/>
                 <env key="CALLER" value="ANT"/>
                 <env key="base_dir" value="${basedir}"/>
 		<arg line="clean run-check"/>

Modified: hadoop/zookeeper/trunk/src/c/tests/zkServer.sh
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/tests/zkServer.sh?rev=776889&r1=776888&r2=776889&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/c/tests/zkServer.sh (original)
+++ hadoop/zookeeper/trunk/src/c/tests/zkServer.sh Wed May 20 22:41:10 2009
@@ -33,17 +33,33 @@
 fi
 
 # Make sure nothing is left over from before
-fuser -skn tcp 22181/tcp
+if [ -r "/tmp/zk.pid" ]
+then
+pid=`cat /tmp/zk.pid`
+kill -9 $pid
+rm -f /tmp/zk.pid
+fi
+
+if [ -r "${base_dir}/build/tmp/zk.pid" ]
+then
+pid=`cat ${base_dir}/build/tmp/zk.pid`
+kill -9 $pid
+rm -f ${base_dir}/build/tmp/zk.pid
+fi
+
 
 case $1 in
 start|startClean)
 	if [ "x${base_dir}" == "x" ]
         then
       	mkdir -p /tmp/zkdata
-	java -cp ../../zookeeper-dev.jar:../../src/java/lib/log4j-1.2.15.jar:../../conf org.apache.zookeeper.server.ZooKeeperServerMain
22181 /tmp/zkdata &> /tmp/zk.log &
+        java -cp ../../zookeeper-dev.jar:../../src/java/lib/log4j-1.2.15.jar:../../conf org.apache.zookeeper.server.ZooKeeperServerMain
22181 /tmp/zkdata &> /tmp/zk.log &
+        pid=$!
+        echo $! > /tmp/zk.pid        
         else
         mkdir -p ${base_dir}/build/tmp/zkdata
         java -cp ${base_dir}/zookeeper-dev.jar:${base_dir}/src/java/lib/log4j-1.2.15.jar:${base_dir}/conf
org.apache.zookeeper.server.ZooKeeperServerMain 22181 ${base_dir}/build/tmp/zkdata &>
${base_dir}/build/tmp/zk.log &
+        echo $! > ${base_dir}/build/tmp/zk.pid
 	fi
         sleep 5
 	;;

Modified: hadoop/zookeeper/trunk/src/contrib/rest/src/test/zkServer.sh
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/rest/src/test/zkServer.sh?rev=776889&r1=776888&r2=776889&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/rest/src/test/zkServer.sh (original)
+++ hadoop/zookeeper/trunk/src/contrib/rest/src/test/zkServer.sh Wed May 20 22:41:10 2009
@@ -33,7 +33,19 @@
 fi
 
 # Make sure nothing is left over from before
-fuser -skn tcp 22182/tcp
+if [ -r "/tmp/zk.pid" ]
+then
+pid=`cat /tmp/zk.pid`
+kill -9 $pid
+rm -f /tmp/zk.pid
+fi
+
+if [ -r "${base_dir}/build/tmp/zk.pid" ]
+then
+pid=`cat ${base_dir}/build/tmp/zk.pid`
+kill -9 $pid
+rm -f ${base_dir}/build/tmp/zk.pid
+fi
 
 case $1 in
 start|startClean)
@@ -41,9 +53,11 @@
         then
         mkdir -p /tmp/zkdata
         java -cp ../../../zookeeper-dev.jar:../../../src/java/lib/log4j-1.2.15.jar:../../../conf
org.apache.zookeeper.server.ZooKeeperServerMain 22182 /tmp/zkdata &> /tmp/zk.log &
+        echo $! > /tmp/zk.pid
         else
         mkdir -p ${base_dir}/build/tmp/zkdata
         java -cp ${base_dir}/zookeeper-dev.jar:${base_dir}/src/java/lib/log4j-1.2.15.jar:${base_dir}/conf
org.apache.zookeeper.server.ZooKeeperServerMain 22182 ${base_dir}/build/tmp/zkdata &>
${base_dir}/build/tmp/zk.log &
+        echo $! > ${base_dir}/build/tmp/zk.pid
     fi
         sleep 5
     ;;

Modified: hadoop/zookeeper/trunk/src/recipes/lock/src/c/tests/zkServer.sh
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/recipes/lock/src/c/tests/zkServer.sh?rev=776889&r1=776888&r2=776889&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/recipes/lock/src/c/tests/zkServer.sh (original)
+++ hadoop/zookeeper/trunk/src/recipes/lock/src/c/tests/zkServer.sh Wed May 20 22:41:10 2009
@@ -29,13 +29,20 @@
 fi
 
 # Make sure nothing is left over from before
-fuser -skn tcp 22181/tcp
+if [ -r "/tmp/zk.pid" ]
+then
+pid=`cat /tmp/zk.pid`
+kill -9 $pid
+rm -f /tmp/zk.pid
+fi
+
 
 case $1 in
 start|startClean)
 	mkdir -p /tmp/zkdata
 	java -cp ../../../../../zookeeper-dev.jar:../../../../../src/java/lib/log4j-1.2.15.jar:../../../../../conf/
org.apache.zookeeper.server.ZooKeeperServerMain 22181 /tmp/zkdata &> /tmp/zk.log &
-	sleep 5
+        echo $! > /tmp/zk.pid
+        sleep 5
 	;;
 stop)
 	# Already killed above



Mime
View raw message