From: Warren Usui <warren.usui@inktank.com>
Date: Fri, 21 Feb 2014 05:11:45 +0000 (-0800)
Subject: Fix get_status() to find client.rados text inside of ps command results.
X-Git-Tag: v0.79~192^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1280%2Fhead;p=ceph.git

Fix get_status() to find client.rados text inside of ps command results.
Added port (fixed value for right now in teuthology) to hostname.
Fixes: 7374
Signed-off-by: Warren Usui <warren.usui@inktank.com>
---

diff --git a/qa/workunits/rgw/s3_multipart_upload.pl b/qa/workunits/rgw/s3_multipart_upload.pl
index 0f40119ef769..2566688e9b5c 100755
--- a/qa/workunits/rgw/s3_multipart_upload.pl
+++ b/qa/workunits/rgw/s3_multipart_upload.pl
@@ -45,7 +45,7 @@ Pod::Usage::pod2usage(-verbose => 1) && exit if ($help);
 my $s3;
 my $domain   = "front.sepia.ceph.com";
 my $host     = get_hostname();
-our $hostname = "$host.$domain";
+our $hostname = "$host.$domain:7280";
 my $testfileloc;
 my $sec;
 my $min;
@@ -77,7 +77,7 @@ sub get_status {
     my $service = "radosgw";
     my $cmd = "ps -ef | grep $service | grep -v grep";
     my $status = get_cmd_op($cmd);
-    if ($status =~ /client.radosgw/ ){
+    if ($status =~ m/client.radosgw/ ){
         return 0;
     }
     return 1;