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.

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

osd: cleanup options and other redundancies #10450

Merged
merged 4 commits into from Aug 1, 2016

Conversation

Projects
None yet
4 participants
@xiexingguo
Copy link
Member

commented Jul 27, 2016

No description provided.

@xiexingguo

This comment has been minimized.

Copy link
Member Author

commented Jul 27, 2016

@athanatos Can you look? Thanks!

OPTION(osd_compression_plugins, OPT_STR,
"zlib"
" snappy"
) // list of compression plugins
OPTION(osd_pool_default_erasure_code_profile,

This comment has been minimized.

Copy link
@athanatos

athanatos Jul 27, 2016

Contributor

@Ved-vampir Is this ok to remove?

This comment has been minimized.

Copy link
@Ved-vampir

Ved-vampir Jul 27, 2016

Contributor

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

@@ -4108,7 +4108,7 @@ void PG::chunky_scrub(ThreadPool::TPHandle &handle)
}

// reset handle once in a while, the search maybe takes long.
if (++loop >= g_conf->osd_loop_before_reset_tphandle) {
if (++loop >= g_conf->osd_scan_list_ping_tp_interval) {
handle.reset_tp_timeout();

This comment has been minimized.

Copy link
@athanatos

athanatos Jul 27, 2016

Contributor

osd_scan_list_ping_tp_interval is about IO. I would actually prefer to have two configs here. Please remove this commit.

@@ -1857,7 +1857,7 @@ class OSD : public Dispatcher,
void dequeue_and_get_ops(PG *pg, list<OpRequestRef> *dequeued) {
ShardData* sdata = NULL;
assert(pg != NULL);
uint32_t shard_index = pg->get_pgid().ps()% shard_list.size();
uint32_t shard_index = pg->get_pgid().hash_to_shard(shard_list.size());
sdata = shard_list[shard_index];

This comment has been minimized.

Copy link
@athanatos

athanatos Jul 27, 2016

Contributor

I don't really like doing cleanups like this when there isn't something substantive changing (anyone working on branches that touch this code would have to deal with a silly merge conflict). We can leave this until something substrantive changes in these methods, I think. Please remove this commit.

@athanatos

This comment has been minimized.

Copy link
Contributor

commented Jul 27, 2016

Once you address those comments, ping me and I'll add needs-qa.

xiexingguo added some commits Jul 27, 2016

common/config: kill osd_compression_plugins option
It is not used anywhere and removing the unnecessary code
is always the preferred option.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
osd: drop redundant ping of tp thread
Because the lock_suspend_timeout() process of PG does the same thing
for each loop.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
osd: fix wrong tip if no-recover flag is unset
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
osd: drop redundant existence check of osd
The is_up() check implicitly coveres the exist() check,
so below here the exist() check is not necessary.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

@xiexingguo xiexingguo force-pushed the xiexingguo:xxg-wip-cleanup-options branch from 6109b0c to b211257 Jul 27, 2016

@xiexingguo

This comment has been minimized.

Copy link
Member Author

commented Jul 27, 2016

@athanatos Done and thanks for the review.

@athanatos athanatos added the needs-qa label Jul 27, 2016

@xiexingguo

This comment has been minimized.

Copy link
Member Author

commented Jul 28, 2016

retest this please

@yuriw yuriw merged commit 9d811ca into ceph:master Aug 1, 2016

2 checks passed

Signed-off-by all commits in this PR are signed
Details
default Build finished.
Details

@xiexingguo xiexingguo deleted the xiexingguo:xxg-wip-cleanup-options branch Aug 1, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.