]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agotests: fix the main() documentation of ceph-helpers.sh 4782/head
Loic Dachary [Wed, 27 May 2015 14:16:34 +0000 (16:16 +0200)]
tests: fix the main() documentation of ceph-helpers.sh

It was incorrectly documented as calling the setup function. It was
also vague on how the environment was reset.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: remove unused CEPH_HELPER_VERBOSE in ceph-helpers.sh
Loic Dachary [Wed, 27 May 2015 14:14:42 +0000 (16:14 +0200)]
tests: remove unused CEPH_HELPER_VERBOSE in ceph-helpers.sh

And undocumented. It may be useful for debugging but it would have to be
properly implemented instead of being half commented out.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4777 from SUSE/wip-git_ignore_systemd_autotools_template_systemd_...
Loic Dachary [Wed, 27 May 2015 11:21:23 +0000 (13:21 +0200)]
Merge pull request #4777 from SUSE/wip-git_ignore_systemd_autotools_template_systemd_ceph_osd

.gitignore: systemd/ceph-osd@.service

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4779 from theanalyst/scripts/ceph-release-notes
Loic Dachary [Wed, 27 May 2015 09:54:08 +0000 (11:54 +0200)]
Merge pull request #4779 from theanalyst/scripts/ceph-release-notes

scripts: Add a helper to make release notes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoscripts: Add a helper to make release notes 4779/head
Abhishek Lekshmanan [Wed, 27 May 2015 09:42:58 +0000 (15:12 +0530)]
scripts: Add a helper to make release notes

First cut for a `ceph-release-notes` script added which looks at merge
commits and picks out issue numbers. Though this ideally suits for
backport releases workflow where the commit messages always follow a
specific pattern, it is partly useful for preparing release notes for
normal releases as well.

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years ago.gitignore: systemd/ceph-osd@.service 4777/head
Owen Synge [Wed, 27 May 2015 08:25:03 +0000 (10:25 +0200)]
.gitignore: systemd/ceph-osd@.service

systemd/ceph-osd@.service is now auto-generated by autotools.

This means the file should be added to gitignored list.

Signed-off-by: Owen Synge <osynge@suse.com>
10 years agoMerge pull request #4708 from dachary/wip-erasure-code-profile
Loic Dachary [Tue, 26 May 2015 23:17:30 +0000 (01:17 +0200)]
Merge pull request #4708 from dachary/wip-erasure-code-profile

erasure-code: fix error reporting

Reviewed-by: Takeshi Miyamae <miyamae.takeshi@jp.fujitsu.com>
10 years agoMerge pull request #4768 from SUSE/wip-systemd_autotools_template_systemd_ceph_osd
Sage Weil [Tue, 26 May 2015 22:37:20 +0000 (15:37 -0700)]
Merge pull request #4768 from SUSE/wip-systemd_autotools_template_systemd_ceph_osd

Template systemd/ceph-osd@.service with autotools,

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4761 from dachary/wip-doc-workflow
Loic Dachary [Tue, 26 May 2015 19:07:05 +0000 (21:07 +0200)]
Merge pull request #4761 from dachary/wip-doc-workflow

doc: update the development workflow

Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4772 from theanalyst/doc/release/v0.94.2-updates
Loic Dachary [Tue, 26 May 2015 18:50:24 +0000 (20:50 +0200)]
Merge pull request #4772 from theanalyst/doc/release/v0.94.2-updates

doc: updates to v0.94.2 draft release notes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4318 from ceph/wip-11056
Josh Durgin [Tue, 26 May 2015 18:43:29 +0000 (11:43 -0700)]
Merge pull request #4318 from ceph/wip-11056

librbd: avoid blocking AIO API methods

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoPendingReleaseNotes: document changes to librbd's aio_read methods 4318/head
Jason Dillaman [Fri, 10 Apr 2015 00:34:28 +0000 (20:34 -0400)]
PendingReleaseNotes: document changes to librbd's aio_read methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: update librbd AIO tests to remove result code
Jason Dillaman [Thu, 9 Apr 2015 01:55:36 +0000 (21:55 -0400)]
tests: update librbd AIO tests to remove result code

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: AioRequest::send no longer returns a result
Jason Dillaman [Thu, 9 Apr 2015 17:33:09 +0000 (13:33 -0400)]
librbd: AioRequest::send no longer returns a result

The librados calls used by AioRequest::send should always return
zero unless there is a bug.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: internal AIO methods no longer return result
Jason Dillaman [Thu, 9 Apr 2015 01:37:50 +0000 (21:37 -0400)]
librbd: internal AIO methods no longer return result

