Skip to content

Commit c3a2e67

Browse files
rishabh-d-daverishabh-d-dave
committed
mon/FSCommands: make use of imported namespace symbols
There's no need to mention the "home" namespace of a symbol while using it after it has been imported into the current namespace. IOW, no need to write, for example, "std::string" after it has been imported from its namespace; instead simply writing "string" will suffice. Signed-off-by: Rishabh Dave <[email protected]>
1 parent ee94085 commit c3a2e67

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

‎src/mon/FSCommands.cc‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class FailHandler : public FileSystemCommandHandler
9393
return -EAGAIN;
9494
}
9595

96-
std::string fs_name;
96+
string fs_name;
9797
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
9898
ss << "Missing filesystem name";
9999
return -EINVAL;
@@ -110,7 +110,7 @@ class FailHandler : public FileSystemCommandHandler
110110
};
111111
fsmap.modify_filesystem(fsp->get_fscid(), std::move(f));
112112

113-
std::vector<mds_gid_t> to_fail;
113+
vector<mds_gid_t> to_fail;
114114
for (const auto& p : fsp->get_mds_map().get_mds_info()) {
115115
to_fail.push_back(p.first);
116116
}
@@ -212,7 +212,7 @@ class FsNewHandler : public FileSystemCommandHandler
212212
cmd_getval(cmdmap, "allow_dangerous_metadata_overlay", allow_overlay);
213213

214214
for (const auto& [fscid, fs] : std::as_const(fsmap)) {
215-
const std::vector<int64_t> &data_pools = fs.get_mds_map().get_data_pools();
215+
const vector<int64_t> &data_pools = fs.get_mds_map().get_data_pools();
216216
if ((std::find(data_pools.begin(), data_pools.end(), data) != data_pools.end()
217217
|| fs.get_mds_map().get_metadata_pool() == metadata)
218218
&& !allow_overlay) {
@@ -314,7 +314,7 @@ class SetHandler : public FileSystemCommandHandler
314314
const cmdmap_t& cmdmap,
315315
std::ostream &ss) override
316316
{
317-
std::string fs_name;
317+
string fs_name;
318318
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
319319
ss << "Missing filesystem name";
320320
return -EINVAL;
@@ -417,7 +417,7 @@ class SetHandler : public FileSystemCommandHandler
417417
}
418418

419419
if (fsp->get_mds_map().check_special_bal_rank_mask(val, MDSMap::BAL_RANK_MASK_TYPE_ANY) == false) {
420-
std::string bin_string;
420+
string bin_string;
421421
int r = fsp->get_mds_map().hex2bin(val, bin_string, MAX_MDS, ss);
422422
if (r != 0) {
423423
return r;
@@ -641,7 +641,7 @@ class SetHandler : public FileSystemCommandHandler
641641
mon->osdmon()->wait_for_writeable(op, new PaxosService::C_RetryMessage(mon->mdsmon(), op));
642642
return -EAGAIN;
643643
}
644-
std::vector<mds_gid_t> to_fail;
644+
vector<mds_gid_t> to_fail;
645645
for (const auto& [gid, info]: fsp->get_mds_map().get_mds_info()) {
646646
if (info.state == MDSMap::STATE_STANDBY_REPLAY) {
647647
to_fail.push_back(gid);
@@ -766,9 +766,9 @@ class CompatSetHandler : public FileSystemCommandHandler
766766
const cmdmap_t& cmdmap,
767767
std::ostream &ss) override
768768
{
769-
static const std::set<std::string> subops = {"rm_incompat", "rm_compat", "add_incompat", "add_compat"};
769+
static const set<string> subops = {"rm_incompat", "rm_compat", "add_incompat", "add_compat"};
770770

771-
std::string fs_name;
771+
string fs_name;
772772
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
773773
ss << "Missing filesystem name";
774774
return -EINVAL;
@@ -871,7 +871,7 @@ class RequiredClientFeaturesHandler : public FileSystemCommandHandler
871871
const cmdmap_t& cmdmap,
872872
std::ostream &ss) override
873873
{
874-
std::string fs_name;
874+
string fs_name;
875875
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
876876
ss << "Missing filesystem name";
877877
return -EINVAL;
@@ -964,7 +964,7 @@ class AddDataPoolHandler : public FileSystemCommandHandler
964964
string poolname;
965965
cmd_getval(cmdmap, "pool", poolname);
966966

967-
std::string fs_name;
967+
string fs_name;
968968
if (!cmd_getval(cmdmap, "fs_name", fs_name)
969969
|| fs_name.empty()) {
970970
ss << "Missing filesystem name";
@@ -1038,7 +1038,7 @@ class SetDefaultHandler : public FileSystemCommandHandler
10381038
const cmdmap_t& cmdmap,
10391039
std::ostream &ss) override
10401040
{
1041-
std::string fs_name;
1041+
string fs_name;
10421042
cmd_getval(cmdmap, "fs_name", fs_name);
10431043
auto* fsp = fsmap.get_filesystem(fs_name);
10441044
if (fsp == nullptr) {
@@ -1103,7 +1103,7 @@ class RemoveFilesystemHandler : public FileSystemCommandHandler
11031103
fsmap.set_legacy_client_fscid(FS_CLUSTER_ID_NONE);
11041104
}
11051105

1106-
std::vector<mds_gid_t> to_fail;
1106+
vector<mds_gid_t> to_fail;
11071107
// There may be standby_replay daemons left here
11081108
for (const auto &i : fsp->get_mds_map().get_mds_info()) {
11091109
ceph_assert(i.second.state == MDSMap::STATE_STANDBY_REPLAY);
@@ -1277,7 +1277,7 @@ class RemoveDataPoolHandler : public FileSystemCommandHandler
12771277
string poolname;
12781278
cmd_getval(cmdmap, "pool", poolname);
12791279

1280-
std::string fs_name;
1280+
string fs_name;
12811281
if (!cmd_getval(cmdmap, "fs_name", fs_name)
12821282
|| fs_name.empty()) {
12831283
ss << "Missing filesystem name";
@@ -1336,16 +1336,16 @@ class RemoveDataPoolHandler : public FileSystemCommandHandler
13361336
template<typename T>
13371337
class AliasHandler : public T
13381338
{
1339-
std::string alias_prefix;
1339+
string alias_prefix;
13401340

13411341
public:
1342-
explicit AliasHandler(const std::string &new_prefix)
1342+
explicit AliasHandler(const string &new_prefix)
13431343
: T()
13441344
{
13451345
alias_prefix = new_prefix;
13461346
}
13471347

1348-
std::string const &get_prefix() const override {return alias_prefix;}
1348+
string const &get_prefix() const override {return alias_prefix;}
13491349

13501350
int handle(
13511351
Monitor *mon,
@@ -1368,7 +1368,7 @@ class MirrorHandlerEnable : public FileSystemCommandHandler
13681368
int handle(Monitor *mon,
13691369
FSMap &fsmap, MonOpRequestRef op,
13701370
const cmdmap_t& cmdmap, std::ostream &ss) override {
1371-
std::string fs_name;
1371+
string fs_name;
13721372
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
13731373
ss << "Missing filesystem name";
13741374
return -EINVAL;
@@ -1403,7 +1403,7 @@ class MirrorHandlerDisable : public FileSystemCommandHandler
14031403
int handle(Monitor *mon,
14041404
FSMap &fsmap, MonOpRequestRef op,
14051405
const cmdmap_t& cmdmap, std::ostream &ss) override {
1406-
std::string fs_name;
1406+
string fs_name;
14071407
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
14081408
ss << "Missing filesystem name";
14091409
return -EINVAL;
@@ -1435,17 +1435,17 @@ class MirrorHandlerAddPeer : public FileSystemCommandHandler
14351435
: FileSystemCommandHandler("fs mirror peer_add")
14361436
{}
14371437

1438-
boost::optional<std::pair<string, string>>
1439-
extract_remote_cluster_conf(const std::string &spec) {
1438+
boost::optional<pair<string, string>>
1439+
extract_remote_cluster_conf(const string &spec) {
14401440
auto pos = spec.find("@");
1441-
if (pos == std::string_view::npos) {
1442-
return boost::optional<std::pair<string, string>>();
1441+
if (pos == string_view::npos) {
1442+
return boost::optional<pair<string, string>>();
14431443
}
14441444

14451445
auto client = spec.substr(0, pos);
14461446
auto cluster = spec.substr(pos+1);
14471447

1448-
return std::make_pair(client, cluster);
1448+
return make_pair(client, cluster);
14491449
}
14501450

14511451
bool peer_add(FSMap &fsmap, const Filesystem& fs,
@@ -1485,7 +1485,7 @@ class MirrorHandlerAddPeer : public FileSystemCommandHandler
14851485
int handle(Monitor *mon,
14861486
FSMap &fsmap, MonOpRequestRef op,
14871487
const cmdmap_t& cmdmap, std::ostream &ss) override {
1488-
std::string fs_name;
1488+
string fs_name;
14891489
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
14901490
ss << "Missing filesystem name";
14911491
return -EINVAL;
@@ -1538,7 +1538,7 @@ class MirrorHandlerRemovePeer : public FileSystemCommandHandler
15381538
int handle(Monitor *mon,
15391539
FSMap &fsmap, MonOpRequestRef op,
15401540
const cmdmap_t& cmdmap, std::ostream &ss) override {
1541-
std::string fs_name;
1541+
string fs_name;
15421542
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
15431543
ss << "Missing filesystem name";
15441544
return -EINVAL;
@@ -1564,10 +1564,10 @@ class MirrorHandlerRemovePeer : public FileSystemCommandHandler
15641564
}
15651565
};
15661566

1567-
std::list<std::shared_ptr<FileSystemCommandHandler> >
1567+
list<std::shared_ptr<FileSystemCommandHandler> >
15681568
FileSystemCommandHandler::load(Paxos *paxos)
15691569
{
1570-
std::list<std::shared_ptr<FileSystemCommandHandler> > handlers;
1570+
list<std::shared_ptr<FileSystemCommandHandler> > handlers;
15711571

15721572
handlers.push_back(std::make_shared<SetHandler>());
15731573
handlers.push_back(std::make_shared<FailHandler>());

0 commit comments

Comments
 (0)