Skip to content

Commit 3cbe4e2

Browse files
rishabh-d-daverishabh-d-dave
committed
mon/FSCommands: import std::ostream into current namespace
Signed-off-by: Rishabh Dave <[email protected]>
1 parent c3a2e67 commit 3cbe4e2

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

‎src/mon/FSCommands.cc‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ using std::set;
2929
using std::string;
3030
using std::string_view;
3131
using std::vector;
32+
using std::ostream;
3233

3334

3435
class FlagSetHandler : public FileSystemCommandHandler
@@ -44,7 +45,7 @@ class FlagSetHandler : public FileSystemCommandHandler
4445
FSMap& fsmap,
4546
MonOpRequestRef op,
4647
const cmdmap_t& cmdmap,
47-
std::ostream &ss) override
48+
ostream &ss) override
4849
{
4950
string flag_name;
5051
cmd_getval(cmdmap, "flag_name", flag_name);
@@ -85,7 +86,7 @@ class FailHandler : public FileSystemCommandHandler
8586
FSMap& fsmap,
8687
MonOpRequestRef op,
8788
const cmdmap_t& cmdmap,
88-
std::ostream& ss) override
89+
ostream& ss) override
8990
{
9091
if (!mon->osdmon()->is_writeable()) {
9192
// not allowed to write yet, so retry when we can
@@ -142,7 +143,7 @@ class FsNewHandler : public FileSystemCommandHandler
142143
FSMap& fsmap,
143144
MonOpRequestRef op,
144145
const cmdmap_t& cmdmap,
145-
std::ostream &ss) override
146+
ostream &ss) override
146147
{
147148
ceph_assert(m_paxos->is_plugged());
148149

@@ -312,7 +313,7 @@ class SetHandler : public FileSystemCommandHandler
312313
FSMap& fsmap,
313314
MonOpRequestRef op,
314315
const cmdmap_t& cmdmap,
315-
std::ostream &ss) override
316+
ostream &ss) override
316317
{
317318
string fs_name;
318319
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
@@ -764,7 +765,7 @@ class CompatSetHandler : public FileSystemCommandHandler
764765
FSMap &fsmap,
765766
MonOpRequestRef op,
766767
const cmdmap_t& cmdmap,
767-
std::ostream &ss) override
768+
ostream &ss) override
768769
{
769770
static const set<string> subops = {"rm_incompat", "rm_compat", "add_incompat", "add_compat"};
770771

@@ -869,7 +870,7 @@ class RequiredClientFeaturesHandler : public FileSystemCommandHandler
869870
FSMap &fsmap,
870871
MonOpRequestRef op,
871872
const cmdmap_t& cmdmap,
872-
std::ostream &ss) override
873+
ostream &ss) override
873874
{
874875
string fs_name;
875876
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
@@ -957,7 +958,7 @@ class AddDataPoolHandler : public FileSystemCommandHandler
957958
FSMap& fsmap,
958959
MonOpRequestRef op,
959960
const cmdmap_t& cmdmap,
960-
std::ostream &ss) override
961+
ostream &ss) override
961962
{
962963
ceph_assert(m_paxos->is_plugged());
963964

@@ -1036,7 +1037,7 @@ class SetDefaultHandler : public FileSystemCommandHandler
10361037
FSMap& fsmap,
10371038
MonOpRequestRef op,
10381039
const cmdmap_t& cmdmap,
1039-
std::ostream &ss) override
1040+
ostream &ss) override
10401041
{
10411042
string fs_name;
10421043
cmd_getval(cmdmap, "fs_name", fs_name);
@@ -1063,7 +1064,7 @@ class RemoveFilesystemHandler : public FileSystemCommandHandler
10631064
FSMap& fsmap,
10641065
MonOpRequestRef op,
10651066
const cmdmap_t& cmdmap,
1066-
std::ostream &ss) override
1067+
ostream &ss) override
10671068
{
10681069
/* We may need to blocklist ranks. */
10691070
if (!mon->osdmon()->is_writeable()) {
@@ -1137,7 +1138,7 @@ class ResetFilesystemHandler : public FileSystemCommandHandler
11371138
FSMap& fsmap,
11381139
MonOpRequestRef op,
11391140
const cmdmap_t& cmdmap,
1140-
std::ostream &ss) override
1141+
ostream &ss) override
11411142
{
11421143
string fs_name;
11431144
cmd_getval(cmdmap, "fs_name", fs_name);
@@ -1183,7 +1184,7 @@ class RenameFilesystemHandler : public FileSystemCommandHandler
11831184
FSMap& fsmap,
11841185
MonOpRequestRef op,
11851186
const cmdmap_t& cmdmap,
1186-
std::ostream &ss) override
1187+
ostream &ss) override
11871188
{
11881189
ceph_assert(m_paxos->is_plugged());
11891190

@@ -1272,7 +1273,7 @@ class RemoveDataPoolHandler : public FileSystemCommandHandler
12721273
FSMap& fsmap,
12731274
MonOpRequestRef op,
12741275
const cmdmap_t& cmdmap,
1275-
std::ostream &ss) override
1276+
ostream &ss) override
12761277
{
12771278
string poolname;
12781279
cmd_getval(cmdmap, "pool", poolname);
@@ -1352,7 +1353,7 @@ class AliasHandler : public T
13521353
FSMap& fsmap,
13531354
MonOpRequestRef op,
13541355
const cmdmap_t& cmdmap,
1355-
std::ostream &ss) override
1356+
ostream &ss) override
13561357
{
13571358
return T::handle(mon, fsmap, op, cmdmap, ss);
13581359
}
@@ -1367,7 +1368,7 @@ class MirrorHandlerEnable : public FileSystemCommandHandler
13671368

