]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agorgw: Make vstart.sh print out swift user info 5209/head
Yuan Zhou [Mon, 13 Jul 2015 03:07:41 +0000 (11:07 +0800)]
rgw: Make vstart.sh print out swift user info

Currently vstart.sh only print out S3 user info. This patch updates it
to print swift user info too. Also changes the swift account/user/password
to test/tester/testing which align with openstack-swift better:
https://github.com/openstack/swift/blob/master/etc/proxy-server.conf-sample#L270

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
10 years agoMerge pull request #5197 from ceph/wip-cot-meta
David Zafman [Fri, 10 Jul 2015 21:31:10 +0000 (14:31 -0700)]
Merge pull request #5197 from ceph/wip-cot-meta

Wip cot meta

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #5198 from tchaikov/wip-doc-erasure-fix
Loic Dachary [Fri, 10 Jul 2015 19:34:58 +0000 (21:34 +0200)]
Merge pull request #5198 from tchaikov/wip-doc-erasure-fix

doc/erasure-code: fix couple typos

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc/erasure-code: fix couple typos 5198/head
Kefu Chai [Fri, 10 Jul 2015 17:47:14 +0000 (01:47 +0800)]
doc/erasure-code: fix couple typos

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agotools, test: Some ceph-objectstore-tool error handling fixes 5197/head
David Zafman [Fri, 26 Jun 2015 00:15:39 +0000 (17:15 -0700)]
tools, test: Some ceph-objectstore-tool error handling fixes

Improve various error messages generated with invalid syntax
Add test cases for most of these error messages

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: Add debug argument to the ceph-objectstore-tool test
David Zafman [Tue, 23 Jun 2015 23:51:27 +0000 (16:51 -0700)]
test: Add debug argument to the ceph-objectstore-tool test

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotools: Check for valid --op earlier so we can get a better error message
David Zafman [Tue, 23 Jun 2015 03:11:10 +0000 (20:11 -0700)]
tools: Check for valid --op earlier so we can get a better error message

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotools, test: Add ceph-objectstore-tool to operate on the meta collection
David Zafman [Thu, 4 Jun 2015 17:37:42 +0000 (10:37 -0700)]
tools, test: Add ceph-objectstore-tool to operate on the meta collection

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotools: Fix newlines in output of --op list
David Zafman [Thu, 11 Jun 2015 00:04:57 +0000 (17:04 -0700)]
tools: Fix newlines in output of --op list

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotools: Fix dump-super which doesn't require pgid
David Zafman [Tue, 23 Jun 2015 01:38:01 +0000 (18:38 -0700)]
tools: Fix dump-super which doesn't require pgid

A valid pgid had to be specified in order for superblock to be displayed,
but it was otherwise ignored.
Fix message that didn't include dump-super

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotools: Check and specify commands that require the pgid specification
David Zafman [Tue, 23 Jun 2015 02:16:22 +0000 (19:16 -0700)]
tools: Check and specify commands that require the pgid specification

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #4404 from rzarzynski/wip-11431
Yehuda Sadeh [Fri, 10 Jul 2015 16:30:24 +0000 (09:30 -0700)]
Merge pull request #4404 from rzarzynski/wip-11431

rgw: fix lack of account name attribute in XML-formatted bucket listing of Swift account

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #5078 from rzarzynski/wip-12158
Yehuda Sadeh [Fri, 10 Jul 2015 16:06:08 +0000 (09:06 -0700)]
Merge pull request #5078 from rzarzynski/wip-12158

rgw: send Content-Length in response for GET on Swift account.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge branch 'wip-temp'
Sage Weil [Fri, 10 Jul 2015 15:35:23 +0000 (11:35 -0400)]
Merge branch 'wip-temp'

Conflicts:
src/osd/ReplicatedPG.cc
src/test/osd/RadosModel.h

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
10 years agoosd, tools: Always filter temp objects since not being exported
David Zafman [Tue, 7 Jul 2015 01:14:06 +0000 (18:14 -0700)]
osd, tools: Always filter temp objects since not being exported

