Skip to content

Commit 137d209

Browse files
committed
rgw: remove unused RGWSI_Finisher
Signed-off-by: Casey Bodley <[email protected]>
1 parent 732a937 commit 137d209

File tree

5 files changed

+1
-119
lines changed

5 files changed

+1
-119
lines changed

src/rgw/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ list(APPEND librgw_common_srcs
152152

153153
if(WITH_RADOSGW_RADOS)
154154
list(APPEND librgw_common_srcs
155-
services/svc_finisher.cc
156155
services/svc_bi_rados.cc
157156
services/svc_bilog_rados.cc
158157
services/svc_bucket.cc

src/rgw/driver/rados/rgw_service.cc

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include "rgw_service.h"
55

6-
#include "services/svc_finisher.h"
76
#include "services/svc_bi_rados.h"
87
#include "services/svc_bilog_rados.h"
98
#include "services/svc_bucket_sobj.h"
@@ -57,7 +56,6 @@ int RGWServices_Def::init(CephContext *cct,
5756
rgw::sal::ConfigStore* cfgstore,
5857
const rgw::SiteConfig* site)
5958
{
60-
finisher = std::make_unique<RGWSI_Finisher>(cct);
6159
bucket_sobj = std::make_unique<RGWSI_Bucket_SObj>(cct);
6260
bucket_sync_sobj = std::make_unique<RGWSI_Bucket_Sync_SObj>(cct);
6361
bi_rados = std::make_unique<RGWSI_BucketIndex_RADOS>(cct);
@@ -82,7 +80,6 @@ int RGWServices_Def::init(CephContext *cct,
8280
}
8381

8482
async_processor->start();
85-
finisher->init();
8683
bi_rados->init(zone.get(), driver->getRados()->get_rados_handle(),
8784
bilog_rados.get(), datalog_rados.get());
8885
bilog_rados->init(bi_rados.get());
@@ -115,21 +112,14 @@ int RGWServices_Def::init(CephContext *cct,
115112

116113
can_shutdown = true;
117114

118-
int r = finisher->start(y, dpp);
119-
if (r < 0) {
120-
ldpp_dout(dpp, 0) << "ERROR: failed to start finisher service (" << cpp_strerror(-r) << dendl;
121-
return r;
122-
}
123-
115+
int r = 0;
124116
if (!raw) {
125117
r = notify->start(y, dpp);
126118
if (r < 0) {
127119
ldpp_dout(dpp, 0) << "ERROR: failed to start notify service (" << cpp_strerror(-r) << dendl;
128120
return r;
129121
}
130-
}
131122

132-
if (!raw) {
133123
r = zone->start(y, dpp);
134124
if (r < 0) {
135125
ldpp_dout(dpp, 0) << "ERROR: failed to start zone service (" << cpp_strerror(-r) << dendl;
@@ -247,7 +237,6 @@ void RGWServices_Def::shutdown()
247237
bi_rados->shutdown();
248238
bucket_sync_sobj->shutdown();
249239
bucket_sobj->shutdown();
250-
finisher->shutdown();
251240

252241
sysobj->shutdown();
253242
sysobj_core->shutdown();
@@ -273,7 +262,6 @@ int RGWServices::do_init(CephContext *_cct, rgw::sal::RadosStore* driver, bool h
273262
return r;
274263
}
275264

276-
finisher = _svc.finisher.get();
277265
bi_rados = _svc.bi_rados.get();
278266
bi = bi_rados;
279267
bilog_rados = _svc.bilog_rados.get();

src/rgw/driver/rados/rgw_service.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ class RGWServiceInstance
5353
}
5454
};
5555

56-
class RGWSI_Finisher;
5756
class RGWSI_Bucket;
5857
class RGWSI_Bucket_SObj;
5958
class RGWSI_Bucket_Sync;
@@ -84,7 +83,6 @@ struct RGWServices_Def
8483
bool can_shutdown{false};
8584
bool has_shutdown{false};
8685

87-
std::unique_ptr<RGWSI_Finisher> finisher;
8886
std::unique_ptr<RGWSI_Bucket_SObj> bucket_sobj;
8987
std::unique_ptr<RGWSI_Bucket_Sync_SObj> bucket_sync_sobj;
9088
std::unique_ptr<RGWSI_BucketIndex_RADOS> bi_rados;
@@ -122,7 +120,6 @@ struct RGWServices
122120
CephContext *cct;
123121
const rgw::SiteConfig* site{nullptr};
124122

125-
RGWSI_Finisher *finisher{nullptr};
126123
RGWSI_Bucket *bucket{nullptr};
127124
RGWSI_Bucket_SObj *bucket_sobj{nullptr};
128125
RGWSI_Bucket_Sync *bucket_sync{nullptr};

src/rgw/services/svc_finisher.cc

Lines changed: 0 additions & 58 deletions
This file was deleted.

src/rgw/services/svc_finisher.h

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)