RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1280 from ceph/wip-7374-wusui

Browse Source 
Fix sub check() to not exit if rgw is running.

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
This commit is contained in:
Yehuda Sadeh 2014-02-25 18:00:37 -08:00
commit 20641b6761
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/workunits/rgw/s3_multipart_upload.pl
View File

@ -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;