RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-12 06:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

mds: cleanup some asok commands

Browse Source 
Signed-off-by: Rishabh Dave <ridave@redhat.com>
Signed-off-by: Venky Shankar <vshankar@redhat.com>
This commit is contained in:
Venky Shankar 2018-08-26 08:55:05 -04:00
parent b08b031acb
commit 4c03cfd99e
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mds/MDCache.cc
View File

@ -12025,7 +12025,7 @@ void MDCache::show_cache()
show_func(p.second);
}
int MDCache::cache_status(Formatter *f)
void MDCache::cache_status(Formatter *f)
{
f->open_object_section("cache");
@ -12034,7 +12034,6 @@ int MDCache::cache_status(Formatter *f)
f->close_section();
f->close_section();
return 0;
}
void MDCache::dump_tree(CInode *in, const int cur_depth, const int max_depth, Formatter *f)

2
src/mds/MDCache.h
View File

@ -1207,7 +1207,7 @@ public:
int dump_cache(Formatter *f);
void dump_tree(CInode *in, const int cur_depth, const int max_depth, Formatter *f);
int cache_status(Formatter *f);
void cache_status(Formatter *f);
void dump_resolve_status(Formatter *f) const;
void dump_rejoin_status(Formatter *f) const;

19
src/mds/MDSRank.cc
View File

@ -2091,10 +2091,7 @@ bool MDSRankDispatcher::handle_asok_command(std::string_view command,
}
} else if (command == "cache status") {
Mutex::Locker l(mds_lock);
int r = mdcache->cache_status(f);
if (r != 0) {
ss << "Failed to get cache status: " << cpp_strerror(r);
}
mdcache->cache_status(f);
} else if (command == "dump tree") {
command_dump_tree(cmdmap, ss, f);
} else if (command == "dump loads") {
@ -3038,10 +3035,9 @@ bool MDSRankDispatcher::handle_command(
return true;
}
Formatter *f = new JSONFormatter(true);
dump_sessions(filter, f);
f->flush(*ds);
delete f;
JSONFormatter f(true);
dump_sessions(filter, &f);
f.flush(*ds);
return true;
} else if (prefix == "session evict" || prefix == "client evict") {
std::vector<std::string> filter_args;
@ -3058,10 +3054,9 @@ bool MDSRankDispatcher::handle_command(
*need_reply = false;
return true;
} else if (prefix == "damage ls") {
Formatter *f = new JSONFormatter(true);
damage_table.dump(f);
f->flush(*ds);
delete f;
JSONFormatter f(true);
damage_table.dump(&f);
f.flush(*ds);
return true;
} else if (prefix == "damage rm") {
damage_entry_id_t id = 0;