Skip to content

Commit

Permalink
Fix get_status() to find client.rados text inside of ps command results.
Browse files Browse the repository at this point in the history
Added port (fixed value for right now in teuthology) to hostname.
Fixes: 7374
Reviewed-by: Yehuda Sadeh <[email protected]>
Signed-off-by: Warren Usui <[email protected]>
(cherry picked from commit 8200b8a)
  • Loading branch information
Warren Usui authored and yehudasa committed Mar 11, 2014
1 parent aba5b7c commit 880bc3a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions qa/workunits/rgw/s3_multipart_upload.pl
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ =head1 ARGUMENTS
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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 880bc3a

Please sign in to comment.