Can't use object_locator_to_pg() directly with a temp object
because the pool is negative.

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotools: Don't export temporary objects until we have persistent-temp objects
David Zafman [Mon, 22 Jun 2015 18:15:58 +0000 (11:15 -0700)]
tools: Don't export temporary objects until we have persistent-temp objects

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosd: fix temp clearing in OSD
David Zafman [Mon, 6 Jul 2015 23:35:16 +0000 (16:35 -0700)]
osd: fix temp clearing in OSD

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #5175 from david-z/wip-mds-dump-crash
Yan, Zheng [Fri, 10 Jul 2015 09:24:41 +0000 (17:24 +0800)]
Merge pull request #5175 from david-z/wip-mds-dump-crash

Fix mds dump_ops_in_flight crashing ocassionally

10 years agoFix mds dump_ops_in_flight crashing ocassionally 5175/head
zhangzhi [Fri, 10 Jul 2015 09:10:30 +0000 (17:10 +0800)]
Fix mds dump_ops_in_flight crashing ocassionally

10 years agoMerge pull request #4977 from theanalyst/rados/wip-9737
Loic Dachary [Fri, 10 Jul 2015 08:00:11 +0000 (10:00 +0200)]
Merge pull request #4977 from theanalyst/rados/wip-9737

rados/tool: handle --snapid correctly

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #5185 from yuyuyu101/wip-store-test-zero
Haomai Wang [Fri, 10 Jul 2015 01:50:36 +0000 (09:50 +0800)]
Merge pull request #5185 from yuyuyu101/wip-store-test-zero

StoreTest: Add zero test for SyntheticTest

10 years agoMerge pull request #3273 from majianpeng/fix4
Samuel Just [Fri, 10 Jul 2015 00:13:43 +0000 (17:13 -0700)]
Merge pull request #3273 from majianpeng/fix4

cleanup code for RecoveyMessages

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4143 from majianpeng/ec-notsupp-omap
Samuel Just [Fri, 10 Jul 2015 00:12:28 +0000 (17:12 -0700)]
Merge pull request #4143 from majianpeng/ec-notsupp-omap

fix bugs about cache tier.

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4329 from majianpeng/filestore-copy
Samuel Just [Fri, 10 Jul 2015 00:10:57 +0000 (17:10 -0700)]
Merge pull request #4329 from majianpeng/filestore-copy

Filestore copy:using splice instead read/write for clone

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4458 from wonzhq/dup-promote
Samuel Just [Fri, 10 Jul 2015 00:10:10 +0000 (17:10 -0700)]
Merge pull request #4458 from wonzhq/dup-promote

osd/ReplicatedPG: need to queue op when avoiding dup promotion in maybe_handle_cache

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #5075 from SUSE/wip-logrotate-requires
Ken Dreyer [Thu, 9 Jul 2015 21:37:11 +0000 (15:37 -0600)]
Merge pull request #5075 from SUSE/wip-logrotate-requires

packaging: add find and which dependencies

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agopackaging: add find and which dependencies 5075/head
Nathan Cutler [Thu, 25 Jun 2015 14:00:24 +0000 (16:00 +0200)]
packaging: add find and which dependencies

The postrotate script in src/logrotate.conf uses the which and find utilities
to do its work. Although logrotate itself is only a Recommends, I think which
and find are so ubiquitous that it makes sense to have them as hard
dependencies.

Also, I checked and the package names which and findutils are the same on all
the RPM distros we are currently targeting in the spec file.

In Debian, find is also in a package called findutils while the package
containing 'which' is called debianutils.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
10 years agoMerge pull request #5187 from SUSE/wip-12261
Ken Dreyer [Thu, 9 Jul 2015 19:44:54 +0000 (13:44 -0600)]
Merge pull request #5187 from SUSE/wip-12261

ceph.spec.in: install 95-ceph-osd.rules, mount.ceph, and mount.fuse.c…

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #5181 from SUSE/wip-snappy-devel
Ken Dreyer [Thu, 9 Jul 2015 19:43:37 +0000 (13:43 -0600)]
Merge pull request #5181 from SUSE/wip-snappy-devel