All failures should be returned via the AioCompletion.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoThrottle: added pending_error method to SimpleThrottle
Jason Dillaman [Thu, 9 Apr 2015 01:48:21 +0000 (21:48 -0400)]
Throttle: added pending_error method to SimpleThrottle

Allow the client of SimpleThrottle to detect an async error
so that it can exit early.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add new fail method to AioCompletion
Jason Dillaman [Thu, 9 Apr 2015 00:18:50 +0000 (20:18 -0400)]
librbd: add new fail method to AioCompletion

Helper method to handle passing fatal errors generated within
librbd (not from the OSDs) back to the client.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: avoid blocking AIO API methods
Jason Dillaman [Wed, 8 Apr 2015 23:06:52 +0000 (19:06 -0400)]
librbd: avoid blocking AIO API methods

Enqueue all AIO API methods within the new librbd thread pool to
reduce the possibility of any blocking operations. To maintain
backwards compatibility with the legacy return codes of the API's
AIO methods, it's still possible to block attempting to acquire
the snap_lock.

Fixes: #11056
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add task pool / work queue for requests / callbacks
Jason Dillaman [Wed, 8 Apr 2015 21:24:08 +0000 (17:24 -0400)]
librbd: add task pool / work queue for requests / callbacks

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoWorkQueue: added virtual destructor
Jason Dillaman [Mon, 11 May 2015 21:05:49 +0000 (17:05 -0400)]
WorkQueue: added virtual destructor

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoWorkQueue: add new ContextWQ work queue
Jason Dillaman [Wed, 8 Apr 2015 20:46:34 +0000 (16:46 -0400)]
WorkQueue: add new ContextWQ work queue

The queue holds a collection of Context pointers that will
be completed by the thread pool.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agodoc: updates to v0.94.2 draft release notes 4772/head
Abhishek Lekshmanan [Tue, 26 May 2015 18:23:50 +0000 (23:53 +0530)]
doc: updates to v0.94.2 draft release notes

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agodoc: update the development workflow 4761/head
Loic Dachary [Tue, 26 May 2015 10:53:46 +0000 (12:53 +0200)]
doc: update the development workflow

* use HOWTO_monitor_the_automated_tests_AKA_nightlies to explain the nightlies
* replace references to Serverity with Backport tracker
* add links to the backporter manual and the release page
* s/0.95/9.0.0/
* unify release names to be lowercase
* replace lifecycle with release cycle and end of life with retirement
* Prefer LTS or Long Term Stable over Long Term Support

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4756 from ceph/wip-mount-timeout-doc
Josh Durgin [Tue, 26 May 2015 17:07:11 +0000 (10:07 -0700)]
Merge pull request #4756 from ceph/wip-mount-timeout-doc

rbd: document mount_timeout in the man page

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoTemplate systemd/ceph-osd@.service with autotools, 4768/head
Owen Synge [Tue, 26 May 2015 17:02:36 +0000 (19:02 +0200)]
Template systemd/ceph-osd@.service with autotools,

The libexec path is different for different distributions.
systemd. This path is defined by a new variable on the
configure path.

This variable can be set with enviroment SYSTEMD_LIBEXEC_DIR.
The parameter --with-systemd-libexec-dir overrides the enviroment
variable.

Appropriate conditionals are set for SUSE and RHEL derivatives.

This is then used to template out systemd/ceph-osd@.service

Signed-off-by: Owen Synge <osynge@suse.com>
10 years agoMerge pull request #4746 from ceph/wip-blacklist-json
Loic Dachary [Tue, 26 May 2015 11:14:14 +0000 (13:14 +0200)]
Merge pull request #4746 from ceph/wip-blacklist-json

osd: fix blacklist field in OSDMap::dump

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoqa/cephtool: add blacklist json output check 4746/head
John Spray [Fri, 22 May 2015 13:08:04 +0000 (14:08 +0100)]
qa/cephtool: add blacklist json output check

...not very elegantly because this is bash, but
at least check the expected value is somewhere
present in the JSON output.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoosd: fix blacklist field in OSDMap::dump
John Spray [Fri, 22 May 2015 09:48:32 +0000 (10:48 +0100)]
osd: fix blacklist field in OSDMap::dump

This was using an array_section so we were getting
a list of only the times, instead of an array
mapping addr to time.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4757 from xinxinsh/wip-kv-cleanup
Haomai Wang [Tue, 26 May 2015 03:57:10 +0000 (11:57 +0800)]
Merge pull request #4757 from xinxinsh/wip-kv-cleanup

