]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 #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 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

10 years agoMerge pull request #5144 from tchaikov/wip-fix-tools-rados
Kefu Chai [Sat, 4 Jul 2015 05:51:31 +0000 (13:51 +0800)]
Merge pull request #5144 from tchaikov/wip-fix-tools-rados

tools: fix segfault tools/rados introduced by 0f7aeee

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoobj_bencher: remove trailing space 5144/head
Kefu Chai [Sat, 4 Jul 2015 05:27:07 +0000 (13:27 +0800)]
obj_bencher: remove trailing space

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agotools/rados: fix the segfault introduced in 0f7aeee
Kefu Chai [Sat, 4 Jul 2015 05:25:38 +0000 (13:25 +0800)]
tools/rados: fix the segfault introduced in 0f7aeee

prefix and run_name should not be initialized by a temporary string

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5134 from stiopaa1/ThreadAddConsts
Loic Dachary [Fri, 3 Jul 2015 15:49:20 +0000 (17:49 +0200)]
Merge pull request #5134 from stiopaa1/ThreadAddConsts

common/Thread: added const to 2 functions

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoAsyncConnection: Fix incorrect sign message behavior 5135/head
Haomai Wang [Fri, 3 Jul 2015 06:03:11 +0000 (14:03 +0800)]
AsyncConnection: Fix incorrect sign message behavior

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #5128 from ceph/wip-fix-doc
Loic Dachary [Fri, 3 Jul 2015 13:05:02 +0000 (15:05 +0200)]
Merge pull request #5128 from ceph/wip-fix-doc

doc: fix the build

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomon/PGMonitor: bug fix pg monitor get crush rule 5141/head
Xinze Chi [Fri, 3 Jul 2015 10:27:13 +0000 (18:27 +0800)]
mon/PGMonitor: bug fix pg monitor get crush rule

when some rules have been deleted before, the index in array of crush->rules
is not always equals to crush_ruleset of pool.

Fixes: #12210
Reported-by: Ning Yao <zay11022@gmail.com>
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
10 years agoMerge pull request #5071 from cxwshawn/master
Kefu Chai [Fri, 3 Jul 2015 07:49:49 +0000 (15:49 +0800)]
Merge pull request #5071 from cxwshawn/master

obj_bencher: check run_name and prefix for empty string instead of NULL

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoobj_bencher: check run_name and prefix for empty string instead of NULL 5071/head
shawn chen [Fri, 3 Jul 2015 03:17:55 +0000 (11:17 +0800)]
obj_bencher: check run_name and prefix for empty string instead of NULL

change aio_bench and clean_up parameter const char * to const std::string & format.
In rest_bench.cc, aio_bench used run_name.c_str(), so this format will always be empty
string not NULL, so the condition statement
const std::string run_name_meta = (run_name == NULL ? BENCH_LASTRUN_METADATA : std::string(run_name));
is wrong!

test fix:
    before:
        ./rest-bench --seconds 1 -t 2 -b 100 write --api-host=radosgw.com --bucket=test_rm --access-key=FTL7TSJAGXX5KKDQHMJM  --secret=123456879
        use s3cmd ls s3://test_rm , we can a lot of objects in this bucket, objects are not cleaned up.
    after changes, do the same procedure, objects are cleaned up.

Signed-off-by: shawn chen <cxwshawn@gmail.com>
10 years agocommon/Thread: added const to 2 functions 5134/head
Michal Jarzabek [Sat, 27 Jun 2015 14:18:42 +0000 (15:18 +0100)]
common/Thread: added const to 2 functions

Changed get_thread_id and am_self to const member functions

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
10 years agorbd: explicitly close images to check for unexpected errors 5131/head
Jason Dillaman [Thu, 2 Jul 2015 16:59:45 +0000 (12:59 -0400)]
rbd: explicitly close images to check for unexpected errors

While errors shouldn't occur during image close, it is possible that
they could occur.  In this case, the user should be informed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agopybind: RBD close can now raise an exception on close
Jason Dillaman [Thu, 2 Jul 2015 16:46:28 +0000 (12:46 -0400)]
pybind: RBD close can now raise an exception on close

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: closing images now returns a result code
Jason Dillaman [Thu, 2 Jul 2015 16:39:42 +0000 (12:39 -0400)]
librbd: closing images now returns a result code

Added new librbd::Image::close method to allow checking the close result
when using the C++ librbd library.  rbd_close is no longer hard-coded to
return 0.

Fixes: #12069
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agomds: nuke the unused mds_mem_max option 5142/head
Dan van der Ster [Thu, 2 Jul 2015 14:43:14 +0000 (16:43 +0200)]
mds: nuke the unused mds_mem_max option

