summaryrefslogtreecommitdiffstats
path: root/qa/qa_scripts
diff options
context:
space:
mode:
authortamil <tamil@ubuntu.(none)>2012-11-09 01:06:04 +0100
committertamil <tamil@ubuntu.(none)>2012-11-09 01:06:04 +0100
commitc45a415ced9efebcf7e5cbf9c42a01046f64f9bc (patch)
tree6a0bd9dd8f7c65e886ad3c8cee5361a4bd789331 /qa/qa_scripts
parentAdded a function get_cmd_op (diff)
downloadceph-c45a415ced9efebcf7e5cbf9c42a01046f64f9bc.tar.xz
ceph-c45a415ced9efebcf7e5cbf9c42a01046f64f9bc.zip
script clean up
Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
Diffstat (limited to 'qa/qa_scripts')
-rw-r--r--qa/qa_scripts/S3Lib.pm18
-rwxr-xr-xqa/qa_scripts/s3-file-test.pl2
2 files changed, 8 insertions, 12 deletions
diff --git a/qa/qa_scripts/S3Lib.pm b/qa/qa_scripts/S3Lib.pm
index ae2a9611f26..6e16bfc7a39 100644
--- a/qa/qa_scripts/S3Lib.pm
+++ b/qa/qa_scripts/S3Lib.pm
@@ -24,17 +24,13 @@ sub get_cmd_op
# Function to check if radosgw is already running
sub get_status {
- my $service = "radosgw";
- my $cmd = "ps -ef | grep $service | grep -v grep";
- my $status = get_cmd_op($cmd);
- if (!$status) {
- my $cmd1 = "echo $?";
- my $status1 = get_cmd_op($cmd1);
- if (!$status1){
- return 0;
- }
- }
- return 1;
+ my $service = "radosgw";
+ my $cmd = "ps -ef | grep $service | grep -v grep";
+ my $status = get_cmd_op($cmd);
+ if ($status =~ /client.radosgw.gateway/ ){
+ return 0;
+ }
+ return 1;
}
#Function that executes the CLI commands and returns the output of the command
diff --git a/qa/qa_scripts/s3-file-test.pl b/qa/qa_scripts/s3-file-test.pl
index 006e3431c68..f96272b5075 100755
--- a/qa/qa_scripts/s3-file-test.pl
+++ b/qa/qa_scripts/s3-file-test.pl
@@ -143,7 +143,7 @@ print "adding file to bucket: $mytestfilename\n";
print "Downloading $mytestfilename to temp file: /tmp/downloadfilepurgeme...";
$response = $bucket->get_key_filename( $mytestfilename, 'GET', '/tmp/downloadfilepurgeme' )
or die $s3->err . ": " . $s3->errstr;
- $logmsg = "file dowloaded";
+ $logmsg = "file downloaded";
_write_log_entry($logmsg);