13681369
int handle(Monitor *mon,
13691370
FSMap &fsmap, MonOpRequestRef op,
1370-
const cmdmap_t& cmdmap, std::ostream &ss) override {
1371+
const cmdmap_t& cmdmap, ostream &ss) override {
13711372
string fs_name;
13721373
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
13731374
ss << "Missing filesystem name";
@@ -1402,7 +1403,7 @@ class MirrorHandlerDisable : public FileSystemCommandHandler
14021403

14031404
int handle(Monitor *mon,
14041405
FSMap &fsmap, MonOpRequestRef op,
1405-
const cmdmap_t& cmdmap, std::ostream &ss) override {
1406+
const cmdmap_t& cmdmap, ostream &ss) override {
14061407
string fs_name;
14071408
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
14081409
ss << "Missing filesystem name";
@@ -1449,7 +1450,7 @@ class MirrorHandlerAddPeer : public FileSystemCommandHandler
14491450
}
14501451

14511452
bool peer_add(FSMap &fsmap, const Filesystem& fs,
1452-
const cmdmap_t &cmdmap, std::ostream &ss) {
1453+
const cmdmap_t &cmdmap, ostream &ss) {
14531454
string peer_uuid;
14541455
string remote_spec;
14551456
string remote_fs_name;
@@ -1484,7 +1485,7 @@ class MirrorHandlerAddPeer : public FileSystemCommandHandler
14841485

14851486
int handle(Monitor *mon,
14861487
FSMap &fsmap, MonOpRequestRef op,
1487-
const cmdmap_t& cmdmap, std::ostream &ss) override {
1488+
const cmdmap_t& cmdmap, ostream &ss) override {
14881489
string fs_name;
14891490
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
14901491
ss << "Missing filesystem name";
@@ -1519,7 +1520,7 @@ class MirrorHandlerRemovePeer : public FileSystemCommandHandler
15191520
{}
15201521

15211522
bool peer_remove(FSMap &fsmap, const Filesystem& fs,
1522-
const cmdmap_t &cmdmap, std::ostream &ss) {
1523+
const cmdmap_t &cmdmap, ostream &ss) {
15231524
string peer_uuid;
15241525
cmd_getval(cmdmap, "uuid", peer_uuid);
15251526

@@ -1537,7 +1538,7 @@ class MirrorHandlerRemovePeer : public FileSystemCommandHandler
15371538

15381539
int handle(Monitor *mon,
15391540
FSMap &fsmap, MonOpRequestRef op,
1540-
const cmdmap_t& cmdmap, std::ostream &ss) override {
1541+
const cmdmap_t& cmdmap, ostream &ss) override {
15411542
string fs_name;
15421543
if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) {
15431544
ss << "Missing filesystem name";
@@ -1597,7 +1598,7 @@ int FileSystemCommandHandler::_check_pool(
15971598
const int64_t pool_id,
15981599
int type,
15991600
bool force,
1600-
std::ostream *ss,
1601+
ostream *ss,
16011602
bool allow_overlay) const
16021603
{
16031604
ceph_assert(ss != NULL);
@@ -1705,7 +1706,7 @@ int FileSystemCommandHandler::_check_pool(
17051706

17061707
int FileSystemCommandHandler::is_op_allowed(
17071708
const MonOpRequestRef& op, const FSMap& fsmap, const cmdmap_t& cmdmap,
1708-
std::ostream &ss) const
1709+
ostream &ss) const
17091710
{
17101711
string fs_name;
17111712
cmd_getval(cmdmap, "fs_name", fs_name);

0 commit comments

Comments
 (0)