ceph.spec.in: snappy-devel for all supported distros

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #5180 from SUSE/wip-add-missing-specfile-bit
Ken Dreyer [Thu, 9 Jul 2015 19:42:40 +0000 (13:42 -0600)]
Merge pull request #5180 from SUSE/wip-add-missing-specfile-bit

ceph.spec.in: add missing -%{release}

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #5076 from SUSE/wip-logrotate-hard-dependency
Ken Dreyer [Thu, 9 Jul 2015 19:40:23 +0000 (13:40 -0600)]
Merge pull request #5076 from SUSE/wip-logrotate-hard-dependency

packaging: make logrotate a hard dependency across all distros

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
 Conflicts:
debian/control

10 years agoceph.spec.in: install 95-ceph-osd.rules, mount.ceph, and mount.fuse.ceph properly... 5187/head
Nathan Cutler [Thu, 9 Jul 2015 19:38:46 +0000 (21:38 +0200)]
ceph.spec.in: install 95-ceph-osd.rules, mount.ceph, and mount.fuse.ceph properly on SUSE

http://tracker.ceph.com/issues/12261 Fixes: #12261

Signed-off-by: Nathan Cutler <ncutler@suse.com>
10 years agoMerge pull request #5079 from SUSE/wip-12166
Ken Dreyer [Thu, 9 Jul 2015 18:55:54 +0000 (12:55 -0600)]
Merge pull request #5079 from SUSE/wip-12166

ceph.spec.in: use %_udevrulesdir to eliminate conditionals

10 years agoMerge pull request #5126 from SUSE/wip-12201
Ken Dreyer [Thu, 9 Jul 2015 16:32:26 +0000 (10:32 -0600)]
Merge pull request #5126 from SUSE/wip-12201

ceph.spec.in: /var/run/ceph fixes

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
10 years agoceph.spec.in: use _udevrulesdir to eliminate conditionals 5079/head
Nathan Cutler [Thu, 25 Jun 2015 20:37:52 +0000 (22:37 +0200)]
ceph.spec.in: use _udevrulesdir to eliminate conditionals

The conditionals governing where 50-rbd.rules is installed were not doing the
right thing on SUSE distros.

Start using the %_udevrulesdir RPM macro, while taking care that it is defined
and set to the right value. Use it to eliminate some conditionals around other
udev rules files as well.

http://tracker.ceph.com/issues/12166 Fixes: #12166

Signed-off-by: Nathan Cutler <ncutler@suse.com>
10 years agoMerge pull request #5172 from ceph/wip-rm-git-build-dep
Ken Dreyer [Thu, 9 Jul 2015 16:00:24 +0000 (10:00 -0600)]
Merge pull request #5172 from ceph/wip-rm-git-build-dep

Remove git build-time dependency

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
10 years agoMerge pull request #5167 from zaitcev/wip-rgw-doc-layout
Yehuda Sadeh [Thu, 9 Jul 2015 15:48:17 +0000 (08:48 -0700)]
Merge pull request #5167 from zaitcev/wip-rgw-doc-layout

rgw: Document the layout of pools and objects

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #5184 from majianpeng/compiler-fix
Gregory Farnum [Thu, 9 Jul 2015 13:47:46 +0000 (14:47 +0100)]
Merge pull request #5184 from majianpeng/compiler-fix

Compiler fix warning message

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agorgw: fix signed/unsigned compare warning. 5184/head
Jianpeng Ma [Thu, 9 Jul 2015 03:17:42 +0000 (11:17 +0800)]
rgw: fix signed/unsigned compare warning.