os : remove GenericObjectMap::sync() function

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4755 from ceph/wip-11752
Yan, Zheng [Tue, 26 May 2015 01:18:05 +0000 (09:18 +0800)]
Merge pull request #4755 from ceph/wip-11752

mds: fix use-after-free in SessionMap::remove_session

10 years agoos : remove unused GenericObjectMap::sync() funtion since no caller invoke this function 4757/head
xinxin shu [Mon, 25 May 2015 00:15:00 +0000 (08:15 +0800)]
os : remove unused GenericObjectMap::sync() funtion since no caller invoke this function

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agoerasure-code: implement consistent error stream 4708/head
Loic Dachary [Sun, 17 May 2015 13:28:52 +0000 (15:28 +0200)]
erasure-code: implement consistent error stream

The error stream in the erasure code path is broken and the error
message is sometime not reported back to the user. For instance the
ErasureCodePlugin::factory method has no error stream: when an error
happens the user is left with a cryptic error code that needs lookup in
the sources to figure it out.

The error stream is made more systematic by:

  * always pass it as ostream *ss (instead of something passing it as
    a reference and sometime as a stringstream)

  * ostream *ss is added to ErasureCodePlugin::factory

  * define the ErasureCodeInterface::init pure virtual. It is
    already implemented by all plugins, only in slightly different
    ways. The ostream *ss is added so the init function has a way to
    report error in a human readable way to the caller, in addition to
    the error code.

The ErasureCodePluginJerasure::init return value was incorrectly ignored
when called from ErasureCodePluginJerasure::factory and now returns when
it fails.

The ErasureCodeLrc::layers_init method is given ostream *ss for error
messages instead of printing them via derr.

The ErasureCodePluginLrc::factory method no longer prints errors via
derr: this workaround is made unnecessary by the ostream *ss argument.

The ErasureCodeShec::init ostream *ss argument is ignored. The
ErasureCodeShec::parse method entirely relies on derr to report errors
and converting it goes beyond the scope of this cleanup. There is a
slight risk of getting it wrong and it deserves a separate commit and
careful and independent review.

The PGBackend, OSDMonitor.{cc,h} changes are only about prototype
changes.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure-code: do not leak shec instance on failure
Loic Dachary [Mon, 25 May 2015 13:36:30 +0000 (15:36 +0200)]
erasure-code: do not leak shec instance on failure

If the shec plugin fails to initialize the instance, it must be deleted
before returning to the caller, otherwise it will be leaked.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure-code: lrc size test depends on layer semantic
Loic Dachary [Mon, 25 May 2015 13:44:53 +0000 (15:44 +0200)]
erasure-code: lrc size test depends on layer semantic

When the lrc layers are defined, the semantic of the D,c and _
characters are defined, the rest is undefined. The test that verifies
the guard against layers of different size uses the A character which
is undefined. Depending on the implementation, the size test could fail
because the A character is undefined and a guard to forbid undefined
characters is added. Replace A with D to make sure the undefined
character A will not interfere with the test.

This may seem nitpicking but it actually caused problems after a code
refactor that will appear in a few commits from here.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure-code: define the ErasureCodeProfile type
Loic Dachary [Sat, 16 May 2015 22:46:38 +0000 (00:46 +0200)]
erasure-code: define the ErasureCodeProfile type

Instead of map<string,string>. Make it a non const when initializing
an ErasureCodeInterface instance so that it can be modified.

Rename parameters into profile for consistency with the user
documentation. The parameters name was chosen before the user interface
was defined. This cosmetic update is made in the context of larger
functional changes to improve error reporting and user interface
consistency.

The init() method are made to accept non const parameters.  It is
desirable for them to be able to modify the profile so that is
accurately reflects the values that are used. The caller may use this
information for better error reporting.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agorbd: document mount_timeout in the man page 4756/head
Ilya Dryomov [Mon, 25 May 2015 11:22:34 +0000 (14:22 +0300)]
rbd: document mount_timeout in the man page

With "rbd: timeout watch teardown on unmap with mount_timeout" going
into kernel 4.2, document its effect in the man page.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
10 years agoMerge pull request #4745 from jmunhoz/object-copy-bug
Yehuda Sadeh [Mon, 25 May 2015 07:05:11 +0000 (00:05 -0700)]
Merge pull request #4745 from jmunhoz/object-copy-bug

rgw: Use attrs from source bucket on copy

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agomds: fix use-after-free in SessionMap::remove_session 4755/head
Yan, Zheng [Mon, 25 May 2015 03:35:01 +0000 (11:35 +0800)]
mds: fix use-after-free in SessionMap::remove_session

Fixes: #11752
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #4709 from dachary/wip-shec-corpus
Loic Dachary [Sat, 23 May 2015 08:54:12 +0000 (10:54 +0200)]
Merge pull request #4709 from dachary/wip-shec-corpus

erasure-code: update ceph-erasure-code-corpus for shec

10 years agoMerge pull request #4751 from islepnev/wip-11612
Loic Dachary [Sat, 23 May 2015 07:05:03 +0000 (09:05 +0200)]
Merge pull request #4751 from islepnev/wip-11612

Support NVMe device partitions by ceph-disk

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph-disk: support NVMe device partitions 4751/head
islepnev [Fri, 17 Apr 2015 19:33:01 +0000 (22:33 +0300)]
ceph-disk: support NVMe device partitions

Linux nvme kernel module v0.9 enumerate devices as following:

/dev/nvme0 - characted revice
/dev/nvme0n1 - whole block device
/dev/nvme0n1p1 - first partition
/dev/nvme0n1p2 - second partition

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

Signed-off-by: Ilja Slepnev <islepnev@gmail.com>
10 years agoMerge pull request #4736 from tchaikov/wip-11693-only-restart-crashed-osds
Kefu Chai [Fri, 22 May 2015 19:56:34 +0000 (03:56 +0800)]
Merge pull request #4736 from tchaikov/wip-11693-only-restart-crashed-osds

test/test-erasure-code: spin off EIO tests to avoid lingering OSDs after tests finish

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4748 from ceph/wip-11562
Josh Durgin [Fri, 22 May 2015 19:43:46 +0000 (12:43 -0700)]
Merge pull request #4748 from ceph/wip-11562

dev/rbd-diff: clarify encoding of image size

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agotests/test-erasure-code: spin off eio tests into another testsuite 4736/head
Kefu Chai [Fri, 22 May 2015 07:54:22 +0000 (15:54 +0800)]
tests/test-erasure-code: spin off eio tests into another testsuite

* since the eio tests crashes some of the OSD nodes, before the
  change, the tests try to undo the crash before moving on, so it
  won't interfere with following tests. a more robust/clean way to
  do this is to isolate individual tests in a sandbox, so each eio
  test will have its own:
    setup + inject + verify crash + teardown
  cycle. this change helps to remove the cleanup/undo steps in
  invidual test.
* update the disabled tests accordingly.
* use a minimum set of OSDs and R-S(2,1) for the testing to speed
  up the test.
* add the new testsuite to check_SCRIPTS

Fixes: #11693
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agotests: fix the get_config()
Kefu Chai [Fri, 22 May 2015 07:58:10 +0000 (15:58 +0800)]
tests: fix the get_config()

* the "daemon" parameter was not respected.
* update the test_get_config() to check the overrided option instead of
  the default one.
* add set_config()

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4749 from ddiss/ceph_disk_test_fix
Loic Dachary [Fri, 22 May 2015 18:45:16 +0000 (20:45 +0200)]
Merge pull request #4749 from ddiss/ceph_disk_test_fix

tests: don't choke on deleted losetup paths

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: don't choke on deleted losetup paths 4749/head
David Disseldorp [Fri, 22 May 2015 15:22:51 +0000 (17:22 +0200)]
tests: don't choke on deleted losetup paths

If a file has been deleted with a loopback device attached, then the
`losetup --all` output will carry:
/dev/loopX: [0032]:344213 (/.../src/test-ceph-disk/vdf.disk (deleted))

This causes the losetup parsing in reset_leftover_dev() to throw an
error, e.g.:
rreset_leftover_dev: 430: test
'(/home/ddiss/ceph/src/test-ceph-disk/vdf.disk' '(deleted))' =
'(/home/ddiss/ceph/src/test-ceph-disk/vdf.disk)'
test/ceph-disk.sh: line 430: test: too many arguments

Fix this by quoting the path variable for the string comparison.

Signed-off-by: David Disseldorp <ddiss@suse.de>
10 years agodev/rbd-diff: clarify encoding of image size 4748/head
Jason Dillaman [Fri, 22 May 2015 15:18:09 +0000 (11:18 -0400)]
dev/rbd-diff: clarify encoding of image size

