Commit Graph

42615 Commits

Author SHA1 Message Date
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
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
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
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
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
Raju Kurunkad
cbc2a0ff67 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>
2015-07-07 16:13:32 +05:30
xinxin shu
32b9d637a3 generic check return code of get operation
Signed-off-by: xinxin shu <xinxin.shu@intel.com>
2015-07-07 13:46:28 +08:00
Kefu Chai
03f3fc4aba Merge pull request #5138 from majianpeng/cleanup
common/TrackedOp: code cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-07-07 10:15:20 +08:00
Kefu Chai
d0f0f07e12 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>
2015-07-07 10:06:46 +08:00
Josh Durgin
72a0185ecc Merge remote-tracking branch 'origin/next' 2015-07-06 16:02:23 -07:00
John Spray
06e01824d8 Merge pull request #5142 from cernceph/wip-nukememmax
mds: nuke the unused mds_mem_max option

Reviewed-by: John Spray <john.spray@redhat.com>
2015-07-06 22:45:56 +01:00
Josh Durgin
f75cdafacf Merge pull request #5154 from ceph/wip-rbd-queue-depth
rbd: recognize queue_depth option

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-07-06 14:42:53 -07:00
Josh Durgin
dea73c1ddd 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>
2015-07-06 14:41:16 -07:00
Josh Durgin
a22f9ed5e0 Merge pull request #5145 from ceph/wip-12214-next
librbd: fix TestObjectMap.InvalidateFlagInMemoryOnly test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-07-06 14:40:20 -07:00
Josh Durgin
05f0956216 Merge pull request #5131 from ceph/wip-12069-next
librbd: propagate errors from image close

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-07-06 14:27:00 -07:00
Orit Wasserman
f567120cce Merge pull request #5108 from ceph/wip-12079
Wip 12079
2015-07-06 21:50:29 +02:00
Yehuda Sadeh
f02ca61071 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>
2015-07-06 11:09:28 -07:00
Yehuda Sadeh
3f4dab7b41 Merge pull request #5153 from oritwas/fix-cmake-3
Add libradosstriper to cmake

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-07-06 09:00:16 -07:00
Kefu Chai
627686c846 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>
2015-07-06 22:20:35 +08:00
Ilya Dryomov
89c2a0b58a rbd: recognize queue_depth option
.. and also stress the difference between libceph and rbd mapping
options.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-07-06 16:32:15 +03:00
Alfredo Deza
c042c0ae4e 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>
2015-07-06 08:24:35 -04:00
Orit Wasserman
75a8e233a3 Add libradosstriper to cmake
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-07-06 12:12:47 +02:00
Kefu Chai
9760c220b8 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>
2015-07-06 17:29:19 +08:00