Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mon,osd,crush: misc cleanup #20687

Merged
merged 3 commits into from Mar 5, 2018
Merged

mon,osd,crush: misc cleanup #20687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87ea7b8
mon: drop unused variable - 'args'
Songweibin Mar 1, 2018
0bfafc2
osd: drop redundant assert check
Songweibin Mar 2, 2018
ad60da9
crush: should break the loop if leaves overfull
Songweibin Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/crush/CrushWrapper.cc
View file
Open in desktop
Expand Up @@ -3076,7 +3076,7 @@ int CrushWrapper::_choose_type_stack(
ldout(cct, 10) << __func__ << " cumulative_fanout " << cumulative_fanout
<< dendl;

// identify underful targets for each intermediate level.
// identify underfull targets for each intermediate level.
// this serves two purposes:
// 1. we can tell when we are selecting a bucket that does not have any underfull
// devices beneath it. that means that if the current input includes an overfull
Expand Down Expand Up @@ -3176,6 +3176,7 @@ int CrushWrapper::_choose_type_stack(
for (auto osd : leaves[pos]) {
if (overfull.count(osd)) {
any_overfull = true;
break;
}
}
if (any_overfull) {
Expand Down
1 change: 0 additions & 1 deletion src/mon/OSDMonitor.cc
View file
Open in desktop
Expand Up @@ -7961,7 +7961,6 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
do {
// osd crush move <name> <loc1> [<loc2> ...]
string name;
string args;
vector<string> argvec;
cmd_getval(cct, cmdmap, "name", name);
cmd_getval(cct, cmdmap, "args", argvec);
Expand Down
1 change: 0 additions & 1 deletion src/osd/PG.cc
View file
Open in desktop
Expand Up @@ -3582,7 +3582,6 @@ void PG::update_snap_map(
_snaps,
&_t);
} else if (i->is_modify()) {
assert(i->is_modify());
int r = snap_mapper.update_snaps(
i->soid,
_snaps,
Expand Down