Fixes: #11562
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4512 from hjwsm1989/init-ceph
Loic Dachary [Fri, 22 May 2015 14:19:28 +0000 (16:19 +0200)]
Merge pull request #4512 from hjwsm1989/init-ceph

  init-ceph.in: Create osd data dir if don't exists.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4740 from ktdreyer/wip-11688-doc-firewall-ports
Loic Dachary [Fri, 22 May 2015 12:32:04 +0000 (14:32 +0200)]
Merge pull request #4740 from ktdreyer/wip-11688-doc-firewall-ports

#11688: doc: update OSD/MDS firewall port list

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4734 from wonzhq/aio-completion
Kefu Chai [Fri, 22 May 2015 09:57:48 +0000 (17:57 +0800)]
Merge pull request #4734 from wonzhq/aio-completion

test/aio: fix the leak of aio completion

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4738 from dachary/wip-11618-osd-create-dup
Kefu Chai [Fri, 22 May 2015 08:55:04 +0000 (16:55 +0800)]
Merge pull request #4738 from dachary/wip-11618-osd-create-dup

tests: ceph create may consume more than one id

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agotests: CEPH_CLI_TEST_DUP_COMMAND=1 for qa/workunits/cephtool/test.sh 4738/head
Loic Dachary [Thu, 21 May 2015 14:45:07 +0000 (16:45 +0200)]
tests: CEPH_CLI_TEST_DUP_COMMAND=1 for qa/workunits/cephtool/test.sh

Run cephtool-test-{mon,osd,mds}.sh with CEPH_CLI_TEST_DUP_COMMAND=1 to
detect idempotency related problems during make check. This is how
ceph-qa-suite/tasks/workunit.py will run
suites/rados/singleton/all/cephtool.yaml and it's easier to fix when
make check fails rather than later on when a fully populated rados suite
has one failed job.

http://tracker.ceph.com/issues/11618 Refs: #11618

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph create may consume more than one id
Loic Dachary [Thu, 21 May 2015 14:39:30 +0000 (16:39 +0200)]
tests: ceph create may consume more than one id

When CEPH_CLI_TEST_DUP_COMMAND=1 is set, ceph osd create will consume
two osd id and return the later. Fix the test to account for that and
not assume the osd id being allocated by osd create is always the
next available osd id.

The other osd create tests do not suffer from the same variation because
they provide a UUID argument that guarantees the same osd id is going to
be returned every time.

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

Signed-off-by: Loic Dachary <ldachary@redhdat.com>
10 years agorgw: Use attrs from source bucket on copy 4745/head
Javier M. Mellid [Fri, 15 May 2015 12:22:29 +0000 (14:22 +0200)]
rgw: Use attrs from source bucket on copy

On copy objects, when bucket source is the same as the destination, use attrs
from source bucket.

Fixes: #11639
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
10 years agoMerge pull request #4617 from aakso/wip-11367-pki-token-expire
Yehuda Sadeh [Thu, 21 May 2015 21:09:38 +0000 (14:09 -0700)]
Merge pull request #4617 from aakso/wip-11367-pki-token-expire

rgw: always check if token is expired

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agodoc: recommend opening entire 6800-7300 port range 4740/head
Ken Dreyer [Thu, 21 May 2015 18:54:30 +0000 (12:54 -0600)]
doc: recommend opening entire 6800-7300 port range

Prior to this commit, the Network Configuration Reference guide and
Troubleshooting guide recommended opening a number of ports that were
unique to the number of daemons that we ran.

This doesn't really cover all use cases. Users can easily restart
daemons in ways that cause the daemons to bind to higher ports. This
leads to OSDs or MDSs binding to ports that are firewalled.

Update the Network Configuration Reference guide and Troubleshooting
guides to simply recommend that users open all the ports between 6800
and 7300 on their OSDs and MDSs.

http://tracker.ceph.com/issues/11688 Refs: #11688

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agodoc: update OSD port range to 6800-7300
Ken Dreyer [Thu, 21 May 2015 18:53:43 +0000 (12:53 -0600)]
doc: update OSD port range to 6800-7300

The upper limit for OSD/MDS ports changed from 7100 to 7300 in commit
f9ec5a7945518089ffae540649b77ac06f98df5f. Update the Quick Start
Preflight documentation to reflect this change.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4391 from nilamdyuti/wip-doc-ceph-object-gateway
Yehuda Sadeh [Thu, 21 May 2015 17:00:20 +0000 (13:00 -0400)]
Merge pull request #4391 from nilamdyuti/wip-doc-ceph-object-gateway

