]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: minor adjustments
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 7 Sep 2018 12:03:21 +0000 (05:03 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Thu, 8 Nov 2018 17:19:29 +0000 (09:19 -0800)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/librgw.cc
src/rgw/rgw_file.cc

index c9808400a4657f75f21c60eeef1862ed25fe5b31..dc01a91c38c1b90f4c07a24a93cbf26cf7f98c8e 100644 (file)
@@ -513,7 +513,7 @@ namespace rgw {
 
     r = rgw_perf_start(g_ceph_context);
 
-    rgw_rest_init(g_ceph_context, store, store->get_zonegroup());
+    rgw_rest_init(g_ceph_context, store, store->svc.zone->get_zonegroup());
 
     mutex.Lock();
     init_timer.cancel_all_events();
index 702f9504f6b8049cc866e5d46287b9cab5a20dac..3db89306e69f4f2561a32a017e07244f9e9b7def 100644 (file)
@@ -1286,7 +1286,7 @@ namespace rgw {
     struct req_state* s = get_state();
 
     auto compression_type =
-      get_store()->get_zone_params().get_compression_type(
+      get_store()->svc.zone->get_zone_params().get_compression_type(
        s->bucket_info.placement_rule);
 
     /* not obviously supportable */