mds mem max has been a noop since argonaut. Nuke it because it
is misleading.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
10 years agodoc: indent warning messages in add-or-rm-osds.rst 5128/head
Kefu Chai [Thu, 2 Jul 2015 12:55:36 +0000 (20:55 +0800)]
doc: indent warning messages in add-or-rm-osds.rst

otherwise they are rendered as normal text

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: fix the link in dev/quick_guide
Kefu Chai [Thu, 2 Jul 2015 12:50:48 +0000 (20:50 +0800)]
doc: fix the link in dev/quick_guide

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoosd/ReplicatedPG: for writefull, offset is zero so replace offset w/ zero. 4937/head
Jianpeng Ma [Thu, 2 Jul 2015 09:05:53 +0000 (17:05 +0800)]
osd/ReplicatedPG: for writefull, offset is zero so replace offset w/ zero.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoosd/Replicated: Using write_update_size_and_usage for WRITEFULL.
Jianpeng Ma [Thu, 2 Jul 2015 08:59:10 +0000 (16:59 +0800)]
osd/Replicated: Using write_update_size_and_usage for  WRITEFULL.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoosd/Replicated: First calc crc then call write_update_size_and_usage.
Jianpeng Ma [Thu, 2 Jul 2015 08:50:41 +0000 (16:50 +0800)]
osd/Replicated: First calc crc then call write_update_size_and_usage.

Because write_update_size_and_usage will change oi.size which cause
don't calc new crc.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #5125 from majianpeng/print-blocked-op
Kefu Chai [Thu, 2 Jul 2015 04:44:58 +0000 (12:44 +0800)]
Merge pull request #5125 from majianpeng/print-blocked-op

mon/PGMonitor: Make blocked Op message more readable.

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agomon/PGMonitor: Make blocked Op message more readable. 5125/head
Jianpeng Ma [Thu, 2 Jul 2015 01:59:53 +0000 (09:59 +0800)]
mon/PGMonitor: Make blocked Op message more readable.

W/O this patch:
root@dev:/var/log/ceph# ceph health detail
HEALTH_WARN 1 pgs stuck unclean; 2 requests are blocked > 32 sec; 1 osds
have slow requests; recovery 5/115 objects degraded (4.348%); recovery
1/38 unfound (2.632%); too few PGs per OSD (15 < min 30)
pg 2.1 is stuck unclean for 899.708271, current state active, last
acting [2,3,0,1]
1 ops are blocked > 1048.58 sec
1 ops are blocked > 262.144 sec
1 ops are blocked > 1048.58 sec on osd.2
1 ops are blocked > 262.144 sec on osd.2
1 osds have slow requests
recovery 5/115 objects degraded (4.348%)
recovery 1/38 unfound (2.632%)
too few PGs per OSD (15 < min 30)

