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: Omap small bugs adapted #6669

Merged
merged 9 commits into from Jan 5, 2016
Merged

osd: Omap small bugs adapted #6669

merged 9 commits into from Jan 5, 2016

Conversation

dzafman
Copy link
Contributor

@dzafman dzafman commented Nov 20, 2015

No description provided.

@dzafman dzafman mentioned this pull request Nov 20, 2015
@ghost
Copy link

ghost commented Nov 21, 2015

@dzafman the ubuntu bot failure is the false negative we discussed yesterday.

@dzafman
Copy link
Contributor Author

dzafman commented Nov 23, 2015

I updated this per code-review comments for #6046. Also, rebased again so that Jenkins make check will pass.

This has been reviewed by @tchaikov and @liewegas based on other pull request.

@dzafman dzafman changed the title DNM: Rebase and fixes for #6046 Omap small bugs Rebase and fixes for #6046 Omap small bugs Nov 23, 2015
@dzafman dzafman changed the title Rebase and fixes for #6046 Omap small bugs Omap small bugs adapted Nov 23, 2015
@tchaikov
Copy link
Contributor

lgtm with qa run.

@liewegas
Copy link
Member

lots of failures like this:

2015-11-24T07:13:26.438 INFO:tasks.ceph.osd.0.burnupi34.stderr:2015-11-24 07:13:26.435286 7fcf38a5f700 -1 osd.0 pg_epoch: 174 pg[1.1( v 132'41 (0'0,132'41] local-les=166 n=1 ec=8 les/c/f 166/166/0 165/165/50) [0,4] r=0 lpr=165 crt=116'37 lcod 128'39 mlcod 128'39 act
ive+clean NIBBLEWISE] process_copy_chunk omap digest 0xffffffff != source 0x0
2015-11-24T07:13:26.438 INFO:tasks.ceph.osd.0.burnupi34.stderr:2015-11-24 07:13:26.435313 7fcf38a5f700 -1 log_channel(cluster) log [ERR] : 1.1 copy from 1/9d6feb16/burnupi3420652-49/head to 1/67141e41/burnupi3420652-47/head omap digest 0xffffffff != source 0x0

@liewegas
Copy link
Member

please run through some rados/thrash jobs via teuthology-openstack. thanks!

@liewegas
Copy link
Member

needs rebase?

@@ -2091,7 +2091,24 @@ void ECBackend::be_deep_scrub(
return;
}

ECUtil::HashInfoRef hinfo = get_hash_info(poid, false);
//copy from get_hash_info. Because we already got xattrs, so it don't need
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm having second thoughts on this change. Does the performance of scrub really matter that much to complicate this code? If so, we should modify get_hash_info() to take optional xattrs so it can use that if needed and available?

@dzafman dzafman changed the title Omap small bugs adapted DNM: Omap small bugs adapted Dec 11, 2015
@dzafman
Copy link
Contributor Author

dzafman commented Dec 21, 2015

This passed 98 out of 107 rados suite tests. The failures look like infrastructure issues.

@dzafman
Copy link
Contributor Author

dzafman commented Dec 21, 2015

Reverted commits and fixes are removed and/or squashed.

@dzafman dzafman changed the title DNM: Omap small bugs adapted Omap small bugs adapted Dec 21, 2015
@dzafman
Copy link
Contributor Author

dzafman commented Dec 23, 2015

Per a pervious suggestion from Sage I'm going to do a rados/thrash run. Although I do recall that I fixed the cause of the omap digest inconsistency that was seen.

@dzafman
Copy link
Contributor Author

dzafman commented Dec 23, 2015

Merge ceph-qa-suite "repair_test: Add whitelist item for new stat error message # 775" BEFORE merging this one.

majianpeng and others added 9 commits January 4, 2016 11:16
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
When set omapheader/omapvals, it alreade set FLAG_OMAP. So for remove
don't set again.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
The code already check object whether exist. So it don't need call
touch.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
… omap.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
@dzafman
Copy link
Contributor Author

dzafman commented Jan 4, 2016

Testing passed (12 infrastructure failures, 69 passed 81 total) rados/thrash, before rebase which caused one commit to go away because it was fixed already. No conflicts on rebase.

@dzafman
Copy link
Contributor Author

dzafman commented Jan 4, 2016

@tchaikov ready to merge

I already merged the require ceph-qa-suite change that corresponds to this.

tchaikov added a commit that referenced this pull request Jan 5, 2016
Omap small bugs adapted

Reviewed-by: Kefu Chai <kchai@redhat.com>
@tchaikov tchaikov merged commit 4d91de8 into ceph:master Jan 5, 2016
@dzafman dzafman deleted the omap-small-bugs branch January 5, 2016 01:47
@ghost ghost changed the title Omap small bugs adapted osd: Omap small bugs adapted Feb 10, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants