]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #20093 from supriti/wip_rgw_ganesha_df
authorMatt Benjamin <mbenjamin@redhat.com>
Tue, 20 Feb 2018 16:43:57 +0000 (11:43 -0500)
committerGitHub <noreply@github.com>
Tue, 20 Feb 2018 16:43:57 +0000 (11:43 -0500)
RGW-NFS: Use rados cluster_stat to report filesystem usage

1  2 
src/rgw/rgw_file.cc
src/rgw/rgw_file.h
src/rgw/rgw_op.cc
src/rgw/rgw_op.h

Simple merge
Simple merge
index 92a3ff22237fa200bf54718829d5a1619cd78cb1,bfb4753f6f390dd9de026b864658dc84d8a64a07..dd8cded1b4063d4c880ef9d66b62a50a457b00b1
@@@ -7070,11 -6900,18 +7070,18 @@@ int RGWDeleteBucketPolicy::verify_permi
  
  void RGWDeleteBucketPolicy::execute()
  {
 -  auto attrs = s->bucket_attrs;
 -  attrs.erase(RGW_ATTR_IAM_POLICY);
 -  op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs,
 -                              &s->bucket_info.objv_tracker);
 -  if (op_ret == -ECANCELED) {
 -    op_ret = 0; /* lost a race, but it's ok because policies are immutable */
 -  }
 +  op_ret = retry_raced_bucket_write(store, s, [this] {
 +      auto attrs = s->bucket_attrs;
 +      attrs.erase(RGW_ATTR_IAM_POLICY);
 +      op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs,
 +                                  &s->bucket_info.objv_tracker);
 +      return op_ret;
 +    });
  }
+ void RGWGetClusterStat::execute()
+ {
+   op_ret = this->store->get_rados_handle()->cluster_stat(stats_op);
+ }
Simple merge