W/ this patch:
ceph health detail
HEALTH_WARN 1 pgs stuck unclean; 2 requests are blocked > 32 sec; 1 osds
have slow requests; recovery 5/115 objects degraded (4.348%); recovery
1/38 unfound (2.632%); too few PGs per OSD (15 < min 30)
pg 2.1 is stuck unclean for 427.103877, current state active, last
acting [2,3,0,1]
1 ops are blocked > 524.288 sec on osd.2
1 ops are blocked > 131.072 sec on osd.2
1 osds have slow requests
recovery 5/115 objects degraded (4.348%)
recovery 1/38 unfound (2.632%)
too few PGs per OSD (15 < min 30

Later messages looks better.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoosd/ReplicatedPG: For WRITEFULL replica object, only truncate if new
Jianpeng Ma [Fri, 12 Jun 2015 06:56:41 +0000 (14:56 +0800)]
osd/ReplicatedPG: For WRITEFULL replica object, only truncate if new
size less than old size(only truncate to new size)

If new size larger or equal old size, no need do truncate.
It can diretcly overwrite.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #4951 from SUSE/wip-432-missing-divergent
Kefu Chai [Wed, 1 Jul 2015 16:29:26 +0000 (00:29 +0800)]
Merge pull request #4951 from SUSE/wip-432-missing-divergent

osd_types.cc: replace count with iterator in add_next_event function

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5074 from majianpeng/mds-small-max-event
Gregory Farnum [Wed, 1 Jul 2015 15:49:40 +0000 (16:49 +0100)]
Merge pull request #5074 from majianpeng/mds-small-max-event

mds: fix mds crash when mds_max_log_events smaller.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4166 from sponce/wip-10759
Kefu Chai [Wed, 1 Jul 2015 15:32:57 +0000 (23:32 +0800)]
Merge pull request #4166 from sponce/wip-10759

tools: rados cli --striper

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4928 from xiaoxichen/wip-cleanup-key
Kefu Chai [Wed, 1 Jul 2015 14:41:03 +0000 (22:41 +0800)]
Merge pull request #4928 from xiaoxichen/wip-cleanup-key

os/{LevelDB,Rocks}Store: don't keep key_list in transaction

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5113 from tchaikov/wip-11840-reject-multiple-tiering
Kefu Chai [Wed, 1 Jul 2015 12:57:47 +0000 (20:57 +0800)]
Merge pull request #5113 from tchaikov/wip-11840-reject-multiple-tiering

mon: disallow adding a tier on top of another tier

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agotest: ignore symlinked ceph.py file 5115/head
Alfredo Deza [Wed, 1 Jul 2015 12:31:01 +0000 (08:31 -0400)]
test: ignore symlinked ceph.py file

Signed-off-by: Alfredo Deza <adeza@redhat.com>
10 years agotest: ignore symlinked ceph_disk.py file
Alfredo Deza [Wed, 1 Jul 2015 12:30:36 +0000 (08:30 -0400)]
test: ignore symlinked ceph_disk.py file

Signed-off-by: Alfredo Deza <adeza@redhat.com>
10 years agoceph.in: linter cleanup, remove unused imports
Alfredo Deza [Wed, 1 Jul 2015 12:17:38 +0000 (08:17 -0400)]
ceph.in: linter cleanup, remove unused imports

Signed-off-by: Alfredo Deza <adeza@redhat.com>
10 years agotest: create python test files for ceph cli
Alfredo Deza [Wed, 1 Jul 2015 12:14:38 +0000 (08:14 -0400)]
test: create python test files for ceph cli

Signed-off-by: Alfredo Deza <adeza@redhat.com>
10 years agomon: disallow adding a tier on top of another tier 5113/head
Kefu Chai [Wed, 1 Jul 2015 10:20:02 +0000 (18:20 +0800)]
mon: disallow adding a tier on top of another tier

multiple tiering is not supported at the moment

Fixes: #11840
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #5112 from tchaikov/wip-12120
Gregory Farnum [Wed, 1 Jul 2015 11:08:11 +0000 (12:08 +0100)]
Merge pull request #5112 from tchaikov/wip-12120

fix a couple build warnings

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoclient: return EINVAL if iovcnt < 0 for p{read,write}v() 5112/head
Kefu Chai [Wed, 1 Jul 2015 08:43:16 +0000 (16:43 +0800)]
client: return EINVAL if iovcnt < 0 for p{read,write}v()

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agotools: fix deprecated warning
Kefu Chai [Wed, 1 Jul 2015 08:37:36 +0000 (16:37 +0800)]
tools: fix deprecated warning

s/set_op_flags/set_op_flags2/

Fixes: #12120
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agocrush/CrushTester: fix signed/unsigned warning
Sage Weil [Fri, 19 Jun 2015 00:49:30 +0000 (17:49 -0700)]
crush/CrushTester: fix signed/unsigned warning

Fixes: #12120
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoclient: fix signed/unsigned warnings in preadv code
Sage Weil [Fri, 19 Jun 2015 00:45:37 +0000 (17:45 -0700)]
client: fix signed/unsigned warnings in preadv code

Fixes: #12120
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #5107 from yuyuyu101/wip-fix-async-14
Haomai Wang [Wed, 1 Jul 2015 06:56:04 +0000 (14:56 +0800)]
Merge pull request #5107 from yuyuyu101/wip-fix-async-14

AsyncConnection: Move sign_message to write_message

10 years agoMerge pull request #5070 from ceph/wip-4161
Yan, Zheng [Wed, 1 Jul 2015 01:00:11 +0000 (09:00 +0800)]
Merge pull request #5070 from ceph/wip-4161

mds: store layout on header object

10 years agoAsyncConnection: Move sign_message to write_message 5107/head
Haomai Wang [Tue, 30 Jun 2015 16:40:37 +0000 (00:40 +0800)]
AsyncConnection: Move sign_message to write_message

sign_message require correct connection feature which may wrong when preparing
message

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #5105 from Oxygen31/master
Loic Dachary [Tue, 30 Jun 2015 15:25:09 +0000 (17:25 +0200)]
Merge pull request #5105 from Oxygen31/master

doc : missing link in "quick_guide.rst"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc : missing link in "quick_guide.rst" 5105/head
unknown [Tue, 30 Jun 2015 13:58:17 +0000 (15:58 +0200)]
doc : missing link in "quick_guide.rst"

Fixes: #12009
Signed-off-by: Germain CHIPAUX <germain.chipaux@gmail.com>
Signed-off-by: Thomas LAUMONDAIS <thomas.laumondais@gmail.com>
Signed-off-by: Pierre CHAUMONT <pierre.chaumont31@gmail.com>
Signed-off-by: Benjamin TROQUEREAU <benjamin.troquereau@gmail.com>
Signed-off-by: Benjamin SESIA <benjamin.sesia@gmail.com>
10 years agoMerge pull request #5084 from JevonQ/fix-issue-12123
Kefu Chai [Tue, 30 Jun 2015 09:22:12 +0000 (17:22 +0800)]
Merge pull request #5084 from JevonQ/fix-issue-12123

tests: fix segfault issue in preadv/pwritev tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agomds: change mds_log_max_segments type from int to unsigned. 5074/head
Jianpeng Ma [Fri, 26 Jun 2015 02:01:43 +0000 (10:01 +0800)]
mds: change mds_log_max_segments type from int to unsigned.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agomds: fix mds crash when mds_max_log_events smaller.
Jianpeng Ma [Fri, 26 Jun 2015 01:51:43 +0000 (09:51 +0800)]
mds: fix mds crash when mds_max_log_events smaller.

If 'mds max log events' small, it met this bug:

mds/journal.cc: 155: FAILED assert(ls != this)
 ceph version 9.0.1-1117-gb0dc971
(b0dc97198a45791c8b9661d4be8e531e63202005)
 1: (ceph::__ceph_assert_fail(char const*, char const*, int, char
const*)+0x80) [0x16ef7bf]
 2: (LogSegment::try_to_expire(MDS*,
C_GatherBuilderBase<MDSInternalContextBase, MDSGather>&, int)+0x1925)
[0x15475e5]
 3: (MDLog::try_expire(LogSegment*, int)+0x66) [0x14c50a0]
 4: (MDLog::trim(int)+0xd67) [0x14c4511]
 5: (MDS::tick()+0x265) [0x1146e0b]
 6: (MDS::C_MDS_Tick::finish(int)+0x32) [0x11693b2]
 7: (Context::complete(int)+0x27) [0x11611a7]
 8: (MDSInternalContextBase::complete(int)+0x1a4) [0x14977fa]
 9: (SafeTimer::timer_thread()+0x37a) [0x16e28fa]
 10: (SafeTimerThread::entry()+0x1c) [0x16e3c56]
 11: (Thread::entry_wrapper()+0xa8) [0x16df0ee]
 12: (Thread::_entry_func(void*)+0x18) [0x16df03c]
 13: /lib64/libpthread.so.0() [0x30c9c07555]
 14: (clone()+0x6d) [0x30c9901f3d]

Check segments.size() > 1 can trim segment.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agotests: fix segfault issue in preadv/pwritev tests 5084/head
Jevon Qiao [Fri, 26 Jun 2015 10:04:21 +0000 (18:04 +0800)]
tests: fix segfault issue in preadv/pwritev tests

Previously copied the sample data to the iov buffers not yet allocated.
Now allocate buffers before writing data into them.

Fixes: #12123
Signed-off-by: Jevon Qiao <qiaojianfeng@unitedstack.com>
10 years agorgw: api adjustment following a rebase 5109/head
Yehuda Sadeh [Mon, 29 Jun 2015 22:35:04 +0000 (15:35 -0700)]
rgw: api adjustment following a rebase

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: orphans, fix check on number of shards
Yehuda Sadeh [Mon, 29 Jun 2015 22:34:44 +0000 (15:34 -0700)]
rgw: orphans, fix check on number of shards

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: orphans, change default number of shards
Yehuda Sadeh [Mon, 29 Jun 2015 22:34:11 +0000 (15:34 -0700)]
rgw: orphans, change default number of shards

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: change error output related to orphans
Yehuda Sadeh [Tue, 5 May 2015 21:43:05 +0000 (14:43 -0700)]
rgw: change error output related to orphans

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: orphan, fix truncated detection
Yehuda Sadeh [Tue, 5 May 2015 00:02:29 +0000 (17:02 -0700)]
rgw: orphan, fix truncated detection

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoradosgw-admin: simplify orphan command
Yehuda Sadeh [Mon, 4 May 2015 23:32:57 +0000 (16:32 -0700)]
radosgw-admin: simplify orphan command

No need for --init-search

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoradosgw-admin: stat orphan objects before reporting leakage
Yehuda Sadeh [Mon, 4 May 2015 22:24:00 +0000 (15:24 -0700)]
radosgw-admin: stat orphan objects before reporting leakage

We don't want to report new objects as leaked, because they might just
be written, and waiting to be linked to a new object. The number of
seconds prior to the job initialization can be cofigured through
--orphan-stale-secs (by default it's 24h).

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoradosgw-admin: orphans finish command
Yehuda Sadeh [Mon, 4 May 2015 21:39:20 +0000 (14:39 -0700)]
radosgw-admin: orphans finish command

A command to remove orphans data

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agorgw: cannot re-init an orphan scan job
Yehuda Sadeh [Sun, 3 May 2015 00:28:30 +0000 (17:28 -0700)]
rgw: cannot re-init an orphan scan job

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>