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

osd: cleanup options and other redundancies #10450

Merged
merged 4 commits into from
Aug 1, 2016
Merged

osd: cleanup options and other redundancies #10450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01e696e
common/config: kill osd_compression_plugins option
xiexingguo Jul 27, 2016
ac311c5
osd: drop redundant ping of tp thread
xiexingguo Jul 27, 2016
9fb3131
osd: fix wrong tip if no-recover flag is unset
xiexingguo Jul 27, 2016
b211257
osd: drop redundant existence check of osd
xiexingguo Jul 27, 2016
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
4 changes: 0 additions & 4 deletions src/common/config_opts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,10 +628,6 @@ OPTION(osd_pool_default_size, OPT_INT, 3)
OPTION(osd_pool_default_min_size, OPT_INT, 0) // 0 means no specific default; ceph will use size-size/2
OPTION(osd_pool_default_pg_num, OPT_INT, 8) // number of PGs for new pools. Configure in global or mon section of ceph.conf
OPTION(osd_pool_default_pgp_num, OPT_INT, 8) // number of PGs for placement purposes. Should be equal to pg_num
OPTION(osd_compression_plugins, OPT_STR,
"zlib"
" snappy"
) // list of compression plugins
OPTION(osd_pool_default_erasure_code_profile,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ved-vampir Is this ok to remove?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@athanatos Now it isn't used, so, yes.

OPT_STR,
"plugin=jerasure "
Expand Down
7 changes: 3 additions & 4 deletions src/osd/OSD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6874,8 +6874,8 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
osdmap->get_all_osds(old);
for (set<int>::iterator p = old.begin(); p != old.end(); ++p) {
if (*p != whoami &&
osdmap->have_inst(*p) && // in old map
(!newmap->exists(*p) || !newmap->is_up(*p))) { // but not the new one
osdmap->have_inst(*p) && // in old map
!newmap->is_up(*p)) { // but not the new one
if (!waited_for_reservations) {
service.await_reserved_maps();
waited_for_reservations = true;
Expand Down Expand Up @@ -7332,7 +7332,7 @@ void OSD::activate_map()
}
} else {
if (service.recovery_is_paused()) {
dout(1) << "unpausing recovery (NORECOVER flag set)" << dendl;
dout(1) << "unpausing recovery (NORECOVER flag unset)" << dendl;
service.unpause_recovery();
}
}
Expand Down Expand Up @@ -8959,7 +8959,6 @@ void OSD::process_peering_events(
}
dispatch_context_transaction(rctx, pg, &handle);
pg->unlock();
handle.reset_tp_timeout();
}
if (need_up_thru)
queue_want_up_thru(same_interval_since);
Expand Down