doc: Removes references to s3gw.fcgi in simple gateway configuration file...

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agotest/aio: aio completion is not released 4734/head
Zhiqiang Wang [Thu, 21 May 2015 06:58:20 +0000 (14:58 +0800)]
test/aio: aio completion is not released

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoMerge pull request #4517 from ceph/wip-11388-debian-argparse
Dan Mick [Wed, 20 May 2015 21:54:16 +0000 (14:54 -0700)]
Merge pull request #4517 from ceph/wip-11388-debian-argparse

#11388 debian: move ceph_argparse into ceph-common

Reviewed-by: Dan Mick <dmick@redhat.com>
10 years agoMerge pull request #4721 from ceph/wip-fix-concurrent.sh
Ilya Dryomov [Wed, 20 May 2015 17:54:55 +0000 (20:54 +0300)]
Merge pull request #4721 from ceph/wip-fix-concurrent.sh

Fix ceph.conf path in concurrent.sh - krbd qa suite

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
10 years agodebian: move ceph_argparse into ceph-common 4517/head
Ken Dreyer [Tue, 14 Apr 2015 13:58:17 +0000 (07:58 -0600)]
debian: move ceph_argparse into ceph-common

Prior to this commit, if a user installed the "ceph-common" Debian
package without installing "ceph", then /usr/bin/ceph would crash
because it was missing the ceph_argparse library.

Ship the ceph_argparse library in "ceph-common" instead of "ceph". (This
was the intention of the original commit that moved argparse to "ceph",
2a23eac54957e596d99985bb9e187a668251a9ec)

http://tracker.ceph.com/issues/11388 Refs: #11388

Reported-by: Jens Rosenboom <j.rosenboom@x-ion.de>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4720 from athanatos/wip-clarify-DBObjectMap-sync
Kefu Chai [Wed, 20 May 2015 13:28:28 +0000 (21:28 +0800)]
Merge pull request #4720 from athanatos/wip-clarify-DBObjectMap-sync

DBObjectMap::sync: add comment clarifying locking

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3946 from tchaikov/randomize-scrub-time
Kefu Chai [Wed, 20 May 2015 13:21:13 +0000 (21:21 +0800)]
Merge pull request #3946 from tchaikov/randomize-scrub-time

osd: Randomize scrub time

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoosd: use another name for randomize scrub option 3946/head
Kefu Chai [Fri, 15 May 2015 16:07:27 +0000 (00:07 +0800)]
osd: use another name for randomize scrub option

s/osd_scrub_interval_limit/osd_scrub_interval_randomize_ratio/

Fixes: #10973
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoosd: randomize scrub times to avoid scrub wave
Kefu Chai [Mon, 9 Mar 2015 08:42:34 +0000 (16:42 +0800)]
osd: randomize scrub times to avoid scrub wave

- to avoid the scrub wave when the osd_scrub_max_interval reaches in a
  high-load OSD, the scrub time is randomized.