rgw/rgw_op.cc: In member function 'virtual void
RGWCompleteMultipart::execute()':
rgw/rgw_op.cc:3133:27: warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
   if (parts->parts.size() > s->cct->_conf->rgw_multipart_part_upload_limit) {

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agotest: fix signed/unsigned compare warning.
Jianpeng Ma [Thu, 9 Jul 2015 03:05:03 +0000 (11:05 +0800)]
test: fix signed/unsigned compare warning.

 In file included from test/objectstore/chain_xattr.cc:29:0:
../src/gmock/gtest/include/gtest/gtest.h: In instantiation of
‘testing::AssertionResult testing::internal::CmpHelperEQ(const char*,
const char*, const T1&, const T2&) [with T1 = long unsigned int; T2 =
int]’:
../src/gmock/gtest/include/gtest/gtest.h:1484:23:   required from
‘static testing::AssertionResult
testing::internal::EqHelper<lhs_is_null_literal>::Compare(const char*,
const char*, const T1&, const T2&) [with T1 = long unsigned int; T2 =
int; bool lhs_is_null_literal = false]’
test/objectstore/chain_xattr.cc:205:314:   required from here
../src/gmock/gtest/include/gtest/gtest.h:1448:16: warning: comparison
between signed and unsigned integer expressions [-Wsign-compare]
   if (expected == actual) {

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #5176 from zhouyuan/rest_bench_https
Kefu Chai [Thu, 9 Jul 2015 12:02:18 +0000 (20:02 +0800)]
Merge pull request #5176 from zhouyuan/rest_bench_https

tools: Fix rest_bench to support https

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5174 from yuyuyu101/fix-bufferlist-zero
Gregory Farnum [Thu, 9 Jul 2015 11:30:27 +0000 (12:30 +0100)]
Merge pull request #5174 from yuyuyu101/fix-bufferlist-zero

Buffer: Fix bufferlist::zero bug

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoceph.spec.in: snappy-devel for all supported distros 5181/head
Nathan Cutler [Thu, 9 Jul 2015 11:28:22 +0000 (13:28 +0200)]
ceph.spec.in: snappy-devel for all supported distros

Signed-off-by: Nathan Cutler <ncutler@suse.com>
10 years agoceph.spec.in: make /var/run/ceph conditional 5126/head
Nathan Cutler [Thu, 9 Jul 2015 10:44:19 +0000 (12:44 +0200)]
ceph.spec.in: make /var/run/ceph conditional

/var/run/ceph should only be installed on Fedora, RH/CentOS, and
all supported SUSE distros that do not have systemd (e.g. SLE11-SP3).

Signed-off-by: Nathan Cutler <ncutler@suse.com>
10 years agoceph.spec.in: add missing -%{release} 5180/head
Nathan Cutler [Thu, 9 Jul 2015 10:05:24 +0000 (12:05 +0200)]
ceph.spec.in: add missing -%{release}

We have it everywhere else and I can't think of any reason why
it should be omitted here.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
10 years agoMerge pull request #5179 from yghannam/yghannam-workunit-fixes-pjd
Loic Dachary [Thu, 9 Jul 2015 10:13:56 +0000 (12:13 +0200)]
Merge pull request #5179 from yghannam/yghannam-workunit-fixes-pjd

Workunits : suites/pjd.sh : Do make clean so make can build on curren…

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #5178 from yghannam/yghannam-workunit-fixes-chmod
Loic Dachary [Thu, 9 Jul 2015 10:13:27 +0000 (12:13 +0200)]
Merge pull request #5178 from yghannam/yghannam-workunit-fixes-chmod

Workunits : fs/misc/chmod.sh : Include ACL characters in permission c…

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoWorkunits : fs/misc/chmod.sh : Include ACL characters in permission check. 5178/head
Yazen Ghannam [Mon, 4 May 2015 16:33:16 +0000 (12:33 -0400)]
Workunits : fs/misc/chmod.sh : Include ACL characters in permission check.

Signed-off-by: Yazen Ghannam <yazen.ghannam@linaro.org>
10 years agoWorkunits : suites/pjd.sh : Do make clean so make can build on current arch. 5179/head
Yazen Ghannam [Thu, 30 Apr 2015 02:46:45 +0000 (22:46 -0400)]
Workunits : suites/pjd.sh : Do make clean so make can build on current arch.

Signed-off-by: Yazen Ghannam <yazen.ghannam@linaro.org>
10 years agoFix rest_bench to support https 5176/head
Yuan Zhou [Thu, 9 Jul 2015 07:45:52 +0000 (15:45 +0800)]
Fix rest_bench to support https

Fixes: #3968
There's typo in the code which has compared 'http' twice

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
10 years agobuffer: Fix bufferlist::zero bug with special case 5174/head
Haomai Wang [Thu, 9 Jul 2015 05:42:42 +0000 (13:42 +0800)]
buffer: Fix bufferlist::zero bug with special case

Fixes: #12252
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoUnittestBuffer: Add bufferlist zero test case
Haomai Wang [Thu, 9 Jul 2015 05:32:03 +0000 (13:32 +0800)]
UnittestBuffer: Add bufferlist zero test case

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoFix mds dump_ops_in_flight crashing ocassionally
zhangzhi [Thu, 9 Jul 2015 05:37:09 +0000 (13:37 +0800)]
Fix mds dump_ops_in_flight crashing ocassionally

10 years agorgw: Document the layout of pools and objects 5167/head
Pete Zaitcev [Wed, 8 Jul 2015 06:33:20 +0000 (00:33 -0600)]
rgw: Document the layout of pools and objects

This has to be kept in sync as the layout changes. Like any other
document, really.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
10 years agoMerge pull request #4976 from t-miyamae/wip-mshec-fixlogic2
Loic Dachary [Wed, 8 Jul 2015 21:05:57 +0000 (23:05 +0200)]
Merge pull request #4976 from t-miyamae/wip-mshec-fixlogic2

erasure code: fix shec's recovery issues found in teuthology test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4813 from dachary/wip-11667-erasure-code-add-osd
Loic Dachary [Wed, 8 Jul 2015 18:03:20 +0000 (20:03 +0200)]
Merge pull request #4813 from dachary/wip-11667-erasure-code-add-osd

tests: verify erasure code read / write after remapping

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoRemove git build-time dependency 5172/head
Boris Ranto [Wed, 8 Jul 2015 15:13:14 +0000 (17:13 +0200)]
Remove git build-time dependency

The git command is currently only needed in the src/make_version script.
However, we can simply avoid it by assuming that if the git command is
not installed then the current dir is not a git repo.

Signed-off-by: Boris Ranto <branto@redhat.com>
10 years agoStoreTest: Add zero test for SyntheticTest 5185/head
Haomai Wang [Wed, 8 Jul 2015 11:32:08 +0000 (19:32 +0800)]
StoreTest: Add zero test for SyntheticTest

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agotests: verify erasure code read / write after remapping 4813/head
Loic Dachary [Sat, 30 May 2015 15:03:36 +0000 (17:03 +0200)]
tests: verify erasure code read / write after remapping

Implement the following scenario:

 * create an erasure coded pool and write an object

 * mark two osd used to store the object out
 * wait until the PG is clean
 * read the object and compare it with the original

 * mark the two osd back in
 * wait until the PG is clean
 * read the object and compare it with the original

The scenario is run with the jerasure plugin only because the code path
involved does not vary depending on the erasure code plugin.

http://tracker.ceph.com/issues/11667 Fixes: #11667

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph-helpers.sh get_osds with no trailing whitespace
Loic Dachary [Sat, 30 May 2015 15:02:08 +0000 (17:02 +0200)]
tests: ceph-helpers.sh get_osds with no trailing whitespace

Trim the trailing whitespace of the get_osds output to help with
comparisons.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: improve shell output readability
Loic Dachary [Sat, 30 May 2015 14:46:26 +0000 (16:46 +0200)]
tests: improve shell output readability

Modify the test traces to include the file name in addition to the
function and line name. It makes it easier to locate the faulty line
without going back to the test name.

Format the trace lines to be emacs friendly (filename:lineno) so that
C-x ` or C-c C-c jumps to the right file and the right line when running
the test with M-x compile.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure code: shec's gtest for minimum_to_decode() arguments 4976/head
Shotaro Kawaguchi [Tue, 16 Jun 2015 08:50:11 +0000 (17:50 +0900)]
erasure code: shec's gtest for minimum_to_decode() arguments

TestErasureCodeShec_arguments.cc added here verifies shec's fixed logic
to pass Teuthology test.

Signed-off-by: Shotaro Kawaguchi <kawaguchi.s@jp.fujitsu.com>
10 years agoerasure code: fix shec's recovery issues found in teuthology test
Takanori Nakao [Mon, 15 Jun 2015 07:41:19 +0000 (16:41 +0900)]
erasure code: fix shec's recovery issues found in teuthology test

Fixed shec's recovery issues caused by unexpected arguments in
minimum_to_decode() / decode() functions.
We misunderstood as follows.

 (1) want_to_read and available_chunks do not share osds.
 (2) osds that are not included in want_to_read are always included
     in available_chunks.

Signed-off-by: Takanori Nakao <nakao.takanori@jp.fujitsu.com>
10 years agoerasure code: move shec.cc into ErasureCodeShec.cc
Takanori Nakao [Mon, 15 Jun 2015 07:32:22 +0000 (16:32 +0900)]
erasure code: move shec.cc into ErasureCodeShec.cc

Signed-off-by: Takanori Nakao <nakao.takanori@jp.fujitsu.com>
10 years agotests: ceph-helpers.sh reduce kill_daemon verbosity
Loic Dachary [Sat, 30 May 2015 14:36:45 +0000 (16:36 +0200)]
tests: ceph-helpers.sh reduce kill_daemon verbosity

When a test fails, the script returns immediately and kill_daemon
function is called to cleanup. It is quite verbose and requires
scrolling hundreds of lines back to find the actual error
message. Turn off the shell trace to reduce the verbosity and improve
error output readability.

The kill_daemon cannot just turn off set -x because it may be called by
a test, not just at the end of the run. Instead the kill_daemon function
checks if tracing is activated and temporarily disables it.

Also get rid of the find standard error that commonly happens when
kill_daemon is called to verify there are no leftovers and the test
directory does not exist.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #5109 from ceph/wip-rgw-orphans-2
Orit Wasserman [Wed, 8 Jul 2015 09:30:01 +0000 (11:30 +0200)]
Merge pull request #5109 from ceph/wip-rgw-orphans-2

Wip rgw orphans 2

10 years agoMerge pull request #5151 from majianpeng/make-morereaable-dump-ops
Gregory Farnum [Wed, 8 Jul 2015 09:00:27 +0000 (10:00 +0100)]
Merge pull request #5151 from majianpeng/make-morereaable-dump-ops

common/TrackedOp: Make get_duration get correctly value.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #5166 from yuyuyu101/wip-async-fix-17
Haomai Wang [Wed, 8 Jul 2015 08:28:18 +0000 (16:28 +0800)]
Merge pull request #5166 from yuyuyu101/wip-async-fix-17

AsyncConnection: Only prepare message when it support fast dispatch

10 years agoMerge pull request #5157 from rajukv/wip-xio-rajukv
Kefu Chai [Wed, 8 Jul 2015 07:18:55 +0000 (15:18 +0800)]
Merge pull request #5157 from rajukv/wip-xio-rajukv

XIO: Add missing fastpath events to OSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoAsyncConnection: Only prepare message when it support fast dispatch 5166/head
Haomai Wang [Wed, 8 Jul 2015 03:32:29 +0000 (11:32 +0800)]
AsyncConnection: Only prepare message when it support fast dispatch

Not all messages support reencode now, we just avoid them prepare firstly when
call "send_message"

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agocommon/TrackedOp: Make get_duration get correctly value. 5151/head
Jianpeng Ma [Wed, 8 Jul 2015 00:31:22 +0000 (08:31 +0800)]
common/TrackedOp: Make get_duration get correctly value.

For get_duration(), it should return the duration of Op. For ops which in
flight, the duration is the time current time subtrace the
initiated_time. For the completed Ops, it used the last event(done)
subtrace the initiated_time.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #4837 from xinxinsh/wip-kv-zero
Haomai Wang [Tue, 7 Jul 2015 14:35:34 +0000 (22:35 +0800)]
Merge pull request #4837 from xinxinsh/wip-kv-zero

in _zero() function, we should remove strips to minimize keyvalue DB update

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoXIO: Add missing fastpath events to OSD 5157/head
Raju Kurunkad [Tue, 7 Jul 2015 10:43:32 +0000 (16:13 +0530)]
XIO: Add missing fastpath events to OSD

Without this incoming fastpath messages will be dropped at OSD due to missing OSD::Session

Signed-off-by: Raju Kurunkad <raju.kurunkad@sandisk.com>
10 years agogeneric check return code of get operation 4837/head
xinxin shu [Sun, 14 Jun 2015 17:43:15 +0000 (01:43 +0800)]
generic check return code of get operation

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agoMerge pull request #5138 from majianpeng/cleanup
Kefu Chai [Tue, 7 Jul 2015 02:15:20 +0000 (10:15 +0800)]
Merge pull request #5138 from majianpeng/cleanup

common/TrackedOp: code cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5148 from tchaikov/wip-fix-facility-syslog
Kefu Chai [Tue, 7 Jul 2015 02:06:46 +0000 (10:06 +0800)]
Merge pull request #5148 from tchaikov/wip-fix-facility-syslog

mon/LogMonitor: use the configured facility if log to syslog

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
10 years agoMerge remote-tracking branch 'origin/next'
Josh Durgin [Mon, 6 Jul 2015 23:02:23 +0000 (16:02 -0700)]
Merge remote-tracking branch 'origin/next'

10 years agoMerge pull request #5142 from cernceph/wip-nukememmax
John Spray [Mon, 6 Jul 2015 21:45:56 +0000 (22:45 +0100)]
Merge pull request #5142 from cernceph/wip-nukememmax

mds: nuke the unused mds_mem_max option

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #5154 from ceph/wip-rbd-queue-depth
Josh Durgin [Mon, 6 Jul 2015 21:42:53 +0000 (14:42 -0700)]
Merge pull request #5154 from ceph/wip-rbd-queue-depth

rbd: recognize queue_depth option

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #5146 from ceph/wip-12215-next
Josh Durgin [Mon, 6 Jul 2015 21:41:16 +0000 (14:41 -0700)]
Merge pull request #5146 from ceph/wip-12215-next

librbd: don't attempt to invalidate an object map in R/O mode

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #5145 from ceph/wip-12214-next
Josh Durgin [Mon, 6 Jul 2015 21:40:20 +0000 (14:40 -0700)]
Merge pull request #5145 from ceph/wip-12214-next

librbd: fix TestObjectMap.InvalidateFlagInMemoryOnly test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #5131 from ceph/wip-12069-next
Josh Durgin [Mon, 6 Jul 2015 21:27:00 +0000 (14:27 -0700)]
Merge pull request #5131 from ceph/wip-12069-next

librbd: propagate errors from image close

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #5108 from ceph/wip-12079
Orit Wasserman [Mon, 6 Jul 2015 19:50:29 +0000 (21:50 +0200)]
Merge pull request #5108 from ceph/wip-12079

Wip 12079

10 years agorgw: conversion tool to fix broken multipart objects 5108/head
Yehuda Sadeh [Fri, 26 Jun 2015 23:56:28 +0000 (16:56 -0700)]
rgw: conversion tool to fix broken multipart objects

Fixes: #12079
Broken multipart objects: multipart objects that created on 0.94.2
and that start with underscore have a bad locator on their tail objects.
This extends the tool that was needed for older issue we've had with
hammer multipart objects (that start with underscore). The same usage
applies:

$ radosgw-admin bucket check --check-head-obj-locator \
                             --bucket=<bucket> [--fix]

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #5153 from oritwas/fix-cmake-3
Yehuda Sadeh [Mon, 6 Jul 2015 16:00:16 +0000 (09:00 -0700)]
Merge pull request #5153 from oritwas/fix-cmake-3

Add libradosstriper to cmake

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #5149 from tchaikov/wip-fix-erasure-hides-parse
Kefu Chai [Mon, 6 Jul 2015 14:20:35 +0000 (22:20 +0800)]
Merge pull request #5149 from tchaikov/wip-fix-erasure-hides-parse

erasure-code: do not hide overloaded ErasureCode::parse()

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agorbd: recognize queue_depth option 5154/head
Ilya Dryomov [Mon, 6 Jul 2015 13:32:15 +0000 (16:32 +0300)]
rbd: recognize queue_depth option

.. and also stress the difference between libceph and rbd mapping
options.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
10 years agoMerge pull request #5115 from ceph/wip-12037
Alfredo Deza [Mon, 6 Jul 2015 12:24:35 +0000 (08:24 -0400)]
Merge pull request #5115 from ceph/wip-12037

Add unit/tox structure for ceph python script

Reviewed-by: Travis Rhoden <trhoden@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
10 years agoAdd libradosstriper to cmake 5153/head
Orit Wasserman [Mon, 6 Jul 2015 10:01:21 +0000 (12:01 +0200)]
Add libradosstriper to cmake

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
10 years agoerasure-code: do not hide overloaded ErasureCode::parse() 5149/head
Kefu Chai [Mon, 6 Jul 2015 04:53:59 +0000 (12:53 +0800)]
erasure-code: do not hide overloaded ErasureCode::parse()

* this change fixes the warning from clang:
  ErasureCodeJerasure::parse' hides overloaded virtual function
  [-Woverloaded-virtual]
* some erasure codecs' ErasureCode::parse() rewrites the profile
  using the default values when parsing it if the corresponding
  items are not specified. and we don't call ErasureCode::parse()
  via its children's references. so no need to make it a virtual
  function.
* and ErasureCode::parse() is used as a helper function by its
  children, so make it `protected`
* and parse() in ErasureCode's children is but a helper function
  called by ctor, descendants' parse() and init(). so make them
  protected or private accordingly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agocommon/TrackedOp: check tracking_enabled for event "initiated/done". 5138/head
Jianpeng Ma [Mon, 6 Jul 2015 05:49:42 +0000 (13:49 +0800)]
common/TrackedOp: check tracking_enabled for event "initiated/done".

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agomon/LogMonitor: use the configured facility if log to syslog 5148/head
Kefu Chai [Mon, 6 Jul 2015 04:17:21 +0000 (12:17 +0800)]
mon/LogMonitor: use the configured facility if log to syslog

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agocommon/TrackedOp: clean up code make look good.
Jianpeng Ma [Mon, 6 Jul 2015 02:48:36 +0000 (10:48 +0800)]
common/TrackedOp: clean up code make look good.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #4394 from majianpeng/tools-copyget-flags
Kefu Chai [Sun, 5 Jul 2015 17:23:01 +0000 (01:23 +0800)]
Merge pull request #4394 from majianpeng/tools-copyget-flags

add fadvise flags for rados/rbd

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4937 from majianpeng/replicated-misc-fix
Kefu Chai [Sun, 5 Jul 2015 17:20:30 +0000 (01:20 +0800)]
Merge pull request #4937 from majianpeng/replicated-misc-fix

ReplicatedPG: small bugs and clean up

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5141 from XinzeChi/wip-crush-rule
Kefu Chai [Sun, 5 Jul 2015 17:18:21 +0000 (01:18 +0800)]
Merge pull request #5141 from XinzeChi/wip-crush-rule

mon/PGMonitor: bug fix pg monitor get crush rule

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agolibrbd: don't attempt to invalidate an object map in R/O mode 5146/head
Jason Dillaman [Sun, 5 Jul 2015 15:09:09 +0000 (11:09 -0400)]
librbd: don't attempt to invalidate an object map in R/O mode

The ImageWatcher is not initialized when in R/O mode, which
resulted in a NULL pointer dereference.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados_test_stub: read op should return number of bytes read 5145/head
Jason Dillaman [Sun, 5 Jul 2015 14:47:38 +0000 (10:47 -0400)]
librados_test_stub: read op should return number of bytes read

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: fixed TestObjectMap.InvalidateFlagInMemoryOnly
Jason Dillaman [Sun, 5 Jul 2015 14:35:28 +0000 (10:35 -0400)]
tests: fixed TestObjectMap.InvalidateFlagInMemoryOnly

librados and librados_test_stub return different result codes
for a read full object operation.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #5135 from yuyuyu101/wip-async-fix-16
Haomai Wang [Sat, 4 Jul 2015 15:18:51 +0000 (23:18 +0800)]
Merge pull request #5135 from yuyuyu101/wip-async-fix-16

AsyncConnection: Fix incorrect sign message behavior