From 8200b8a02511e367370d33cb74c3d45ef85fca31 Mon Sep 17 00:00:00 2001 From: Warren Usui Date: Thu, 20 Feb 2014 21:11:45 -0800 Subject: [PATCH] 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 --- qa/workunits/rgw/s3_multipart_upload.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.47.3