Commit Graph

42909 Commits

Author SHA1 Message Date
Samuel Just
87a185b01e 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>
2015-07-09 17:10:10 -07:00
Ken Dreyer
d59caff214 Merge pull request #5075 from SUSE/wip-logrotate-requires
packaging: add find and which dependencies

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-09 15:37:15 -06:00
Samuel Just
4946d103de OSDMonitor: allow addition of cache pool with non-empty snaps with config
We need to be able to allow the version of ceph_test_* from earlier
versions of ceph to continue to work.  This patch also adjusts the
work unit to use a single rados snap to test the condition without
--force-nonempty to ensure that we don't need to be careful about
the config value when running that script.

Signed-off-by: Samuel Just <sjust@redhat.com>
2015-07-09 13:56:29 -07:00
Nathan Cutler
8a56c48259 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>
2015-07-09 21:59:39 +02:00
Ken Dreyer
6861db790a 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>
2015-07-09 13:44:57 -06:00
Ken Dreyer
ed6670fc1d 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>
2015-07-09 13:43:41 -06:00
Ken Dreyer
52e1db9bf7 Merge pull request #5180 from SUSE/wip-add-missing-specfile-bit
ceph.spec.in: add missing -%{release}

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-09 13:42:42 -06:00
Ken Dreyer
6a6d82d92a 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
2015-07-09 13:40:23 -06:00
Nathan Cutler
5ce38b9536 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>
2015-07-09 21:38:46 +02:00
Ken Dreyer
bc0992f2c0 Merge pull request #5079 from SUSE/wip-12166
ceph.spec.in: use %_udevrulesdir to eliminate conditionals
2015-07-09 12:55:54 -06:00
Ken Dreyer
90708bc806 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>
2015-07-09 10:32:31 -06:00
Nathan Cutler
8aa758ee7a 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>
2015-07-09 18:17:55 +02:00
Ken Dreyer
097dcfc589 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>
2015-07-09 10:00:27 -06:00
Yehuda Sadeh
6f5b0d6e89 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>
2015-07-09 08:48:17 -07:00
Gregory Farnum
2a41b68a75 Merge pull request #5184 from majianpeng/compiler-fix
Compiler fix warning message

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-09 14:47:46 +01:00
Jianpeng Ma
8f7c163851 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>
2015-07-09 21:37:16 +08:00
Jianpeng Ma
caae6c963d 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>
2015-07-09 21:37:11 +08:00
Kefu Chai
28c22974e7 Merge pull request #5176 from zhouyuan/rest_bench_https
tools: Fix rest_bench to support https

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-07-09 20:02:18 +08:00
Gregory Farnum
5994346fd8 Merge pull request #5174 from yuyuyu101/fix-bufferlist-zero
Buffer: Fix bufferlist::zero bug

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-09 12:30:27 +01:00
Nathan Cutler
e4634ddcc1 ceph.spec.in: snappy-devel for all supported distros
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 13:28:22 +02:00
Nathan Cutler
1abaebd869 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>
2015-07-09 12:44:19 +02:00
Nathan Cutler
d952d59ae9 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>
2015-07-09 12:27:17 +02:00
Loic Dachary
c741481cd6 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>
2015-07-09 12:13:56 +02:00
Loic Dachary
15b4a9e461 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>
2015-07-09 12:13:27 +02:00
Yazen Ghannam
d3dbfffefb Workunits : fs/misc/chmod.sh : Include ACL characters in permission check.
Signed-off-by: Yazen Ghannam <yazen.ghannam@linaro.org>
2015-07-09 04:36:28 -04:00
Yazen Ghannam
e6662e5a6d Workunits : suites/pjd.sh : Do make clean so make can build on current arch.
Signed-off-by: Yazen Ghannam <yazen.ghannam@linaro.org>
2015-07-09 04:35:45 -04:00
Yuan Zhou
624fa43a9a 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>
2015-07-09 15:46:18 +08:00
Haomai Wang
43f583d160 buffer: Fix bufferlist::zero bug with special case
Fixes: #12252
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-07-09 13:45:26 +08:00
Haomai Wang
577acf6659 UnittestBuffer: Add bufferlist zero test case
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-07-09 13:42:16 +08:00
zhangzhi
2674739a11 Fix mds dump_ops_in_flight crashing ocassionally 2015-07-09 13:37:09 +08:00
Pete Zaitcev
d8a728ec15 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>
2015-07-08 22:31:31 -06:00
Loic Dachary
5715e472e6 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>
2015-07-08 23:05:57 +02:00
Loic Dachary
12b1f50c85 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>
2015-07-08 20:03:20 +02:00
Boris Ranto
7db8a6a1d1 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>
2015-07-08 17:16:29 +02:00
Haomai Wang
cc72dd2b3c StoreTest: Add zero test for SyntheticTest
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-07-08 23:12:51 +08:00
Loic Dachary
8df81e05ef 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>
2015-07-08 16:14:23 +02:00
Loic Dachary
96ec2a7444 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>
2015-07-08 16:14:23 +02:00
Loic Dachary
d791a722a7 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>
2015-07-08 16:14:01 +02:00
Shotaro Kawaguchi
4c64b01acb 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>
2015-07-08 22:04:15 +09:00
Takanori Nakao
9bdf3e6c28 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>
2015-07-08 22:04:15 +09:00
Takanori Nakao
11238881c4 erasure code: move shec.cc into ErasureCodeShec.cc
Signed-off-by: Takanori Nakao <nakao.takanori@jp.fujitsu.com>
2015-07-08 22:04:15 +09:00
Loic Dachary
aefcf6d385 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>
2015-07-08 13:58:10 +02:00
Orit Wasserman
f9c682aa34 Merge pull request #5109 from ceph/wip-rgw-orphans-2
Wip rgw orphans 2
2015-07-08 11:30:01 +02:00
Gregory Farnum
016f57da85 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>
2015-07-08 10:00:27 +01:00
Haomai Wang
d5c697ad79 Merge pull request #5166 from yuyuyu101/wip-async-fix-17
AsyncConnection: Only prepare message when it support fast dispatch
2015-07-08 16:28:18 +08:00
Kefu Chai
6991bf49b1 Merge pull request #5157 from rajukv/wip-xio-rajukv
XIO: Add missing fastpath events to OSD

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-07-08 15:18:55 +08:00
Haomai Wang
e2454ee2cc 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>
2015-07-08 11:32:29 +08:00
Yan, Zheng
34b939a81d client: reference counting 'struct Fh'
The async readahead finisher needs to reference 'struct Fh'. But
it's possible user closes FD and free the corresponding 'struct Fh'
before async readahead finishes.

Fixes: #12088
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-07-08 10:12:47 +08:00
Jianpeng Ma
998fe78197 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>
2015-07-08 09:01:19 +08:00
Haomai Wang
07a2a131e1 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>
2015-07-07 22:35:34 +08:00