- extract scrub_load_below_threshold() out of scrub_should_schedule()
- schedule an automatic scrub job at a time which is uniformly distributed
  over [now+osd_scrub_min_interval,
        now+osd_scrub_min_interval*(1+osd_scrub_time_limit]. before
  this change this sort of scrubs will be performed once the hard interval
  is end or system load is below the threshold, but with this change, the
  jobs will be performed as long as the load is low or the interval of
  the scheduled scrubs is longer than conf.osd_scrub_max_interval. all
  automatic jobs should be performed in the configured time period, otherwise
  they are postponed.
- the requested scrub job will be scheduled right away, before this change
  it is queued with the timestamp of `now` and postponed after
  osd_scrub_min_interval.

Fixes: #10973
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoosd: use __func__ in log messages
Kefu Chai [Mon, 9 Mar 2015 08:47:30 +0000 (16:47 +0800)]
osd: use __func__ in log messages

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoosd: simplify OSD::scrub_load_below_threshold() a little bit
Kefu Chai [Wed, 15 Apr 2015 04:04:05 +0000 (12:04 +0800)]
osd: simplify OSD::scrub_load_below_threshold() a little bit

avoid unnecessary comparison

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4691 from varadakari/wip-kvs-objheader
Haomai Wang [Wed, 20 May 2015 08:29:21 +0000 (16:29 +0800)]
Merge pull request #4691 from varadakari/wip-kvs-objheader

KeyValueStore: optimize the object header writes

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoqa: unbreak concurrent.sh workunit 4721/head
Vasu Kulkarni [Mon, 18 May 2015 21:25:47 +0000 (17:25 -0400)]
qa: unbreak concurrent.sh workunit

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
10 years agoMerge pull request #4658 from ceph/wip-11481
Yan, Zheng [Tue, 19 May 2015 08:03:52 +0000 (16:03 +0800)]
Merge pull request #4658 from ceph/wip-11481

#11481: MDS resilience to weird mdsmaps

10 years agoMerge pull request #4722 from ceph/wip-rbd-xfstests-20150518
Josh Durgin [Tue, 19 May 2015 06:13:35 +0000 (23:13 -0700)]
Merge pull request #4722 from ceph/wip-rbd-xfstests-20150518

rbd: expunge xfstests generic/078

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agorbd: expunged xfstests generic/078 4722/head
Douglas Fuller [Tue, 19 May 2015 00:37:00 +0000 (17:37 -0700)]
rbd: expunged xfstests generic/078

This tests RENAME_WHITEOUT, which was enabled for xfs in kernel commit
7dcf5c3e4527cfa2807567b00387cf2ed5e07f00. At first execution, it throws a BUG.
Subsequent executions appear to work correctly. This issue manifests for disks
and RBD instances.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
10 years agoMerge pull request #4705 from stiopaa1/exit
David Zafman [Mon, 18 May 2015 20:27:14 +0000 (13:27 -0700)]
Merge pull request #4705 from stiopaa1/exit

cryptic error message in ceph interactive mode

Reviewed-by: David Zafman <dzafman@redhat.com>
10 years agoDBObjectMap::sync: add comment clarifying locking 4720/head
Samuel Just [Mon, 18 May 2015 19:29:05 +0000 (12:29 -0700)]
DBObjectMap::sync: add comment clarifying locking

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4715 from ceph/wip-11641
Yan, Zheng [Mon, 18 May 2015 16:28:01 +0000 (00:28 +0800)]
Merge pull request #4715 from ceph/wip-11641

mds: fix handling missing mydir dirfrag

10 years agomds: fix handling missing mydir dirfrag 4715/head
John Spray [Mon, 18 May 2015 15:15:07 +0000 (16:15 +0100)]
mds: fix handling missing mydir dirfrag

This was broken by 96992466 aka "mds: handle missing mydir dirfrag"

The previous code was mistakenly treating a not-yet-loaded
dirfrag as a non-existent dirfrag, resulting in
inconsistent fragstats even when no objects had
actually been lost.

Fixes: #11641
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4693 from varadakari/wip-kvdb-prefix
Haomai Wang [Mon, 18 May 2015 13:58:10 +0000 (21:58 +0800)]
Merge pull request #4693 from varadakari/wip-kvdb-prefix

KeyValueStore: Fix the prefix comparion to avoid object leaks.

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4692 from varadakari/wip-kvs-iterator
Haomai Wang [Mon, 18 May 2015 13:56:11 +0000 (21:56 +0800)]
Merge pull request #4692 from varadakari/wip-kvs-iterator

wip-kvs-iterator

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4703 from dachary/wip-make-check-verbose
Kefu Chai [Mon, 18 May 2015 02:14:29 +0000 (10:14 +0800)]
Merge pull request #4703 from dachary/wip-make-check-verbose

tests: reduce make check verbosity

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agotests: reduce make check verbosity 4703/head
Loic Dachary [Sat, 16 May 2015 08:57:43 +0000 (10:57 +0200)]
tests: reduce make check verbosity

Move check-local scripts

   src/test/run-cli-tests
   encode-decode-non-regression.sh
   test/encoding/readable.sh

to check_SCRIPTS. Their output is captured in .log file when running
with a recent automake. This reduces the output of make check by an
order of magnitude.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4711 from dachary/wip-ceph-detect-init
Loic Dachary [Sun, 17 May 2015 20:55:31 +0000 (22:55 +0200)]
Merge pull request #4711 from dachary/wip-ceph-detect-init

ceph-detect-init typo

Reviewed-by: Michal Jarzabek <stiopa@gmail.com>
10 years agoceph-detect-init: fix pep8 extra space 4711/head
Loic Dachary [Sun, 17 May 2015 19:30:54 +0000 (21:30 +0200)]
ceph-detect-init: fix pep8 extra space

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph-detect-init: run-tox.sh always succeeds
Loic Dachary [Sun, 17 May 2015 19:29:25 +0000 (21:29 +0200)]
ceph-detect-init: run-tox.sh always succeeds

Because of the | grep, the status of tox is no longer the status of
run-tox.sh and errors are not reported as they should.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoerasure-code: update ceph-erasure-code-corpus for shec 4709/head
Loic Dachary [Sun, 17 May 2015 15:00:50 +0000 (17:00 +0200)]
erasure-code: update ceph-erasure-code-corpus for shec

Update the ceph-erasure-code-corpus submodule to include the hammer shec
checks.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4704 from dachary/wip-ceph-helpers
Kefu Chai [Sun, 17 May 2015 14:25:39 +0000 (22:25 +0800)]
Merge pull request #4704 from dachary/wip-ceph-helpers

{mon,osd}-test-helpers.sh are deprecated

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agocryptic error message in ceph interactive mode 4705/head
Michal Jarzabek [Sun, 17 May 2015 14:22:44 +0000 (15:22 +0100)]
cryptic error message in ceph interactive mode

Fixes: #11459
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
10 years agoMerge pull request #4706 from stiopaa1/cephdetectinit
Loic Dachary [Sun, 17 May 2015 13:57:42 +0000 (15:57 +0200)]
Merge pull request #4706 from stiopaa1/cephdetectinit

ceph_detect_init: added linux mint

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph_detect_init: added linux mint 4706/head
Michal Jarzabek [Sun, 17 May 2015 11:46:18 +0000 (12:46 +0100)]
ceph_detect_init: added linux mint

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
10 years agotests: {mon,osd}-test-helpers.sh are deprecated 4704/head
Loic Dachary [Sat, 16 May 2015 13:52:01 +0000 (15:52 +0200)]
tests: {mon,osd}-test-helpers.sh are deprecated

Remove the helpers because they are not used any longer. They have been
deprecated by ceph-helpers.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph-helpers.sh remove redundant setup in main
Loic Dachary [Sun, 17 May 2015 10:26:06 +0000 (12:26 +0200)]
tests: ceph-helpers.sh remove redundant setup in main

And add setup/teardown in tests that do not have it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/mon/mon-handle-forward.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:49:39 +0000 (15:49 +0200)]
tests: test/mon/mon-handle-forward.sh uses ceph-helpers.sh

Use ceph-helpers.sh instead of  mon/mon-test-helpers.sh.

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

  * use explicit ports 7300 and 7301 instead of +1 so that grep
    will show that 7301 is used. This reduces the odds of a
    port collision when looking for a port that's not already
    used by an existing test.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/mon/osd-pool-create.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:43:33 +0000 (15:43 +0200)]
tests: test/mon/osd-pool-create.sh uses ceph-helpers.sh

Use ceph-helpers.sh instead of  mon/mon-test-helpers.sh.

  * The expect_false() helper is replaced by a ! statement which is
    simpler and has the same effect.

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

  * trim the --public-addr argument from the run_mon call

  * add || return 1 after run_mon where missing

  * add || return 1 to all commands in TEST_no_pool_delete

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/osd/osd-bench.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:42:44 +0000 (15:42 +0200)]
tests: test/osd/osd-bench.sh uses ceph-helpers.sh

Remove useless inclusion of osd/osd-test-helpers.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/osd/osd-config.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:40:51 +0000 (15:40 +0200)]
tests: test/osd/osd-config.sh uses ceph-helpers.sh

The ceph-helpers.sh was already included, along with
mon/mon-test-helpers.sh and osd/osd-test-helpers.sh which creates
confusion.

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

  * trim the --public-addr argument from the run_mon call

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/osd/osd-copy-from.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:39:30 +0000 (15:39 +0200)]
tests: test/osd/osd-copy-from.sh uses ceph-helpers.sh

The ceph-helpers.sh was already included, along with
mon/mon-test-helpers.sh and osd/osd-test-helpers.sh which creates
confusion.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/vstart_wrapper.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:38:52 +0000 (15:38 +0200)]
tests: test/vstart_wrapper.sh uses ceph-helpers.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/mon/misc.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:36:25 +0000 (15:36 +0200)]
tests: test/mon/misc.sh uses ceph-helpers.sh

Fix grep that assume the pool has id 0, because it may be different
when rbd is redefined to have less PG by the run_mon function.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/erasure-code/test-erasure-code.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 09:26:08 +0000 (11:26 +0200)]
tests: test/erasure-code/test-erasure-code.sh uses ceph-helpers.sh

The ceph-helpers.sh was already included, along with
mon/mon-test-helpers.sh and osd/osd-test-helpers.sh which creates
confusion.

  * replace check_osd_status with wait_for_osd

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

Signed-off-by: Loic Dachary <ldachary@redhat.com>