You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ju...@apache.org on 2012/09/25 21:02:31 UTC
svn commit: r1390052 - in /incubator/kafka/branches/0.8/system_test/utils:
kafka_system_test_utils.py system_test_utils.py
Author: junrao
Date: Tue Sep 25 19:02:30 2012
New Revision: 1390052
URL: http://svn.apache.org/viewvc?rev=1390052&view=rev
Log:
System Test should remove the top level data log directory; patched by John Fung; reviewed by Jun Rao; KAFKA-526
Modified:
incubator/kafka/branches/0.8/system_test/utils/kafka_system_test_utils.py
incubator/kafka/branches/0.8/system_test/utils/system_test_utils.py
Modified: incubator/kafka/branches/0.8/system_test/utils/kafka_system_test_utils.py
URL: http://svn.apache.org/viewvc/incubator/kafka/branches/0.8/system_test/utils/kafka_system_test_utils.py?rev=1390052&r1=1390051&r2=1390052&view=diff
==============================================================================
--- incubator/kafka/branches/0.8/system_test/utils/kafka_system_test_utils.py (original)
+++ incubator/kafka/branches/0.8/system_test/utils/kafka_system_test_utils.py Tue Sep 25 19:02:30 2012
@@ -824,7 +824,7 @@ def cleanup_data_at_remote_hosts(systemT
logger.info("skipping role [" + role + "] on host : [" + hostname + "]", extra=d)
continue
- cmdStr = "ssh " + hostname + " 'rm -r " + dataDir + "/*'"
+ cmdStr = "ssh " + hostname + " 'rm -rf " + dataDir + "'"
if not dataDir.startswith("/tmp"):
logger.warn("possible destructive command [" + cmdStr + "]", extra=d)
Modified: incubator/kafka/branches/0.8/system_test/utils/system_test_utils.py
URL: http://svn.apache.org/viewvc/incubator/kafka/branches/0.8/system_test/utils/system_test_utils.py?rev=1390052&r1=1390051&r2=1390052&view=diff
==============================================================================
--- incubator/kafka/branches/0.8/system_test/utils/system_test_utils.py (original)
+++ incubator/kafka/branches/0.8/system_test/utils/system_test_utils.py Tue Sep 25 19:02:30 2012
@@ -387,7 +387,7 @@ def remove_kafka_home_dir_at_remote_host
logger.info("executing command [" + cmdStr + "]", extra=d)
system_test_utils.sys_call(cmdStr)
- cmdStr = "ssh " + hostname + " 'rm -r " + kafkaHome + "'"
+ cmdStr = "ssh " + hostname + " 'rm -rf " + kafkaHome + "'"
logger.info("executing command [" + cmdStr + "]", extra=d)
#system_test_utils.sys_call(cmdStr)
else: